Migrate most tests to JUnit 5 (#2931)

* Migrate most tests to JUnit 5

Author: Bennett-Lynch

codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/defaultsmode/DefaultsModeGenerationTest.java

@@ -19,8 +19,8 @@
 
 import java.io.File;
 import java.nio.file.Paths;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DefaultsModeGenerationTest {
 
@@ -30,7 +30,7 @@ public class DefaultsModeGenerationTest {
     private File file;
     private DefaultConfiguration defaultConfiguration;
 
-    @Before
+    @BeforeEach
     public void before() throws Exception {
         this.file = Paths.get(getClass().getResource(DEFAULT_CONFIGURATION).toURI()).toFile();
         this.defaultConfiguration = DefaultsLoader.load(file);

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.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.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;
 
-    @Before
+    @BeforeEach
     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

@@ -14,10 +14,10 @@
  */
 package software.amazon.awssdk.codegen.lite.regions;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RegionValidationUtilTest {
 

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

@@ -16,12 +16,12 @@
 package software.amazon.awssdk.codegen;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.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.BeforeClass;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.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;
 
 
-    @BeforeClass
+    @BeforeAll
     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.Test;
+import org.junit.jupiter.api.Test;
 
 public class CodeTransformerTest {
 

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.Test;
+import org.junit.jupiter.api.Test;
 
 public class UnusedImportRemoverTest {
 

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

@@ -14,34 +14,36 @@
  */
 package software.amazon.awssdk.codegen.internal;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 
 public class DocumentationUtilsTest {
 
     @Test
     public void strip_html_tags_null_or_empty_input_returns_empty_string() {
 
-        Assert.assertThat(DocumentationUtils.stripHtmlTags(null), Matchers
+        assertThat(DocumentationUtils.stripHtmlTags(null), Matchers
                 .isEmptyString());
-        Assert.assertThat(DocumentationUtils.stripHtmlTags(""), Matchers
+        assertThat(DocumentationUtils.stripHtmlTags(""), Matchers
                 .isEmptyString());
 
     }
 
     @Test
     public void html_tags_at_start_of_string_are_removed() {
-        Assert.assertEquals("foo", DocumentationUtils.stripHtmlTags
+        assertEquals("foo", DocumentationUtils.stripHtmlTags
                 ("<bar>foo</bar>"));
     }
 
     @Test
     public void empty_html_tags_at_start_are_removed() {
-        Assert.assertThat(DocumentationUtils.stripHtmlTags("<p></p>"), Matchers
+        assertThat(DocumentationUtils.stripHtmlTags("<p></p>"), Matchers
                 .isEmptyString());
-        Assert.assertThat(DocumentationUtils.stripHtmlTags("<p/>"), Matchers
+        assertThat(DocumentationUtils.stripHtmlTags("<p/>"), Matchers
                 .isEmptyString());
     }
 }

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.Test;
+import org.junit.jupiter.api.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.Test;
+import org.junit.jupiter.api.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.Test;
+import org.junit.jupiter.api.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.Test;
+import org.junit.jupiter.api.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

@@ -15,13 +15,13 @@
 
 package software.amazon.awssdk.codegen.model.service;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.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.Test;
+import org.junit.jupiter.api.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.Test;
+import org.junit.jupiter.api.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/common/EnumClassTest.java

@@ -20,7 +20,7 @@
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.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.Test;
+import org.junit.jupiter.api.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.Test;
+import org.junit.jupiter.api.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.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.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;
 
-    @BeforeClass
+    @BeforeAll
     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.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.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;
 
-    @BeforeClass
+    @BeforeAll
     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.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.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;
 
-    @BeforeClass
+    @BeforeAll
     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.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.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;
 
-    @BeforeClass
+    @BeforeAll
     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.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.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;
 
-    @BeforeClass
+    @BeforeAll
     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,25 +18,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
 
-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 org.junit.jupiter.api.Test;
 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 {
 

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.Test;
+import org.junit.jupiter.api.Test;
 
 public class ArnResourceTest {
 

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

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