Upgrade surefire-junit47 to surefire-junit-platform and partially revert "Migrate most tests to JUnit 5 (aws#2931)"

This partially reverts commit abe96fd (aws#2931).
Only tests that use org.junit.Rule are reverted as they are not
compatible with JUnit 5.

This also upgrades surefire-junit47 to surefire-junit-platform to be
compatible with the junit-jupiter test platform.

Author: Bennett Lynch

codegen/src/test/java/software/amazon/awssdk/codegen/customization/processors/UseLegacyEventGenerationSchemeProcessorTest.java

@@ -17,9 +17,9 @@
 
 
 import java.io.File;
+import org.junit.BeforeClass;
 import org.junit.Rule;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
@@ -42,7 +42,7 @@ public class UseLegacyEventGenerationSchemeProcessorTest {
     private static ServiceModel serviceModel;
 
 
-    @BeforeAll
+    @BeforeClass
     public static void setup() {
         String c2jFilePath = UseLegacyEventGenerationSchemeProcessorTest.class.getResource(RESOURCE_ROOT + "/service-2.json").getFile();
         File c2jFile = new File(c2jFilePath);

core/auth/src/test/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChainTest.java

@@ -15,10 +15,10 @@
 
 package software.amazon.awssdk.auth.credentials;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Rule;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.profiles.ProfileFile;

core/auth/src/test/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderTest.java

@@ -31,10 +31,10 @@
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
 import java.time.Duration;
 import java.time.Instant;
+import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.Rule;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.exception.SdkClientException;
@@ -57,12 +57,12 @@ public class InstanceProfileCredentialsProviderTest {
     @Rule
     public WireMockRule mockMetadataEndpoint = new WireMockRule();
 
-    @BeforeEach
+    @Before
     public void methodSetup() {
         System.setProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property(), "http://localhost:" + mockMetadataEndpoint.port());
     }
 
-    @AfterAll
+    @AfterClass
     public static void teardown() {
         System.clearProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property());
     }

core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollectorTest.java

@@ -18,9 +18,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.stream.Stream;
+import org.junit.AfterClass;
 import org.junit.Rule;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import software.amazon.awssdk.metrics.MetricCategory;
 import software.amazon.awssdk.metrics.MetricCollection;
@@ -34,7 +34,7 @@ public class DefaultMetricCollectorTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-    @AfterAll
+    @AfterClass
     public static void teardown() {
         DefaultSdkMetric.clearDeclaredMetrics();
     }

core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultSdkMetricTest.java

@@ -20,9 +20,9 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.junit.Before;
 import org.junit.Rule;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import software.amazon.awssdk.metrics.MetricCategory;
 import software.amazon.awssdk.metrics.MetricLevel;
@@ -32,7 +32,7 @@ public class DefaultSdkMetricTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-    @BeforeEach
+    @Before
     public void methodSetup() {
         DefaultSdkMetric.clearDeclaredMetrics();
     }

core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/ConnectionUtilsComponentTest.java

@@ -17,6 +17,7 @@
 
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
@@ -26,11 +27,10 @@
 import java.net.Inet4Address;
 import java.net.URI;
 import java.util.Collections;
+import org.junit.After;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class ConnectionUtilsComponentTest {
 
@@ -42,15 +42,15 @@ public class ConnectionUtilsComponentTest {
 
     private final ConnectionUtils sut = ConnectionUtils.create();
 
-    @AfterEach
+    @After
     public void cleanup() {
         System.getProperties().remove("http.proxyHost");
         System.getProperties().remove("http.proxyPort");
     }
 
     @Test
     public void proxiesAreNotUsedEvenIfPropertyIsSet() throws IOException {
-        Assumptions.assumeTrue(Inet4Address.getLocalHost().isReachable(100));
+        assumeTrue(Inet4Address.getLocalHost().isReachable(100));
         System.getProperties().put("http.proxyHost", "localhost");
         System.getProperties().put("http.proxyPort", String.valueOf(mockProxyServer.port()));
         HttpURLConnection connection = sut.connectToEndpoint(URI.create("http://" + Inet4Address.getLocalHost().getHostAddress() + ":" + mockServer.port()), emptyMap());

core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsTest.java

@@ -28,9 +28,9 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.http.Fault;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import org.junit.Before;
 import org.junit.Rule;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import software.amazon.awssdk.core.SdkSystemSetting;
 import software.amazon.awssdk.core.exception.SdkClientException;
@@ -51,7 +51,7 @@ public class EC2MetadataUtilsTest {
     @Rule
     public WireMockRule mockMetadataEndpoint = new WireMockRule();
 
-    @BeforeEach
+    @Before
     public void methodSetup() {
         System.setProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property(), "http://localhost:" + mockMetadataEndpoint.port());
         EC2MetadataUtils.clearCache();

core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProviderTest.java

@@ -21,7 +21,7 @@
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
 import org.junit.Rule;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.core.exception.SdkClientException;
 import software.amazon.awssdk.profiles.ProfileFileSystemSetting;
 import software.amazon.awssdk.regions.Region;

core/sdk-core/pom.xml

@@ -203,7 +203,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
+                        <artifactId>surefire-junit-platform</artifactId>
                         <version>${maven.surefire.version}</version>
                     </dependency>
                     <dependency>
@@ -259,7 +259,7 @@
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.maven.surefire</groupId>
-                            <artifactId>surefire-junit47</artifactId>
+                            <artifactId>surefire-junit-platform</artifactId>
                             <version>${maven.surefire.version}</version>
                         </dependency>
                     </dependencies>

core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/AsyncHttpClientApiCallTimeoutTests.java

@@ -33,9 +33,9 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
+import org.junit.Before;
 import org.junit.Rule;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException;
 import software.amazon.awssdk.core.exception.ApiCallTimeoutException;
 import software.amazon.awssdk.core.exception.SdkServiceException;
@@ -60,7 +60,7 @@ public class AsyncHttpClientApiCallTimeoutTests {
 
     private AmazonAsyncHttpClient httpClient;
 
-    @BeforeEach
+    @Before
     public void setup() {
         httpClient = testAsyncClientBuilder()
             .retryPolicy(RetryPolicy.none())

core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallAttemptTimeoutTest.java

@@ -30,9 +30,9 @@
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
+import org.junit.Before;
 import org.junit.Rule;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.NoopTestRequest;
@@ -56,7 +56,7 @@ public class HttpClientApiCallAttemptTimeoutTest {
 
     private AmazonSyncHttpClient httpClient;
 
-    @BeforeEach
+    @Before
     public void setup() {
         httpClient = testClientBuilder()
             .retryPolicy(RetryPolicy.none())

core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallTimeoutTest.java

@@ -30,9 +30,9 @@
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
+import org.junit.Before;
 import org.junit.Rule;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.core.exception.ApiCallTimeoutException;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.NoopTestRequest;
@@ -56,7 +56,7 @@ public class HttpClientApiCallTimeoutTest {
 
     private AmazonSyncHttpClient httpClient;
 
-    @BeforeEach
+    @Before
     public void setup() {
         httpClient = testClientBuilder()
             .retryPolicy(RetryPolicy.none())

core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MetricUtilsTest.java

@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.time.Duration;
 import org.junit.Rule;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
 import software.amazon.awssdk.core.metrics.CoreMetric;

core/sdk-core/src/test/java/software/amazon/awssdk/core/sync/RequestBodyTest.java

@@ -30,7 +30,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import org.junit.Rule;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import software.amazon.awssdk.core.internal.util.Mimetype;
 import software.amazon.awssdk.utils.IoUtils;

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java

@@ -32,12 +32,12 @@
 import java.net.URI;
 import javax.net.ssl.SSLException;
 import org.apache.http.NoHttpResponseException;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import software.amazon.awssdk.http.FileStoreTlsKeyManagersProvider;
 import software.amazon.awssdk.http.HttpExecuteRequest;
@@ -61,7 +61,7 @@ public class ApacheClientTlsAuthTest extends ClientTlsAuthTestBase {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-    @BeforeAll
+    @BeforeClass
     public static void setUp() throws IOException {
         ClientTlsAuthTestBase.setUp();
 
@@ -83,12 +83,12 @@ public static void setUp() throws IOException {
         keyManagersProvider = FileStoreTlsKeyManagersProvider.create(clientKeyStore, CLIENT_STORE_TYPE, STORE_PASSWORD);
     }
 
-    @BeforeEach
+    @Before
     public void methodSetup() {
         wireMockServer.stubFor(any(urlMatching(".*")).willReturn(aResponse().withStatus(200).withBody("{}")));
     }
 
-    @AfterAll
+    @AfterClass
     public static void teardown() throws IOException {
         wireMockServer.stop();
         System.clearProperty("javax.net.ssl.trustStore");
@@ -97,7 +97,7 @@ public static void teardown() throws IOException {
         ClientTlsAuthTestBase.teardown();
     }
 
-    @AfterEach
+    @After
     public void methodTeardown() {
         if (client != null) {
             client.close();

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheMetricsTest.java

@@ -23,12 +23,12 @@
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import java.io.IOException;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import software.amazon.awssdk.http.HttpExecuteRequest;
 import software.amazon.awssdk.http.HttpExecuteResponse;
@@ -47,23 +47,23 @@ public class ApacheMetricsTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-    @BeforeAll
+    @BeforeClass
     public static void setUp() throws IOException {
         wireMockServer = new WireMockServer();
         wireMockServer.start();
     }
 
-    @BeforeEach
+    @Before
     public void methodSetup() {
         wireMockServer.stubFor(any(urlMatching(".*")).willReturn(aResponse().withStatus(200).withBody("{}")));
     }
 
-    @AfterAll
+    @AfterClass
     public static void teardown() throws IOException {
         wireMockServer.stop();
     }
 
-    @AfterEach
+    @After
     public void methodTeardown() {
         if (client != null) {
             client.close();

http-clients/aws-crt-client/pom.xml

@@ -192,7 +192,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-junit47</artifactId>
+                        <artifactId>surefire-junit-platform</artifactId>
                         <version>${maven.surefire.version}</version>
                     </dependency>
                     <dependency>