Cleanup

Author: robotdan

src/test/java/io/fusionauth/http/MultipartTest.java

@@ -39,7 +39,6 @@
 import io.fusionauth.http.server.HTTPServerConfiguration;
 import org.testng.annotations.Test;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 
 /**
@@ -128,7 +127,7 @@ public void post_server_configuration_fileTooBig(String scheme) throws Exception
             content-length: 0\r
             \r
             """)
-        .expectExceptionOnWrite(SocketException.class);
+        .assertOptionalExceptionOnWrite(SocketException.class);
   }
 
   @Test(dataProvider = "schemes")
@@ -187,7 +186,7 @@ public void post_server_configuration_file_upload_reject(String scheme) throws E
             """)
         // If the request is large enough, because we throw an exception before we have emptied the InputStream
         // we will take an exception while trying to write all the bytes to the server.
-        .expectExceptionOnWrite(SocketException.class);
+        .assertOptionalExceptionOnWrite(SocketException.class);
 
   }
 
@@ -212,7 +211,7 @@ public void post_server_configuration_requestTooBig(String scheme) throws Except
             """)
         // If the request is large enough, because we throw an exception before we have emptied the InputStream
         // we will take an exception while trying to write all the bytes to the server.
-        .expectExceptionOnWrite(SocketException.class);
+        .assertOptionalExceptionOnWrite(SocketException.class);
   }
 
   @Test(dataProvider = "schemes")
@@ -240,7 +239,7 @@ public void post_server_configuration_requestTooBig_maxBodySize(String scheme) t
             """)
         // If the request is large enough, because we throw an exception before we have emptied the InputStream
         // we will take an exception while trying to write all the bytes to the server.
-        .expectExceptionOnWrite(SocketException.class);
+        .assertOptionalExceptionOnWrite(SocketException.class);
   }
 
   private Builder withConfiguration(Consumer<HTTPServerConfiguration> configuration) throws Exception {
@@ -269,9 +268,14 @@ public Builder(String scheme) {
       this.scheme = scheme;
     }
 
-    public Builder expectExceptionOnWrite(Class<? extends Exception> clazz) {
-      assertNotNull(thrownOnWrite);
-      assertEquals(thrownOnWrite.getClass(), clazz);
+    public Builder assertOptionalExceptionOnWrite(Class<? extends Exception> clazz) {
+      // Note that this assertion really depends upon the system the test is run on, the size of the request, and the amount of data that can be cached.
+      // - So this is an optional assertion - if exception is not null, then we should be able to assert some attributes.
+      // - With the larger sizes this exception is mostly always thrown when running tests locally, but in GHA, it doesn't always occur.
+      if (thrownOnWrite != null) {
+        assertEquals(thrownOnWrite.getClass(), clazz);
+      }
+
       return this;
     }