This is an automated email from the ASF dual-hosted git repository.
jochen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
The following commit(s) were added to refs/heads/master by this push:
new 95c77d5 FILEUPLOAD-326 - Simplify Assertion
new 32eade4 Merge pull request #77 from
arturobernalg/feature/FILEUPLOAD-326
95c77d5 is described below
commit 95c77d5eac4c228d648d30c4ea0c31561306aa69
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sat May 1 11:08:03 2021 +0200
FILEUPLOAD-326 - Simplify Assertion
---
.../org/apache/commons/fileupload2/DefaultFileItemTest.java | 6 +++---
.../org/apache/commons/fileupload2/ParameterParserTest.java | 12 ++++++------
.../org/apache/commons/fileupload2/ProgressListenerTest.java | 1 +
.../java/org/apache/commons/fileupload2/StreamingTest.java | 5 +++--
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git
a/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
b/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
index 3f4999a..8046fd0 100644
--- a/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/DefaultFileItemTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.commons.fileupload2;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -27,7 +28,6 @@ import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.io.UncheckedIOException;
-import java.util.Arrays;
import org.apache.commons.io.FileUtils;
@@ -126,7 +126,7 @@ public class DefaultFileItemTest {
assertTrue(item.isInMemory());
assertEquals(item.getSize(), testFieldValueBytes.length);
try {
- assertTrue(Arrays.equals(item.get(), testFieldValueBytes));
+ assertArrayEquals(item.get(), testFieldValueBytes);
} catch (UncheckedIOException e) {
fail("Unexpected IOException", e);
}
@@ -189,7 +189,7 @@ public class DefaultFileItemTest {
assertFalse(item.isInMemory());
assertEquals(item.getSize(), testFieldValueBytes.length);
try {
- assertTrue(Arrays.equals(item.get(), testFieldValueBytes));
+ assertArrayEquals(item.get(), testFieldValueBytes);
} catch (UncheckedIOException e) {
fail("Unexpected IOException", e);
}
diff --git
a/src/test/java/org/apache/commons/fileupload2/ParameterParserTest.java
b/src/test/java/org/apache/commons/fileupload2/ParameterParserTest.java
index 6ba6ba0..4728457 100644
--- a/src/test/java/org/apache/commons/fileupload2/ParameterParserTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/ParameterParserTest.java
@@ -35,27 +35,27 @@ public class ParameterParserTest {
"test; test1 = stuff ; test2 = \"stuff; stuff\";
test3=\"stuff";
final ParameterParser parser = new ParameterParser();
Map<String, String> params = parser.parse(s, ';');
- assertEquals(null, params.get("test"));
+ assertNull(params.get("test"));
assertEquals("stuff", params.get("test1"));
assertEquals("stuff; stuff", params.get("test2"));
assertEquals("\"stuff", params.get("test3"));
params = parser.parse(s, new char[] { ',', ';' });
- assertEquals(null, params.get("test"));
+ assertNull(params.get("test"));
assertEquals("stuff", params.get("test1"));
assertEquals("stuff; stuff", params.get("test2"));
assertEquals("\"stuff", params.get("test3"));
s = " test , test1=stuff , , test2=, test3, ";
params = parser.parse(s, ',');
- assertEquals(null, params.get("test"));
+ assertNull(params.get("test"));
assertEquals("stuff", params.get("test1"));
- assertEquals(null, params.get("test2"));
- assertEquals(null, params.get("test3"));
+ assertNull(params.get("test2"));
+ assertNull(params.get("test3"));
s = " test";
params = parser.parse(s, ';');
- assertEquals(null, params.get("test"));
+ assertNull(params.get("test"));
s = " ";
params = parser.parse(s, ';');
diff --git
a/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
b/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
index 02809a5..351c143 100644
--- a/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/ProgressListenerTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.fileupload2;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
index 6925f55..ef7357e 100644
--- a/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/StreamingTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.fileupload2;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -264,7 +265,7 @@ public class StreamingTest {
fail("Expected exception");
} catch (final InvalidFileNameException e) {
assertEquals(fileName, e.getName());
- assertTrue(e.getMessage().indexOf(fileName) == -1);
+ assertEquals(-1, e.getMessage().indexOf(fileName));
assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
}
@@ -273,7 +274,7 @@ public class StreamingTest {
fail("Expected exception");
} catch (final InvalidFileNameException e) {
assertEquals(fileName, e.getName());
- assertTrue(e.getMessage().indexOf(fileName) == -1);
+ assertEquals(-1, e.getMessage().indexOf(fileName));
assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
}
}
