test: use junit5 for testing and improve testing logic

Author: jccampanero

core/src/test/java/org/testcontainers/images/retry/ImagePullRetryPolicyTest.java

@@ -1,27 +1,17 @@
 package org.testcontainers.images.retry;
 
 import com.github.dockerjava.api.exception.InternalServerErrorException;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.testcontainers.DockerRegistryContainer;
+import org.junit.jupiter.api.Test;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
-import java.time.Instant;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class ImagePullRetryPolicyTest {
 
-    @ClassRule
-    public static DockerRegistryContainer registry = new DockerRegistryContainer();
-
-    private final DockerImageName imageName = registry.createImage();
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
+    private final DockerImageName imageName = DockerImageName.parse("any/image:latest");
 
     @Test
     public void shouldNotRetryWhenUsingFailFastPullRetryPolicy() {
@@ -32,37 +22,37 @@ public void shouldNotRetryWhenUsingFailFastPullRetryPolicy() {
 
     @Test
     public void shouldFailIfTheConfiguredDurationIsNegativeWhenUsingLimitedDurationPullRetryPolicy() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("should not be negative");
-        PullRetryPolicy.limitedDuration(Duration.ofMinutes(-1));
+        assertThatThrownBy(() -> PullRetryPolicy.limitedDuration(Duration.ofMinutes(-1)))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("should not be negative");
     }
 
     @Test
     public void shouldFailIfPullStartedIsNotBeingCalledBeforeShouldRetryWhenUsingLimitedDurationPullRetryPolicy() {
-        thrown.expect(IllegalStateException.class);
-        thrown.expectMessage("Please, check that pullStarted has been called.");
         ImagePullRetryPolicy policy = PullRetryPolicy.limitedDuration(Duration.ofMinutes(1));
-        policy.shouldRetry(imageName, new Exception());
+        assertThatThrownBy(() -> policy.shouldRetry(imageName, new Exception()))
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Please, check that pullStarted has been called.");
     }
 
     @Test
-    public void shouldRetryDuringTheConfiguredAmountOfTimeWhenUsingLimitedDurationPullRetryPolicy() {
+    public void shouldRetryDuringTheConfiguredAmountOfTimeWhenUsingLimitedDurationPullRetryPolicy() throws InterruptedException {
         Duration maxAllowedDuration = Duration.ofMillis(100);
-        Instant lastRetryAllowed = Instant.now().plus(maxAllowedDuration);
         ImagePullRetryPolicy policy = PullRetryPolicy.limitedDuration(maxAllowedDuration);
         policy.pullStarted();
-        while (Instant.now().isBefore(lastRetryAllowed)) {
-            assertThat(policy.shouldRetry(imageName, new Exception())).isTrue();
-        }
+
+        assertThat(policy.shouldRetry(imageName, new Exception())).isTrue();
+
+        Thread.sleep(maxAllowedDuration.toMillis() + 50);
 
         assertThat(policy.shouldRetry(imageName, new Exception())).isFalse();
     }
 
     @Test
     public void shouldFailIfTheConfiguredNumberOfAttemptsIsNegativeWhenUsingNoOfAttemptsPullRetryPolicy() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("should not be negative");
-        PullRetryPolicy.noOfAttempts(-1);
+        assertThatThrownBy(() -> PullRetryPolicy.noOfAttempts(-1))
+            .isInstanceOf(IllegalArgumentException.class)
+            .hasMessageContaining("should not be negative");
     }
 
     @Test