could not use the RetryingTest dependency since it relies on Java 11 and we are relying on Java 8. Workaround was using RepeatedTests annotation and add a testCasePassed flag ... let's see if it works

Author: Anirav Kareddy

pom.xml

@@ -134,13 +134,6 @@
  <scope>test</scope>
  </dependency>
 
- <dependency>
- <groupId>org.junit-pioneer</groupId>
- <artifactId>junit-pioneer</artifactId>
- <version>2.3.0</version>
- <scope>test</scope>
- </dependency>
-
  <dependency>
  <groupId>com.amazonaws</groupId>
  <artifactId>aws-java-sdk-kms</artifactId>

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

@@ -10,8 +10,9 @@
 import com.amazonaws.services.s3.model.KMSEncryptionMaterials;
 import com.amazonaws.services.s3.model.StaticEncryptionMaterialsProvider;
 import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
-import org.junitpioneer.jupiter.RetryingTest;
 import software.amazon.awssdk.core.ResponseBytes;
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.core.sync.RequestBody;
@@ -52,6 +53,12 @@
 import static software.amazon.encryption.s3.utils.S3EncryptionClientTestResources.deleteObject;
 
 public class S3EncryptionClientInstructionFileTest {
+ private static boolean testCasePassed = false;
+
+ @BeforeEach
+ public void resetTestCasePassedFlag() {
+ testCasePassed = false;
+ }
 
  @Test
  public void testInstructionFileExists() {
@@ -310,7 +317,7 @@ public void testPutWithInstructionFileV3ToV2Rsa() throws NoSuchAlgorithmExceptio
  s3Client.close();
  }
 
- @RetryingTest(maxAttempts = 3)
+ @RepeatedTest(3)
  public void testMultipartPutWithInstructionFile() throws IOException {
  final String object_key = appendTestSuffix("test-multipart-put-instruction-file");
 

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

@@ -12,8 +12,9 @@
 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 org.junitpioneer.jupiter.RetryingTest;
 import software.amazon.awssdk.core.ResponseBytes;
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
@@ -61,6 +62,7 @@ public class S3EncryptionClientStreamTest {
 
  private static final String BUCKET = S3EncryptionClientTestResources.BUCKET;
  private static final int DEFAULT_TEST_STREAM_LENGTH = (int) (Math.random() * 10000);
+ private static boolean testCasePassed = false;
 
  private static SecretKey AES_KEY;
 
@@ -71,6 +73,11 @@ public static void setUp() throws NoSuchAlgorithmException {
  AES_KEY = keyGen.generateKey();
  }
 
+ @BeforeEach
+ public void resetTestCasePassedFlag() {
+ testCasePassed = false;
+ }
+
  @Test
  public void markResetInputStreamV3Encrypt() throws IOException {
  final String objectKey = appendTestSuffix("markResetInputStreamV3Encrypt");
@@ -307,8 +314,12 @@ public void failsWhenBothBufferSizeAndDelayedAuthModeEnabled() {
  .build());
  }
 
- @RetryingTest(maxAttempts = 3)
+ @RepeatedTest(3)
  public void customSetBufferSizeWithLargeObject() throws IOException {
+ if (testCasePassed) {
+ return;
+ }
+
  final String objectKey = appendTestSuffix("large-object-test-custom-buffer-size");
 
  Security.addProvider(new BouncyCastleProvider());
@@ -357,10 +368,16 @@ public void customSetBufferSizeWithLargeObject() throws IOException {
  deleteObject(BUCKET, objectKey, v3ClientWithBuffer32MiB);
  v3ClientWithBuffer32MiB.close();
  v3ClientWithDelayedAuth.close();
+
+ testCasePassed = true;
  }
 
- @RetryingTest(maxAttempts = 3)
+ @RepeatedTest(3)
  public void customSetBufferSizeWithLargeObjectAsyncClient() throws IOException {
+ if (testCasePassed) {
+ return;
+ }
+
  final String objectKey = appendTestSuffix("large-object-test-custom-buffer-size-async");
 
  Security.addProvider(new BouncyCastleProvider());
@@ -417,10 +434,15 @@ public void customSetBufferSizeWithLargeObjectAsyncClient() throws IOException {
  deleteObject(BUCKET, objectKey, v3ClientWithBuffer32MiB);
  v3ClientWithBuffer32MiB.close();
  v3ClientWithDelayedAuth.close();
+
+ testCasePassed = true;
  }
 
- @RetryingTest(maxAttempts = 3)
+ @RepeatedTest(3)
  public void delayedAuthModeWithLargeObject() throws IOException {
+ if(testCasePassed) {
+ return;
+ }
  final String objectKey = appendTestSuffix("large-object-test");
 
  Security.addProvider(new BouncyCastleProvider());
@@ -464,6 +486,8 @@ public void delayedAuthModeWithLargeObject() throws IOException {
  // Cleanup
  deleteObject(BUCKET, objectKey, v3Client);
  v3Client.close();
+
+ testCasePassed = true;
  }
 
  @Test