added the logic to some other flaky test cases according to the spreadsheet that I created

Author: Anirav Kareddy

src/test/java/software/amazon/encryption/s3/S3EncryptionClientMultipartUploadTest.java

@@ -5,6 +5,8 @@
 import org.apache.commons.io.IOUtils;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.core.ResponseBytes;
 import software.amazon.awssdk.core.ResponseInputStream;
@@ -52,23 +54,30 @@
 
 public class S3EncryptionClientMultipartUploadTest {
     private static Provider PROVIDER;
+    private static boolean testCasePassed = false;
 
     @BeforeAll
     public static void setUp() throws NoSuchAlgorithmException {
         Security.addProvider(new BouncyCastleProvider());
         PROVIDER = Security.getProvider("BC");
     }
 
-    @Test
+    @BeforeEach
+    public void resetTestCasePassedFlag() {
+        testCasePassed = false;
+    }
+
+    @RepeatedTest(3)
     public void multipartPutObjectAsync() throws IOException {
+        if(testCasePassed) {
+            return;
+        }
         final String objectKey = appendTestSuffix("multipart-put-object-async");
 
         final long fileSizeLimit = 1024 * 1024 * 100;
         final InputStream inputStream = new BoundedInputStream(fileSizeLimit);
         final InputStream objectStreamForResult = new BoundedInputStream(fileSizeLimit);
 
-
-
         S3AsyncClient v3Client = S3AsyncEncryptionClient.builder()
                 .kmsKeyId(KMS_KEY_ID)
                 .enableMultipartPutObject(true)
@@ -100,6 +109,8 @@ public void multipartPutObjectAsync() throws IOException {
 
         deleteObject(BUCKET, objectKey, v3Client);
         v3Client.close();
+
+        testCasePassed = true;
     }
 
     @Test
@@ -131,8 +142,11 @@ public void multipartPutObjectAsyncLargeObjectFails() {
         singleThreadExecutor.shutdown();
     }
 
-    @Test
+    @RepeatedTest(3)
     public void multipartPutObject() throws IOException {
+        if(testCasePassed) {
+            return;
+        }
         final String objectKey = appendTestSuffix("multipart-put-object");
 
         final long fileSizeLimit = 1024 * 1024 * 100;
@@ -164,6 +178,8 @@ public void multipartPutObject() throws IOException {
 
         v3Client.deleteObject(builder -> builder.bucket(BUCKET).key(objectKey));
         v3Client.close();
+
+        testCasePassed = true;
     }
 
     /*

src/test/java/software/amazon/encryption/s3/examples/MultipartUploadExampleTest.java

@@ -6,12 +6,18 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class MultipartUploadExampleTest {
+    private static boolean testCasePassed = false;
 
     @Test
     public void testMultipartUploadExamples() {
+        if(testCasePassed) {
+            return;
+        }
+
         final String bucket = S3EncryptionClientTestResources.BUCKET;
         try {
             MultipartUploadExample.main(new String[]{bucket});
+            testCasePassed = true;
         } catch (Throwable exception) {
             exception.printStackTrace();
             fail("Multipart Example Test Failed!!", exception);