You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2026/04/09 21:32:57 UTC
(commons-fileupload) branch 1.x updated (4e03356c -> 874cc00f)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch 1.x
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
from 4e03356c Bump org.apache.commons:commons-parent from 97 to 98
new 57f64151 Javadoc
new 6fff0abf Don't use star imports
new 874cc00f Use try-with-resources in unit tests
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/commons/fileupload/DefaultFileItem.java | 2 +-
.../commons/fileupload/DefaultFileItemTest.java | 6 +-
.../fileupload/DiskFileItemSerializeTest.java | 6 +-
.../commons/fileupload/DiskFileUploadTest.java | 5 +-
.../commons/fileupload/FileItemHeadersTest.java | 5 +-
.../apache/commons/fileupload/FileUploadTest.java | 291 +++++++++++----------
.../commons/fileupload/ParameterParserTest.java | 3 +-
.../commons/fileupload/ProgressListenerTest.java | 4 +-
.../commons/fileupload/RFC2231UtilityTestCase.java | 5 +-
.../org/apache/commons/fileupload/SizesTest.java | 44 ++--
.../apache/commons/fileupload/StreamingTest.java | 31 ++-
.../fileupload/portlet/PortletFileUploadTest.java | 3 +-
.../fileupload/servlet/ServletFileUploadTest.java | 3 +-
.../fileupload/util/mime/MimeUtilityTestCase.java | 3 +-
.../util/mime/QuotedPrintableDecoderTestCase.java | 4 +-
15 files changed, 230 insertions(+), 185 deletions(-)
(commons-fileupload) 02/03: Don't use star imports
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit 6fff0abf69a81bc673deec070257e5355830da0f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Apr 9 17:27:47 2026 -0400
Don't use star imports
---
.../java/org/apache/commons/fileupload/DefaultFileItemTest.java | 6 +++++-
.../org/apache/commons/fileupload/DiskFileItemSerializeTest.java | 6 +++++-
.../java/org/apache/commons/fileupload/DiskFileUploadTest.java | 5 ++++-
.../java/org/apache/commons/fileupload/FileItemHeadersTest.java | 5 ++++-
.../java/org/apache/commons/fileupload/ParameterParserTest.java | 3 ++-
.../java/org/apache/commons/fileupload/ProgressListenerTest.java | 4 +++-
.../java/org/apache/commons/fileupload/RFC2231UtilityTestCase.java | 5 ++++-
src/test/java/org/apache/commons/fileupload/SizesTest.java | 7 ++++++-
src/test/java/org/apache/commons/fileupload/StreamingTest.java | 5 ++++-
.../apache/commons/fileupload/portlet/PortletFileUploadTest.java | 3 ++-
.../apache/commons/fileupload/servlet/ServletFileUploadTest.java | 3 ++-
.../apache/commons/fileupload/util/mime/MimeUtilityTestCase.java | 3 ++-
.../fileupload/util/mime/QuotedPrintableDecoderTestCase.java | 4 +++-
13 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java b/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java
index 74ccb445..216cbef5 100644
--- a/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java
+++ b/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java
@@ -17,7 +17,11 @@
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.IOException;
diff --git a/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java b/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java
index c6ff2b8f..f3c9b9f3 100644
--- a/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java
+++ b/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java
@@ -17,7 +17,11 @@
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/src/test/java/org/apache/commons/fileupload/DiskFileUploadTest.java b/src/test/java/org/apache/commons/fileupload/DiskFileUploadTest.java
index e6765a5a..f88b6ddf 100644
--- a/src/test/java/org/apache/commons/fileupload/DiskFileUploadTest.java
+++ b/src/test/java/org/apache/commons/fileupload/DiskFileUploadTest.java
@@ -16,7 +16,10 @@
*/
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
import java.io.File;
import java.util.List;
diff --git a/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java b/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java
index b881c429..3fcb9f18 100644
--- a/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java
+++ b/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java
@@ -16,7 +16,10 @@
*/
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Iterator;
diff --git a/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java b/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java
index 2ce308a3..e2ac15f7 100644
--- a/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java
+++ b/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.Map;
diff --git a/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java b/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java
index 0101ea2a..f0ec1f1c 100644
--- a/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java
+++ b/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java
@@ -17,7 +17,9 @@
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/src/test/java/org/apache/commons/fileupload/RFC2231UtilityTestCase.java b/src/test/java/org/apache/commons/fileupload/RFC2231UtilityTestCase.java
index 3bb33c9b..0a9945d0 100644
--- a/src/test/java/org/apache/commons/fileupload/RFC2231UtilityTestCase.java
+++ b/src/test/java/org/apache/commons/fileupload/RFC2231UtilityTestCase.java
@@ -16,7 +16,10 @@
*/
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.UnsupportedEncodingException;
diff --git a/src/test/java/org/apache/commons/fileupload/SizesTest.java b/src/test/java/org/apache/commons/fileupload/SizesTest.java
index 6ec35564..772b3cde 100644
--- a/src/test/java/org/apache/commons/fileupload/SizesTest.java
+++ b/src/test/java/org/apache/commons/fileupload/SizesTest.java
@@ -16,7 +16,12 @@
*/
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/src/test/java/org/apache/commons/fileupload/StreamingTest.java b/src/test/java/org/apache/commons/fileupload/StreamingTest.java
index 4cce0e4d..7b4e8012 100644
--- a/src/test/java/org/apache/commons/fileupload/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload/StreamingTest.java
@@ -16,7 +16,10 @@
*/
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/src/test/java/org/apache/commons/fileupload/portlet/PortletFileUploadTest.java b/src/test/java/org/apache/commons/fileupload/portlet/PortletFileUploadTest.java
index 5bb6693c..8fab1b9d 100644
--- a/src/test/java/org/apache/commons/fileupload/portlet/PortletFileUploadTest.java
+++ b/src/test/java/org/apache/commons/fileupload/portlet/PortletFileUploadTest.java
@@ -17,7 +17,8 @@
package org.apache.commons.fileupload.portlet;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import java.util.Map;
diff --git a/src/test/java/org/apache/commons/fileupload/servlet/ServletFileUploadTest.java b/src/test/java/org/apache/commons/fileupload/servlet/ServletFileUploadTest.java
index 8d8c77c3..d4494889 100644
--- a/src/test/java/org/apache/commons/fileupload/servlet/ServletFileUploadTest.java
+++ b/src/test/java/org/apache/commons/fileupload/servlet/ServletFileUploadTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.commons.fileupload.servlet;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import java.util.Map;
diff --git a/src/test/java/org/apache/commons/fileupload/util/mime/MimeUtilityTestCase.java b/src/test/java/org/apache/commons/fileupload/util/mime/MimeUtilityTestCase.java
index 6521a39f..3c0854c3 100644
--- a/src/test/java/org/apache/commons/fileupload/util/mime/MimeUtilityTestCase.java
+++ b/src/test/java/org/apache/commons/fileupload/util/mime/MimeUtilityTestCase.java
@@ -17,7 +17,8 @@
package org.apache.commons.fileupload.util.mime;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.UnsupportedEncodingException;
diff --git a/src/test/java/org/apache/commons/fileupload/util/mime/QuotedPrintableDecoderTestCase.java b/src/test/java/org/apache/commons/fileupload/util/mime/QuotedPrintableDecoderTestCase.java
index 0fb072b6..958d8827 100644
--- a/src/test/java/org/apache/commons/fileupload/util/mime/QuotedPrintableDecoderTestCase.java
+++ b/src/test/java/org/apache/commons/fileupload/util/mime/QuotedPrintableDecoderTestCase.java
@@ -16,7 +16,9 @@
*/
package org.apache.commons.fileupload.util.mime;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
(commons-fileupload) 03/03: Use try-with-resources in unit tests
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit 874cc00fb43a65615d4c88e4154061478fba6047
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Apr 9 17:32:51 2026 -0400
Use try-with-resources in unit tests
---
.../apache/commons/fileupload/FileUploadTest.java | 291 +++++++++++----------
.../org/apache/commons/fileupload/SizesTest.java | 37 +--
.../apache/commons/fileupload/StreamingTest.java | 26 +-
3 files changed, 183 insertions(+), 171 deletions(-)
diff --git a/src/test/java/org/apache/commons/fileupload/FileUploadTest.java b/src/test/java/org/apache/commons/fileupload/FileUploadTest.java
index 5d8ee684..623113e0 100644
--- a/src/test/java/org/apache/commons/fileupload/FileUploadTest.java
+++ b/src/test/java/org/apache/commons/fileupload/FileUploadTest.java
@@ -16,7 +16,11 @@
*/
package org.apache.commons.fileupload;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -29,6 +33,7 @@ import java.util.stream.Stream;
import org.apache.commons.fileupload.MultipartStream.IllegalBoundaryException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import org.apache.commons.fileupload.portlet.PortletFileUploadTest;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.servlet.ServletFileUploadTest;
import org.apache.commons.fileupload.util.Streams;
@@ -92,20 +97,21 @@ public class FileUploadTest {
"... contents of file1.txt ...\r\n" +
"-----9876--\r\n" +
"-----1234--\r\n");
- assertEquals(2, fileItems.size());
-
- final FileItem field = fileItems.get(0);
- assertEquals("field1", field.getFieldName());
- assertTrue(field.isFormField());
- assertEquals("Joe Blow", field.getString());
-
- final FileItem file = fileItems.get(1);
- assertEquals("pics", file.getFieldName());
- assertFalse(file.isFormField());
- assertEquals("... contents of file1.txt ...", file.getString());
- assertEquals("text/plain", file.getContentType());
- assertEquals("file1.txt", file.getName());
- Util.deleteFileItems(fileItems);
+ try {
+ assertEquals(2, fileItems.size());
+ final FileItem field = fileItems.get(0);
+ assertEquals("field1", field.getFieldName());
+ assertTrue(field.isFormField());
+ assertEquals("Joe Blow", field.getString());
+ final FileItem file = fileItems.get(1);
+ assertEquals("pics", file.getFieldName());
+ assertFalse(file.isFormField());
+ assertEquals("... contents of file1.txt ...", file.getString());
+ assertEquals("text/plain", file.getContentType());
+ assertEquals("file1.txt", file.getName());
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
/**
@@ -121,13 +127,15 @@ public class FileUploadTest {
"\r\n" +
"\r\n" +
"-----1234--\r\n");
- assertEquals(1, fileItems.size());
-
- final FileItem file = fileItems.get(0);
- assertFalse(file.isFormField());
- assertEquals("", file.getString());
- assertEquals("", file.getName());
- Util.deleteFileItems(fileItems);
+ try {
+ assertEquals(1, fileItems.size());
+ final FileItem file = fileItems.get(0);
+ assertFalse(file.isFormField());
+ assertEquals("", file.getString());
+ assertEquals("", file.getName());
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
@ParameterizedTest
@@ -142,12 +150,14 @@ public class FileUploadTest {
"This is the content of the file\n" +
"\r\n" +
"-----1234--\r\n");
- assertEquals(1, fileItems.size());
-
- final FileItem file = fileItems.get(0);
- assertEquals("FiLe", file.getFieldName());
- assertEquals("FOO.tab", file.getName());
- Util.deleteFileItems(fileItems);
+ try {
+ assertEquals(1, fileItems.size());
+ final FileItem file = fileItems.get(0);
+ assertEquals("FiLe", file.getFieldName());
+ assertEquals("FOO.tab", file.getName());
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
@ParameterizedTest
@@ -174,30 +184,29 @@ public class FileUploadTest {
"\r\n" +
"value2\r\n" +
"-----1234--\r\n");
- assertEquals(4, fileItems.size());
-
- final FileItem file = fileItems.get(0);
- assertEquals("file", file.getFieldName());
- assertFalse(file.isFormField());
- assertEquals("This is the content of the file\n", file.getString());
- assertEquals("text/whatever", file.getContentType());
- assertEquals("foo.tab", file.getName());
-
- final FileItem field = fileItems.get(1);
- assertEquals("field", field.getFieldName());
- assertTrue(field.isFormField());
- assertEquals("fieldValue", field.getString());
-
- final FileItem multi0 = fileItems.get(2);
- assertEquals("multi", multi0.getFieldName());
- assertTrue(multi0.isFormField());
- assertEquals("value1", multi0.getString());
-
- final FileItem multi1 = fileItems.get(3);
- assertEquals("multi", multi1.getFieldName());
- assertTrue(multi1.isFormField());
- assertEquals("value2", multi1.getString());
- Util.deleteFileItems(fileItems);
+ try {
+ assertEquals(4, fileItems.size());
+ final FileItem file = fileItems.get(0);
+ assertEquals("file", file.getFieldName());
+ assertFalse(file.isFormField());
+ assertEquals("This is the content of the file\n", file.getString());
+ assertEquals("text/whatever", file.getContentType());
+ assertEquals("foo.tab", file.getName());
+ final FileItem field = fileItems.get(1);
+ assertEquals("field", field.getFieldName());
+ assertTrue(field.isFormField());
+ assertEquals("fieldValue", field.getString());
+ final FileItem multi0 = fileItems.get(2);
+ assertEquals("multi", multi0.getFieldName());
+ assertTrue(multi0.isFormField());
+ assertEquals("value1", multi0.getString());
+ final FileItem multi1 = fileItems.get(3);
+ assertEquals("multi", multi1.getFieldName());
+ assertTrue(multi1.isFormField());
+ assertEquals("value2", multi1.getString());
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
/**
@@ -239,20 +248,19 @@ public class FileUploadTest {
"\r\n" +
"value2\r\n" +
"-----1234--\r\n");
- assertEquals(4, fileItems.size());
-
- final FileItem file = fileItems.get(0);
- assertHeaders(headerNames, headerValues, file, 0);
-
- final FileItem field = fileItems.get(1);
- assertHeaders(headerNames, headerValues, field, 1);
-
- final FileItem multi0 = fileItems.get(2);
- assertHeaders(headerNames, headerValues, multi0, 2);
-
- final FileItem multi1 = fileItems.get(3);
- assertHeaders(headerNames, headerValues, multi1, 3);
- Util.deleteFileItems(fileItems);
+ try {
+ assertEquals(4, fileItems.size());
+ final FileItem file = fileItems.get(0);
+ assertHeaders(headerNames, headerValues, file, 0);
+ final FileItem field = fileItems.get(1);
+ assertHeaders(headerNames, headerValues, field, 1);
+ final FileItem multi0 = fileItems.get(2);
+ assertHeaders(headerNames, headerValues, multi0, 2);
+ final FileItem multi1 = fileItems.get(3);
+ assertHeaders(headerNames, headerValues, multi1, 3);
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
/**
@@ -284,20 +292,23 @@ public class FileUploadTest {
"--BbC04y--\r\n" +
"--AaB03x--";
final List<FileItem> fileItems = Util.parseUpload(upload, request.getBytes("US-ASCII"), contentType);
- assertEquals(3, fileItems.size());
- final FileItem item0 = fileItems.get(0);
- assertEquals("field1", item0.getFieldName());
- assertNull(item0.getName());
- assertEquals("Joe Blow", new String(item0.get()));
- final FileItem item1 = fileItems.get(1);
- assertEquals("pics", item1.getFieldName());
- assertEquals("file1.txt", item1.getName());
- assertEquals("... contents of file1.txt ...", new String(item1.get()));
- final FileItem item2 = fileItems.get(2);
- assertEquals("pics", item2.getFieldName());
- assertEquals("file2.gif", item2.getName());
- assertEquals("...contents of file2.gif...", new String(item2.get()));
- Util.deleteFileItems(fileItems);
+ try {
+ assertEquals(3, fileItems.size());
+ final FileItem item0 = fileItems.get(0);
+ assertEquals("field1", item0.getFieldName());
+ assertNull(item0.getName());
+ assertEquals("Joe Blow", new String(item0.get()));
+ final FileItem item1 = fileItems.get(1);
+ assertEquals("pics", item1.getFieldName());
+ assertEquals("file1.txt", item1.getName());
+ assertEquals("... contents of file1.txt ...", new String(item1.get()));
+ final FileItem item2 = fileItems.get(2);
+ assertEquals("pics", item2.getFieldName());
+ assertEquals("file2.gif", item2.getName());
+ assertEquals("...contents of file2.gif...", new String(item2.get()));
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
/**
@@ -327,30 +338,29 @@ public class FileUploadTest {
"\r\n" +
"value2\r\n" +
"-----1234--\r\n");
- assertEquals(4, fileItems.size());
-
- final FileItem file = fileItems.get(0);
- assertEquals("file", file.getFieldName());
- assertFalse(file.isFormField());
- assertEquals("This is the content of the file\n", file.getString());
- assertEquals("text/whatever", file.getContentType());
- assertEquals("foo.tab", file.getName());
-
- final FileItem field = fileItems.get(1);
- assertEquals("field", field.getFieldName());
- assertTrue(field.isFormField());
- assertEquals("fieldValue", field.getString());
-
- final FileItem multi0 = fileItems.get(2);
- assertEquals("multi", multi0.getFieldName());
- assertTrue(multi0.isFormField());
- assertEquals("value1", multi0.getString());
-
- final FileItem multi1 = fileItems.get(3);
- assertEquals("multi", multi1.getFieldName());
- assertTrue(multi1.isFormField());
- assertEquals("value2", multi1.getString());
- Util.deleteFileItems(fileItems);
+ try {
+ assertEquals(4, fileItems.size());
+ final FileItem file = fileItems.get(0);
+ assertEquals("file", file.getFieldName());
+ assertFalse(file.isFormField());
+ assertEquals("This is the content of the file\n", file.getString());
+ assertEquals("text/whatever", file.getContentType());
+ assertEquals("foo.tab", file.getName());
+ final FileItem field = fileItems.get(1);
+ assertEquals("field", field.getFieldName());
+ assertTrue(field.isFormField());
+ assertEquals("fieldValue", field.getString());
+ final FileItem multi0 = fileItems.get(2);
+ assertEquals("multi", multi0.getFieldName());
+ assertTrue(multi0.isFormField());
+ assertEquals("value1", multi0.getString());
+ final FileItem multi1 = fileItems.get(3);
+ assertEquals("multi", multi1.getFieldName());
+ assertTrue(multi1.isFormField());
+ assertEquals("value2", multi1.getString());
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
/**
@@ -379,29 +389,27 @@ public class FileUploadTest {
"\r\n" +
"fieldValue2\r\n" +
"-----1234--\r\n");
-
- assertEquals(4, fileItems.size());
-
- final FileItem field1 = fileItems.get(0);
- assertEquals("field1", field1.getFieldName());
- assertTrue(field1.isFormField());
- assertEquals("fieldValue", field1.getString());
-
- final FileItem submitX = fileItems.get(1);
- assertEquals("submitName.x", submitX.getFieldName());
- assertTrue(submitX.isFormField());
- assertEquals("42", submitX.getString());
-
- final FileItem submitY = fileItems.get(2);
- assertEquals("submitName.y", submitY.getFieldName());
- assertTrue(submitY.isFormField());
- assertEquals("21", submitY.getString());
-
- final FileItem field2 = fileItems.get(3);
- assertEquals("field2", field2.getFieldName());
- assertTrue(field2.isFormField());
- assertEquals("fieldValue2", field2.getString());
- Util.deleteFileItems(fileItems);
+ try {
+ assertEquals(4, fileItems.size());
+ final FileItem field1 = fileItems.get(0);
+ assertEquals("field1", field1.getFieldName());
+ assertTrue(field1.isFormField());
+ assertEquals("fieldValue", field1.getString());
+ final FileItem submitX = fileItems.get(1);
+ assertEquals("submitName.x", submitX.getFieldName());
+ assertTrue(submitX.isFormField());
+ assertEquals("42", submitX.getString());
+ final FileItem submitY = fileItems.get(2);
+ assertEquals("submitName.y", submitY.getFieldName());
+ assertTrue(submitY.isFormField());
+ assertEquals("21", submitY.getString());
+ final FileItem field2 = fileItems.get(3);
+ assertEquals("field2", field2.getFieldName());
+ assertTrue(field2.isFormField());
+ assertEquals("fieldValue2", field2.getString());
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
/**
@@ -469,20 +477,21 @@ public class FileUploadTest {
final List<FileItem> fileItems = Util.parseUpload(upload, content.getBytes(StandardCharsets.US_ASCII),
"multipart/related; boundary=---1234;" +
" type=\"application/xop+xml\"; start-info=\"application/soap+xml\"");
- assertEquals(2, fileItems.size());
-
- final FileItem part1 = fileItems.get(0);
- assertNull(part1.getFieldName());
- assertFalse(part1.isFormField());
- assertEquals(soapEnvelope, part1.getString());
-
- final FileItem part2 = fileItems.get(1);
- assertNull(part2.getFieldName());
- assertFalse(part2.isFormField());
- assertEquals("some text/plain content", part2.getString());
- assertEquals("text/plain", part2.getContentType());
- assertNull(part2.getName());
- Util.deleteFileItems(fileItems);
+ try {
+ assertEquals(2, fileItems.size());
+ final FileItem part1 = fileItems.get(0);
+ assertNull(part1.getFieldName());
+ assertFalse(part1.isFormField());
+ assertEquals(soapEnvelope, part1.getString());
+ final FileItem part2 = fileItems.get(1);
+ assertNull(part2.getFieldName());
+ assertFalse(part2.isFormField());
+ assertEquals("some text/plain content", part2.getString());
+ assertEquals("text/plain", part2.getContentType());
+ assertNull(part2.getName());
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
diff --git a/src/test/java/org/apache/commons/fileupload/SizesTest.java b/src/test/java/org/apache/commons/fileupload/SizesTest.java
index 772b3cde..613ad527 100644
--- a/src/test/java/org/apache/commons/fileupload/SizesTest.java
+++ b/src/test/java/org/apache/commons/fileupload/SizesTest.java
@@ -165,26 +165,27 @@ public class SizesTest {
baos.write("\r\n".getBytes("US-ASCII"));
}
baos.write("-----1234--\r\n".getBytes("US-ASCII"));
-
- final List<FileItem> fileItems =
- Util.parseUpload(new ServletFileUpload(new DiskFileItemFactory()), baos.toByteArray());
- final Iterator<FileItem> fileIter = fileItems.iterator();
- add = 16;
- num = 0;
- for (int i = 0; i < 16384; i += add) {
- if (++add == 32) {
- add = 16;
- }
- final FileItem item = fileIter.next();
- assertEquals("field" + num++, item.getFieldName());
- final byte[] bytes = item.get();
- assertEquals(i, bytes.length);
- for (int j = 0; j < i; j++) {
- assertEquals((byte) j, bytes[j]);
+ final List<FileItem> fileItems = Util.parseUpload(new ServletFileUpload(new DiskFileItemFactory()), baos.toByteArray());
+ try {
+ final Iterator<FileItem> fileIter = fileItems.iterator();
+ add = 16;
+ num = 0;
+ for (int i = 0; i < 16384; i += add) {
+ if (++add == 32) {
+ add = 16;
+ }
+ final FileItem item = fileIter.next();
+ assertEquals("field" + num++, item.getFieldName());
+ final byte[] bytes = item.get();
+ assertEquals(i, bytes.length);
+ for (int j = 0; j < i; j++) {
+ assertEquals((byte) j, bytes[j]);
+ }
}
+ assertTrue(!fileIter.hasNext());
+ } finally {
+ Util.deleteFileItems(fileItems);
}
- assertTrue(!fileIter.hasNext());
- Util.deleteFileItems(fileItems);
}
/** Checks, whether the maxSize works.
diff --git a/src/test/java/org/apache/commons/fileupload/StreamingTest.java b/src/test/java/org/apache/commons/fileupload/StreamingTest.java
index 7b4e8012..046c2bc4 100644
--- a/src/test/java/org/apache/commons/fileupload/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload/StreamingTest.java
@@ -157,19 +157,21 @@ public class StreamingTest {
final ByteArrayInputStream bais = new ByteArrayInputStream(request);
try (InputStream inputStream = newInputStream(bais)) {
final List<FileItem> fileItems = parseUpload(inputStream, request.length);
- final Iterator<FileItem> fileIter = fileItems.iterator();
- assertTrue(fileIter.hasNext());
- final FileItem item = fileIter.next();
- assertEquals("field", item.getFieldName());
- final byte[] bytes = item.get();
- assertEquals(3, bytes.length);
- assertEquals((byte) '1', bytes[0]);
- assertEquals((byte) '2', bytes[1]);
- assertEquals((byte) '3', bytes[2]);
- assertTrue(!fileIter.hasNext());
- Util.deleteFileItems(fileItems);
+ try {
+ final Iterator<FileItem> fileIter = fileItems.iterator();
+ assertTrue(fileIter.hasNext());
+ final FileItem item = fileIter.next();
+ assertEquals("field", item.getFieldName());
+ final byte[] bytes = item.get();
+ assertEquals(3, bytes.length);
+ assertEquals((byte) '1', bytes[0]);
+ assertEquals((byte) '2', bytes[1]);
+ assertEquals((byte) '3', bytes[2]);
+ assertTrue(!fileIter.hasNext());
+ } finally {
+ Util.deleteFileItems(fileItems);
+ }
}
-
}
/**
(commons-fileupload) 01/03: Javadoc
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit 57f64151728f73ea2baed40929c1b3fa09c6bb7a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Apr 9 17:19:56 2026 -0400
Javadoc
---
src/main/java/org/apache/commons/fileupload/DefaultFileItem.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java b/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
index dfc68cf4..6b7d504b 100644
--- a/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
+++ b/src/main/java/org/apache/commons/fileupload/DefaultFileItem.java
@@ -22,13 +22,13 @@ import java.io.File;
import org.apache.commons.fileupload.disk.DiskFileItem;
/**
- * <p>
* The default implementation of the {@link org.apache.commons.fileupload.FileItem FileItem} interface.
* <p>
* After retrieving an instance of this class from a {@link org.apache.commons.fileupload.DiskFileUpload DiskFileUpload} instance (see
* {@link org.apache.commons.fileupload.DiskFileUpload #parseRequest(javax.servlet.http.HttpServletRequest)}), you may either request all contents of file at
* once using {@link #get()} or request an {@link java.io.InputStream InputStream} with {@link #getInputStream()} and process the file without attempting to
* load it into memory, which may come handy with large files.
+ * </p>
*
* @deprecated 1.1 Use {@code DiskFileItem} instead.
*/