aboutsummaryrefslogtreecommitdiff
path: root/fileupload
diff options
context:
space:
mode:
authorritchie <ritchie@gmx.at>2015-09-13 06:22:54 +0200
committerritchie <ritchie@gmx.at>2015-09-13 06:22:54 +0200
commitffabe5fa1bbf87cffbfbaaa3ed255fa23d273535 (patch)
tree58aa705a1bb56a8ca4a6c7d82fba65898ba8953e /fileupload
parentcebdea5194b468d09fa78f69c4b234c9a7acb080 (diff)
downloadnanohttpd-ffabe5fa1bbf87cffbfbaaa3ed255fa23d273535.tar.gz
file upload refactorings and set minimal coverage per module #219 #216
Diffstat (limited to 'fileupload')
-rw-r--r--fileupload/.gitignore2
-rw-r--r--fileupload/pom.xml3
-rw-r--r--fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java3
-rw-r--r--fileupload/src/test/java/fi/iki/elonen/TestNanoFileUpLoad.java7
4 files changed, 9 insertions, 6 deletions
diff --git a/fileupload/.gitignore b/fileupload/.gitignore
new file mode 100644
index 0000000..868a6b2
--- /dev/null
+++ b/fileupload/.gitignore
@@ -0,0 +1,2 @@
+/.settings/
+/LICENSE.txt
diff --git a/fileupload/pom.xml b/fileupload/pom.xml
index 2ed65d3..ebd9e9e 100644
--- a/fileupload/pom.xml
+++ b/fileupload/pom.xml
@@ -40,4 +40,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <properties>
+ <minimal.coverage>0.1</minimal.coverage>
+ </properties>
</project> \ No newline at end of file
diff --git a/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java b/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java
index 6dd06d5..ec02d4a 100644
--- a/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java
+++ b/fileupload/src/main/java/fi/iki/elonen/NanoFileUpload.java
@@ -99,9 +99,6 @@ public class NanoFileUpload extends FileUpload {
return session.getMethod() == POST && FileUploadBase.isMultipartContent(new NanoHttpdContext(session));
}
- public NanoFileUpload() {
- }
-
public NanoFileUpload(FileItemFactory fileItemFactory) {
super(fileItemFactory);
}
diff --git a/fileupload/src/test/java/fi/iki/elonen/TestNanoFileUpLoad.java b/fileupload/src/test/java/fi/iki/elonen/TestNanoFileUpLoad.java
index 558ab01..f0d72e2 100644
--- a/fileupload/src/test/java/fi/iki/elonen/TestNanoFileUpLoad.java
+++ b/fileupload/src/test/java/fi/iki/elonen/TestNanoFileUpLoad.java
@@ -61,6 +61,8 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import fi.iki.elonen.NanoHTTPD.Response.Status;
+
public class TestNanoFileUpLoad {
protected TestServer testServer;
@@ -87,8 +89,7 @@ public class TestNanoFileUpLoad {
public TestServer() {
super(8192);
- uploader = new NanoFileUpload();
- uploader.setFileItemFactory(new DiskFileItemFactory());
+ uploader = new NanoFileUpload(new DiskFileItemFactory());
}
public HTTPSession createSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) {
@@ -116,8 +117,8 @@ public class TestNanoFileUpLoad {
if (NanoFileUpload.isMultipartContent(session)) {
try {
files = uploader.parseParameterMap(session);
-
} catch (FileUploadException e) {
+ this.response.setStatus(Status.INTERNAL_ERROR);
e.printStackTrace();
}
}