Merge pull request #1861 from aws/millem/fix-release-2

Revert "[JUnit 5] Migrate tests which can be easily converted (#2878)…

Author: millems

codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java

@@ -19,8 +19,8 @@
 
 import java.io.File;
 import java.nio.file.Paths;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Before;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.lite.regions.model.Partition;
 import software.amazon.awssdk.codegen.lite.regions.model.Partitions;
 
@@ -35,7 +35,7 @@ public class RegionGenerationTest {
     private File endpoints;
     private Partitions partitions;
 
-    @BeforeEach
+    @Before
     public void before() throws Exception {
         this.endpoints = Paths.get(getClass().getResource(ENDPOINTS).toURI()).toFile();
         this.partitions = RegionMetadataLoader.build(endpoints);

codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtilTest.java

@@ -17,7 +17,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class RegionValidationUtilTest {
 

codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java

@@ -21,7 +21,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;

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

@@ -17,9 +17,9 @@
 
 
 import java.io.File;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.BeforeClass;
 import org.junit.Rule;
-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);

codegen/src/test/java/software/amazon/awssdk/codegen/emitters/CodeTransformerTest.java

@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class CodeTransformerTest {
 

codegen/src/test/java/software/amazon/awssdk/codegen/emitters/PoetGeneratorTaskIntegrationTest.java

@@ -31,8 +31,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
+import org.junit.After;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.poet.ClassSpec;
 
 public final class PoetGeneratorTaskIntegrationTest {
@@ -54,7 +54,7 @@ public void canGenerateJavaClass() throws Exception {
         assertThat(contents, both(containsString(PACKAGE)).and(startsWith(fileHeader)));
     }
 
-    @AfterEach
+    @After
     public void cleanUp() {
         tempDirectories.forEach(safeConsumer(tempDir -> {
             List<Path> files = Files.walk(Paths.get(tempDir)).collect(toList());

codegen/src/test/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemoverTest.java

@@ -21,7 +21,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class UnusedImportRemoverTest {
 

codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java

@@ -16,7 +16,7 @@
 
 import org.hamcrest.Matchers;
 import org.junit.Assert;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 
 public class DocumentationUtilsTest {

codegen/src/test/java/software/amazon/awssdk/codegen/internal/UtilsTest.java

@@ -21,7 +21,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class UtilsTest {
     final Map<String,String> capitalizedToUncapitalized = new HashMap<String,String>() {{

codegen/src/test/java/software/amazon/awssdk/codegen/jmespath/JmesPathParserTest.java

@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.jmespath.component.Comparator;
 import software.amazon.awssdk.codegen.jmespath.component.Expression;
 import software.amazon.awssdk.codegen.jmespath.parser.JmesPathParser;

codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationBuilderTest.java

@@ -19,7 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static software.amazon.awssdk.codegen.TestStringUtils.toPlatformLfs;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.docs.DocumentationBuilder;
 
 public class DocumentationBuilderTest {

codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModelTest.java

@@ -19,7 +19,7 @@
 
 import java.io.File;
 import java.util.Collections;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;

codegen/src/test/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinitionTest.java

@@ -21,7 +21,7 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class PaginatorDefinitionTest {
 

codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetCollectorsTest.java

@@ -19,7 +19,7 @@
 
 import com.squareup.javapoet.CodeBlock;
 import java.util.stream.Stream;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 /**
  * Validate functionality of the {@link PoetCollectors}.

codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java

@@ -19,7 +19,7 @@
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
 import java.util.function.Function;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.poet.ClassSpec;
 import software.amazon.awssdk.codegen.poet.ClientTestModels;

codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/PoetClientFunctionalTests.java

@@ -18,7 +18,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.poet.ClassSpec;

codegen/src/test/java/software/amazon/awssdk/codegen/poet/common/EnumClassTest.java

@@ -20,7 +20,7 @@
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
 import java.io.IOException;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.model.intermediate.EnumModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeType;

codegen/src/test/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java

@@ -17,7 +17,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.poet.ClientTestModels;

codegen/src/test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java

@@ -19,7 +19,7 @@
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
 import java.util.function.BiFunction;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.intermediate.OperationModel;

codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpecTest.java

@@ -20,8 +20,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
@@ -32,7 +32,7 @@
 public class AwsServiceBaseRequestSpecTest {
     private static IntermediateModel intermediateModel;
 
-    @BeforeAll
+    @BeforeClass
     public static void setUp() throws IOException {
         File serviceModelFile = new File(AwsModelSpecTest.class.getResource("service-2.json").getFile());
         File customizationConfigFile = new File(AwsModelSpecTest.class

codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpecTest.java

@@ -20,8 +20,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
@@ -32,7 +32,7 @@
 public class AwsServiceBaseResponseSpecTest {
     private static IntermediateModel intermediateModel;
 
-    @BeforeAll
+    @BeforeClass
     public static void setUp() throws IOException {
         File serviceModelFile = new File(AwsModelSpecTest.class.getResource("service-2.json").getFile());
         File customizationConfigFile = new File(AwsModelSpecTest.class

codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClassSpecTest.java

@@ -19,8 +19,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
@@ -31,7 +31,7 @@
 public class BaseExceptionClassSpecTest {
         private static IntermediateModel intermediateModel;
 
-    @BeforeAll
+    @BeforeClass
     public static void setUp() throws IOException {
         File serviceModelFile = new File(AwsModelSpecTest.class.getResource("service-2.json").getFile());
         File customizationConfigFile = new File(AwsModelSpecTest.class

codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpecTest.java

@@ -20,8 +20,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
@@ -33,7 +33,7 @@ public class ResponseMetadataSpecTest {
     private static IntermediateModel model;
     private static IntermediateModel modelWithCustomizedResponseMetadata;
 
-    @BeforeAll
+    @BeforeClass
     public static void setUp() throws IOException {
         File serviceModelFile = new File(AwsModelSpecTest.class.getResource("service-2.json")
                                                                          .getFile());

codegen/src/test/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java

@@ -21,8 +21,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
@@ -42,7 +42,7 @@ public class PaginatedResponseClassSpecTest {
     private static Paginators paginators;
     private static Map<String, String> paginationCustomization;
 
-    @BeforeAll
+    @BeforeClass
     public static void setUp() throws IOException {
         File serviceModelFile = new File(PaginatedResponseClassSpecTest.class.getResource("service-2.json").getFile());
         File customizationConfigFile = new File(PaginatedResponseClassSpecTest.class.getResource("customization.config")

codegen/src/test/java/software/amazon/awssdk/codegen/poet/waiters/WaitersClassSpecTest.java

@@ -18,9 +18,25 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
-import org.junit.jupiter.api.Test;
+import java.io.File;
+import java.io.IOException;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import software.amazon.awssdk.codegen.C2jModels;
+import software.amazon.awssdk.codegen.IntermediateModelBuilder;
+import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
+import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
+import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
 import software.amazon.awssdk.codegen.poet.ClassSpec;
 import software.amazon.awssdk.codegen.poet.ClientTestModels;
+import software.amazon.awssdk.codegen.poet.client.AsyncClientClass;
+import software.amazon.awssdk.codegen.poet.client.AsyncClientInterface;
+import software.amazon.awssdk.codegen.poet.client.ClientSimpleMethodsIntegrationTests;
+import software.amazon.awssdk.codegen.poet.client.SyncClientClass;
+import software.amazon.awssdk.codegen.poet.client.SyncClientInterface;
+import software.amazon.awssdk.codegen.poet.paginators.PaginatedResponseClassSpecTest;
+import software.amazon.awssdk.codegen.utils.ModelLoaderUtils;
 
 public class WaitersClassSpecTest {
 

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-simple-methods-integ-class.java

@@ -1,15 +1,15 @@
 package software.amazon.awssdk.services.json;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.regions.Region;
 
 @Generated("software.amazon.awssdk:codegen")
 public class SimpleMethodsIntegrationTest {
     private static JsonClient client;
 
-    @BeforeAll
+    @BeforeClass
     public static void setup() {
         if (JsonClient.serviceMetadata().regions().isEmpty()) {
             client = JsonClient.builder().region(Region.US_EAST_1).build();

core/arns/src/test/java/software/amazon/awssdk/arns/ArnResourceTest.java

@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Optional;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 public class ArnResourceTest {
 

core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java

@@ -18,7 +18,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.junit.jupiter.api.Test;
+import java.util.Optional;
+import org.junit.Test;
 
 public class ArnTest {
 

core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/AwsCrt4aSigningAdapterTest.java

@@ -9,8 +9,8 @@
 
 import java.util.Arrays;
 import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.Before;
+import org.junit.Test;
 import software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig;
 import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsSignedChunkedEncodingInputStream;
 import software.amazon.awssdk.authcrt.signer.SignerTestUtils;
@@ -25,7 +25,7 @@ public class AwsCrt4aSigningAdapterTest {
     AwsCrt4aSigningAdapter crtSigningAdapter;
     SigningConfigProvider configProvider;
 
-    @BeforeEach
+    @Before
     public void setup() {
         crtSigningAdapter = new AwsCrt4aSigningAdapter();
         configProvider = new SigningConfigProvider();