Improve the HTTP client file upload test (race chasing)

Author: vietj

vertx-core/src/test/java/io/vertx/tests/http/fileupload/HttpClientFileUploadTest.java

@@ -16,6 +16,7 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.*;
 import io.vertx.core.impl.Utils;
+import io.vertx.test.core.Repeat;
 import io.vertx.test.core.TestUtils;
 import io.vertx.test.http.HttpTestBase;
 import org.junit.Assume;
@@ -33,6 +34,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 public abstract class HttpClientFileUploadTest extends HttpTestBase {
 
@@ -173,6 +175,7 @@ public void testFileUploadFormMultipart32K() throws Exception {
     testFileUploadFormMultipart(32 * 1024, false);
   }
 
+  @Repeat(times = 1000)
   @Test
   public void testFileUploadFormMultipart32M() throws Exception {
     Assume.assumeTrue(!Utils.isWindows());
@@ -195,14 +198,14 @@ private void testFileUploadFormMultipart(int size, boolean memory) throws Except
     ClientMultipartForm form = ClientMultipartForm.multipartForm()
       .attribute("toolkit", "vert.x")
       .attribute("runtime", "jvm");
-    testFileUploadFormMultipart(form, Collections.singletonList(upload), (req, uploads) -> {
+    List<Upload> uploads = testFileUploadFormMultipart(form, Collections.singletonList(upload), (req) -> {
       assertEquals("vert.x", req.getFormAttribute("toolkit"));
       assertEquals("jvm", req.getFormAttribute("runtime"));
-      assertEquals(1, uploads.size());
-      assertEquals("test", uploads.get(0).name);
-      assertEquals("test.txt", uploads.get(0).filename);
-      assertEquals(content, uploads.get(0).data);
     });
+    assertEquals(1, uploads.size());
+    assertEquals("test", uploads.get(0).name);
+    assertEquals("test.txt", uploads.get(0).filename);
+    assertEquals(content, uploads.get(0).data);
   }
 
   @Test
@@ -214,30 +217,30 @@ public void testFileUploadsFormMultipart() throws Exception {
       Upload.fileUpload("test2", "test2.txt", content2)
     );
     ClientMultipartForm form = ClientMultipartForm.multipartForm();
-    testFileUploadFormMultipart(form, toUpload, (req, uploads) -> {
-      assertEquals(2, uploads.size());
-      assertEquals("test1", uploads.get(0).name);
-      assertEquals("test1.txt", uploads.get(0).filename);
-      assertEquals("UTF-8", uploads.get(0).charset);
-      assertEquals(content1, uploads.get(0).data);
-      assertEquals("test2", uploads.get(1).name);
-      assertEquals("test2.txt", uploads.get(1).filename);
-      assertEquals("UTF-8", uploads.get(1).charset);
-      assertEquals(content2, uploads.get(1).data);
+    List<Upload> uploads = testFileUploadFormMultipart(form, toUpload, (req) -> {
     });
+    assertEquals(2, uploads.size());
+    assertEquals("test1", uploads.get(0).name);
+    assertEquals("test1.txt", uploads.get(0).filename);
+    assertEquals("UTF-8", uploads.get(0).charset);
+    assertEquals(content1, uploads.get(0).data);
+    assertEquals("test2", uploads.get(1).name);
+    assertEquals("test2.txt", uploads.get(1).filename);
+    assertEquals("UTF-8", uploads.get(1).charset);
+    assertEquals(content2, uploads.get(1).data);
   }
 
     @Test
     public void testFileUploadsFormMultipartWithCharset() throws Exception {
       Buffer content = Buffer.buffer(TestUtils.randomAlphaString(16));
       List<Upload> toUpload = Collections.singletonList(Upload.fileUpload("test1", "test1.txt", content));
       ClientMultipartForm form = ClientMultipartForm.multipartForm().charset(StandardCharsets.ISO_8859_1);
-      testFileUploadFormMultipart(form, toUpload, (req, uploads) -> {
-        assertEquals(1, uploads.size());
-        assertEquals("test1", uploads.get(0).name);
-        assertEquals("test1.txt", uploads.get(0).filename);
-        assertEquals("ISO-8859-1", uploads.get(0).charset);
+      List<Upload> uploads = testFileUploadFormMultipart(form, toUpload, (req) -> {
       });
+      assertEquals(1, uploads.size());
+      assertEquals("test1", uploads.get(0).name);
+      assertEquals("test1.txt", uploads.get(0).filename);
+      assertEquals("ISO-8859-1", uploads.get(0).charset);
     }
 
     @Test
@@ -249,15 +252,15 @@ public void testFileUploadsSameNameFormMultipart() throws Exception {
         Upload.fileUpload("test", "test2.txt", content2)
       );
       ClientMultipartForm form = ClientMultipartForm.multipartForm();
-      testFileUploadFormMultipart(form, toUpload, (req, uploads) -> {
-        assertEquals(2, uploads.size());
-        assertEquals("test", uploads.get(0).name);
-        assertEquals("test1.txt", uploads.get(0).filename);
-        assertEquals(content1, uploads.get(0).data);
-        assertEquals("test", uploads.get(1).name);
-        assertEquals("test2.txt", uploads.get(1).filename);
-        assertEquals(content2, uploads.get(1).data);
+      List<Upload> uploads = testFileUploadFormMultipart(form, toUpload, (req) -> {
       });
+      assertEquals(2, uploads.size());
+      assertEquals("test", uploads.get(0).name);
+      assertEquals("test1.txt", uploads.get(0).filename);
+      assertEquals(content1, uploads.get(0).data);
+      assertEquals("test", uploads.get(1).name);
+      assertEquals("test2.txt", uploads.get(1).filename);
+      assertEquals(content2, uploads.get(1).data);
     }
 
   @Test
@@ -269,22 +272,22 @@ public void testFileUploadsSameNameFormMultipartDisableMultipartMixed() throws E
       Upload.fileUpload("test", "test2.txt", content2)
     );
     ClientMultipartForm form = ClientMultipartForm.multipartForm().mixed(false);
-    testFileUploadFormMultipart(form, toUpload, (req, uploads) -> {
-      assertEquals(2, uploads.size());
-      assertEquals("test", uploads.get(0).name);
-      assertEquals("test1.txt", uploads.get(0).filename);
-      assertEquals(content1, uploads.get(0).data);
-      assertEquals("test", uploads.get(1).name);
-      assertEquals("test2.txt", uploads.get(1).filename);
-      assertEquals(content2, uploads.get(1).data);
+    List<Upload> uploads = testFileUploadFormMultipart(form, toUpload, (req) -> {
     });
+    assertEquals(2, uploads.size());
+    assertEquals("test", uploads.get(0).name);
+    assertEquals("test1.txt", uploads.get(0).filename);
+    assertEquals(content1, uploads.get(0).data);
+    assertEquals("test", uploads.get(1).name);
+    assertEquals("test2.txt", uploads.get(1).filename);
+    assertEquals(content2, uploads.get(1).data);
   }
 
-  private void testFileUploadFormMultipart(
+  private List<Upload> testFileUploadFormMultipart(
     ClientMultipartForm form,
     List<Upload> toUpload,
-    BiConsumer<HttpServerRequest,
-      List<Upload>> checker) throws Exception {
+    Consumer<HttpServerRequest> checker) throws Exception {
+    List<Upload> uploads = Collections.synchronizedList(new ArrayList<>());
     File[] testFiles = new File[toUpload.size()];
     for (int i = 0;i < testFiles.length;i++) {
       Upload upload = toUpload.get(i);
@@ -300,7 +303,6 @@ private void testFileUploadFormMultipart(
 
     server.requestHandler(req -> {
       req.setExpectMultipart(true);
-      List<Upload> uploads = new ArrayList<>();
       req.uploadHandler(upload -> {
         Buffer fileBuffer = Buffer.buffer();
         assertEquals("text/plain", upload.contentType());
@@ -310,7 +312,6 @@ private void testFileUploadFormMultipart(
         });
       });
       req.endHandler(v -> {
-        checker.accept(req, uploads);
         req.response().end();
       });
     });
@@ -322,6 +323,8 @@ private void testFileUploadFormMultipart(
         .expecting(HttpResponseExpectation.SC_OK)
         .compose(HttpClientResponse::body))
       .await();
+
+    return toUpload;
   }
 
   static class Upload {