(commons-fileupload) 11/11: Use assertThrows and friends

[ggregory]

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 f1028401e3d59bd42aee9ab4d26995991db1aadc
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Jun 5 08:21:26 2025 -0400

    Use assertThrows and friends
---
 .../org/apache/commons/fileupload/SizesTest.java   | 10 +----
 .../apache/commons/fileupload/StreamingTest.java   | 44 ++++++++--------------
 2 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/src/test/java/org/apache/commons/fileupload/SizesTest.java 
b/src/test/java/org/apache/commons/fileupload/SizesTest.java
index e7a51010..13c9618f 100644
--- a/src/test/java/org/apache/commons/fileupload/SizesTest.java
+++ b/src/test/java/org/apache/commons/fileupload/SizesTest.java
@@ -299,13 +299,7 @@ public class SizesTest {
         upload.setSizeMax(-1);
         upload.setPartHeaderSizeMax(100);
 
-        final MockHttpServletRequest req = new MockHttpServletRequest(
-                request.getBytes("US-ASCII"), Constants.CONTENT_TYPE);
-        try {
-            upload.parseRequest(req);
-            fail("Expected exception.");
-        } catch (final FileUploadBase.SizeLimitExceededException e) {
-            assertEquals(100, e.getPermittedSize());
-        }
+        final MockHttpServletRequest req = new 
MockHttpServletRequest(request.getBytes("US-ASCII"), Constants.CONTENT_TYPE);
+        assertEquals(100, 
assertThrows(FileUploadBase.SizeLimitExceededException.class, () -> 
upload.parseRequest(req)).getPermittedSize());
     }
 }
diff --git a/src/test/java/org/apache/commons/fileupload/StreamingTest.java 
b/src/test/java/org/apache/commons/fileupload/StreamingTest.java
index b4d0390b..d8df54df 100644
--- a/src/test/java/org/apache/commons/fileupload/StreamingTest.java
+++ b/src/test/java/org/apache/commons/fileupload/StreamingTest.java
@@ -19,6 +19,8 @@ package org.apache.commons.fileupload;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -176,12 +178,8 @@ public class StreamingTest {
         final byte[] request = newRequest();
         final byte[] invalidRequest = new byte[request.length - 11];
         System.arraycopy(request, 0, invalidRequest, 0, request.length - 11);
-        try {
-            parseUpload(invalidRequest);
-            fail("Expected EndOfStreamException");
-        } catch (final IOFileUploadException e) {
-            assertTrue(e.getCause() instanceof 
MultipartStream.MalformedStreamException);
-        }
+        assertInstanceOf(MultipartStream.MalformedStreamException.class,
+                assertThrows(IOFileUploadException.class, () -> 
parseUpload(invalidRequest)).getCause());
     }
 
     /**
@@ -214,25 +212,17 @@ public class StreamingTest {
 
         final FileItemIterator fileItemIter = parseUpload(reqBytes.length, new 
ByteArrayInputStream(reqBytes));
         final FileItemStream fileItemStream = fileItemIter.next();
-        try {
-            fileItemStream.getName();
-            fail("Expected exception");
-        } catch (final InvalidFileNameException e) {
-            assertEquals(fileName, e.getName());
-            assertTrue(e.getMessage().indexOf(fileName) == -1);
-            assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
-        }
+        InvalidFileNameException e = 
assertThrows(InvalidFileNameException.class, fileItemStream::getName);
+        assertEquals(fileName, e.getName());
+        assertTrue(e.getMessage().indexOf(fileName) == -1);
+        assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
 
         final List<FileItem> fileItems = parseUpload(reqBytes);
         final FileItem fileItem = fileItems.get(0);
-        try {
-            fileItem.getName();
-            fail("Expected exception");
-        } catch (final InvalidFileNameException e) {
-            assertEquals(fileName, e.getName());
-            assertTrue(e.getMessage().indexOf(fileName) == -1);
-            assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
-        }
+        e = assertThrows(InvalidFileNameException.class, fileItem::getName);
+        assertEquals(fileName, e.getName());
+        assertTrue(e.getMessage().indexOf(fileName) == -1);
+        assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
     }
 
     /**
@@ -265,12 +255,8 @@ public class StreamingTest {
                 return length;
             }
         };
-        try {
-            parseUpload(stream, request.length);
-            fail("Expected IOException");
-        } catch (final FileUploadException e) {
-            assertTrue(e.getCause() instanceof IOException);
-            assertEquals("123", e.getCause().getMessage());
-        }
+        final FileUploadException e = assertThrows(FileUploadException.class, 
() -> parseUpload(stream, request.length));
+        assertTrue(e.getCause() instanceof IOException);
+        assertEquals("123", e.getCause().getMessage());
     }
 }