diff --git a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/defaultsmode/DefaultsModeGenerationTest.java b/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/defaultsmode/DefaultsModeGenerationTest.java index 9ceb3c9e40d4..4a804d0d9c45 100644 --- a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/defaultsmode/DefaultsModeGenerationTest.java +++ b/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); diff --git a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java b/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java index 4bd602b4e78e..0240958a17d9 100644 --- a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java +++ b/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); diff --git a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtilTest.java b/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtilTest.java index 80c47e3c2f90..7e71b0c2442e 100644 --- a/codegen-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtilTest.java +++ b/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 { diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java index 378f45a6f4b4..413c11d63749 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java +++ b/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; diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/customization/processors/UseLegacyEventGenerationSchemeProcessorTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/customization/processors/UseLegacyEventGenerationSchemeProcessorTest.java index ff041882bbc7..8ce643852ef8 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/customization/processors/UseLegacyEventGenerationSchemeProcessorTest.java +++ b/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); diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/CodeTransformerTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/CodeTransformerTest.java index 48d97e5804b8..64cf563712d0 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/CodeTransformerTest.java +++ b/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 { diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemoverTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemoverTest.java index 20766c8cd6c6..81e637e47e7a 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemoverTest.java +++ b/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 { diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java index a07e367409cc..4054a8e55ecf 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java +++ b/codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java @@ -14,9 +14,11 @@ */ 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 { @@ -24,24 +26,24 @@ 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 ("foo")); } @Test public void empty_html_tags_at_start_are_removed() { - Assert.assertThat(DocumentationUtils.stripHtmlTags("

"), Matchers + assertThat(DocumentationUtils.stripHtmlTags("

"), Matchers .isEmptyString()); - Assert.assertThat(DocumentationUtils.stripHtmlTags("

"), Matchers + assertThat(DocumentationUtils.stripHtmlTags("

"), Matchers .isEmptyString()); } } diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/internal/UtilsTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/internal/UtilsTest.java index cacce1621c53..6df868851e1f 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/internal/UtilsTest.java +++ b/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 capitalizedToUncapitalized = new HashMap() {{ diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/jmespath/JmesPathParserTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/jmespath/JmesPathParserTest.java index a1b9b0ad8f51..7687a36fbcc4 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/jmespath/JmesPathParserTest.java +++ b/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; diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationBuilderTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationBuilderTest.java index b83ad1f93a44..ad83e3bb5264 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationBuilderTest.java +++ b/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 { diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModelTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModelTest.java index 418e9b49b40a..d87cf898932f 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModelTest.java +++ b/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; diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinitionTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinitionTest.java index a1c09b74f7fd..e0b6af9ce4fa 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinitionTest.java +++ b/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 { diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetCollectorsTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetCollectorsTest.java index 99a2b9331ad2..d475207532d5 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetCollectorsTest.java +++ b/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}. diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java index 385b97df4679..88b8c068dd62 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java +++ b/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; diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/common/EnumClassTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/common/EnumClassTest.java index 80c8fcf87907..e2de6a1252ae 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/common/EnumClassTest.java +++ b/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; diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java index 6bd879fc697a..e0b6cd4ab35d 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java +++ b/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; diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java index c60d8c5ee2be..c2bf962b5ab1 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java +++ b/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; diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpecTest.java index 0f6a6a9b16ad..b5b07319b027 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpecTest.java +++ b/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 diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpecTest.java index 3b58688d4f4f..4700fc8bc854 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpecTest.java +++ b/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 diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClassSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClassSpecTest.java index 964def2d18b5..d53d7e0a30f4 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClassSpecTest.java +++ b/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 diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpecTest.java index f4a42ee702a3..e1e8d131d6bf 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpecTest.java +++ b/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()); diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java index a55b77c3a53c..6527a4f8306d 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java +++ b/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 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") diff --git a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/waiters/WaitersClassSpecTest.java b/codegen/src/test/java/software/amazon/awssdk/codegen/poet/waiters/WaitersClassSpecTest.java index 1713518aaf40..bad46646a763 100644 --- a/codegen/src/test/java/software/amazon/awssdk/codegen/poet/waiters/WaitersClassSpecTest.java +++ b/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 { diff --git a/core/arns/src/test/java/software/amazon/awssdk/arns/ArnResourceTest.java b/core/arns/src/test/java/software/amazon/awssdk/arns/ArnResourceTest.java index e5fa6c0b6d8d..6ec3e4181362 100644 --- a/core/arns/src/test/java/software/amazon/awssdk/arns/ArnResourceTest.java +++ b/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 { diff --git a/core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java b/core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java index 7a4e26e2606d..1ef33c7d0033 100644 --- a/core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java +++ b/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 { diff --git a/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/AwsCrt4aSigningAdapterTest.java b/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/AwsCrt4aSigningAdapterTest.java index 24ff4829ca56..90029a2648c7 100644 --- a/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/AwsCrt4aSigningAdapterTest.java +++ b/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/AwsCrt4aSigningAdapterTest.java @@ -1,7 +1,7 @@ package software.amazon.awssdk.authcrt.signer.internal; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static software.amazon.awssdk.auth.signer.internal.Aws4SignerUtils.calculateRequestContentLength; import static software.amazon.awssdk.authcrt.signer.SignerTestUtils.extractSignatureFromAuthHeader; import static software.amazon.awssdk.authcrt.signer.SignerTestUtils.extractSignedHeadersFromAuthHeader; @@ -9,14 +9,14 @@ import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsSignedChunkedEncodingInputStream; import software.amazon.awssdk.authcrt.signer.SignerTestUtils; import software.amazon.awssdk.authcrt.signer.SigningTestCase; import software.amazon.awssdk.authcrt.signer.internal.chunkedencoding.AwsS3V4aChunkSigner; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; +import software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig; import software.amazon.awssdk.crt.auth.signing.AwsSigningConfig; import software.amazon.awssdk.http.SdkHttpFullRequest; @@ -25,7 +25,7 @@ public class AwsCrt4aSigningAdapterTest { AwsCrt4aSigningAdapter crtSigningAdapter; SigningConfigProvider configProvider; - @Before + @BeforeEach public void setup() { crtSigningAdapter = new AwsCrt4aSigningAdapter(); configProvider = new SigningConfigProvider(); diff --git a/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/CrtHttpRequestConverterTest.java b/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/CrtHttpRequestConverterTest.java index 34b5fea67b04..14706ad1f267 100644 --- a/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/CrtHttpRequestConverterTest.java +++ b/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/CrtHttpRequestConverterTest.java @@ -23,8 +23,8 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.crt.http.HttpHeader; import software.amazon.awssdk.crt.http.HttpRequest; import software.amazon.awssdk.crt.http.HttpRequestBodyStream; @@ -36,7 +36,7 @@ public class CrtHttpRequestConverterTest { CrtHttpRequestConverter converter; - @Before + @BeforeEach public void setup() { converter = new CrtHttpRequestConverter(); } diff --git a/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/SigningConfigProviderTest.java b/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/SigningConfigProviderTest.java index ac54bd625b04..49769dcd2b2b 100644 --- a/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/SigningConfigProviderTest.java +++ b/core/auth-crt/src/test/java/software/amazon/awssdk/authcrt/signer/internal/SigningConfigProviderTest.java @@ -16,13 +16,13 @@ package software.amazon.awssdk.authcrt.signer.internal; import static org.assertj.core.api.Assertions.assertThat; -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 java.time.Instant; import java.time.temporal.ChronoUnit; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute; import software.amazon.awssdk.auth.signer.S3SignerExecutionAttribute; import software.amazon.awssdk.auth.signer.internal.SignerConstant; @@ -35,7 +35,7 @@ public class SigningConfigProviderTest { SigningConfigProvider configProvider; - @Before + @BeforeEach public void setup() { configProvider = new SigningConfigProvider(); } diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChainTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChainTest.java index ea8b688e3161..2b848d25fc77 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/AwsCredentialsProviderChainTest.java +++ b/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.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.profiles.ProfileFile; diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsRetryPolicyTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsRetryPolicyTest.java index 38b4b7c8d4fd..9b9d61e00f46 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsRetryPolicyTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsRetryPolicyTest.java @@ -15,12 +15,12 @@ package software.amazon.awssdk.auth.credentials; -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 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.auth.credentials.internal.ContainerCredentialsRetryPolicy; import software.amazon.awssdk.regions.util.ResourcesEndpointRetryParameters; @@ -28,7 +28,7 @@ public class ContainerCredentialsRetryPolicyTest { private static ContainerCredentialsRetryPolicy retryPolicy; - @BeforeClass + @BeforeAll public static void setup() { retryPolicy = new ContainerCredentialsRetryPolicy(); } diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialsEndpointRetryParametersTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialsEndpointRetryParametersTest.java index aad419e649ba..ad52f6a1d8b0 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialsEndpointRetryParametersTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/CredentialsEndpointRetryParametersTest.java @@ -15,12 +15,12 @@ package software.amazon.awssdk.auth.credentials; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.regions.util.ResourcesEndpointRetryParameters; /** diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProviderTest.java index 2d54507d5ca5..8d73b1a364af 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProviderTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/HttpCredentialsProviderTest.java @@ -31,9 +31,9 @@ import java.time.Duration; import java.time.Instant; import java.util.Date; -import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.core.util.SdkUserAgent; import software.amazon.awssdk.regions.util.ResourcesEndpointProvider; @@ -51,7 +51,7 @@ public class HttpCredentialsProviderTest { private static String successResponseWithInvalidBody; - @BeforeClass + @BeforeAll public static void setup() throws IOException { try (InputStream successInputStream = HttpCredentialsProviderTest.class.getResourceAsStream ("/resources/wiremock/successResponse.json"); diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderTest.java index 05b4fb6f5885..1858cb1a2f80 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/InstanceProfileCredentialsProviderTest.java @@ -23,6 +23,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; + import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.client.WireMock; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; @@ -30,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.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.core.SdkSystemSetting; import software.amazon.awssdk.core.exception.SdkClientException; @@ -56,12 +57,12 @@ public class InstanceProfileCredentialsProviderTest { @Rule public WireMockRule mockMetadataEndpoint = new WireMockRule(); - @Before + @BeforeEach public void methodSetup() { System.setProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property(), "http://localhost:" + mockMetadataEndpoint.port()); } - @AfterClass + @AfterAll public static void teardown() { System.clearProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property()); } diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProviderTest.java index 8be07bb42bf0..d6f261779206 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProviderTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/ProfileCredentialsProviderTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.profiles.ProfileFile; import software.amazon.awssdk.profiles.ProfileProperty; diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/AwsSessionCredentialsTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/AwsSessionCredentialsTest.java index de34421dee4b..8e9c6a9ee975 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/AwsSessionCredentialsTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/AwsSessionCredentialsTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsSessionCredentials; public class AwsSessionCredentialsTest { diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/EndpointModeTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/EndpointModeTest.java index 539666d8227d..b6409ed758d9 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/EndpointModeTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/EndpointModeTest.java @@ -19,7 +19,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static software.amazon.awssdk.auth.credentials.internal.Ec2MetadataConfigProvider.EndpointMode.IPV4; import static software.amazon.awssdk.auth.credentials.internal.Ec2MetadataConfigProvider.EndpointMode.IPV6; -import org.junit.Test; + +import org.junit.jupiter.api.Test; public class EndpointModeTest { @Test diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProviderTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProviderTest.java index e712ea6257ce..8c0ba8cd62ec 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProviderTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/LazyAwsCredentialsProviderTest.java @@ -16,8 +16,8 @@ package software.amazon.awssdk.auth.credentials.internal; import java.util.function.Supplier; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; import software.amazon.awssdk.utils.SdkAutoCloseable; @@ -28,7 +28,7 @@ public class LazyAwsCredentialsProviderTest { private AwsCredentialsProvider credentials = Mockito.mock(AwsCredentialsProvider.class); - @Before + @BeforeEach public void reset() { Mockito.reset(credentials, credentialsConstructor); Mockito.when(credentialsConstructor.get()).thenReturn(credentials); diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsTest.java index 1f1a820a3c14..056d964c03d3 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/credentials/internal/ProfileCredentialsUtilsTest.java @@ -16,15 +16,15 @@ package software.amazon.awssdk.auth.credentials.internal; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.io.File; import java.util.Arrays; import java.util.List; import java.util.function.Consumer; -import org.assertj.core.api.Assertions; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsSessionCredentials; import software.amazon.awssdk.auth.credentials.ProcessCredentialsProviderTest; @@ -35,12 +35,12 @@ public class ProfileCredentialsUtilsTest { private static String scriptLocation; - @BeforeClass + @BeforeAll public static void setup() { scriptLocation = ProcessCredentialsProviderTest.copyProcessCredentialsScript(); } - @AfterClass + @AfterAll public static void teardown() { if (scriptLocation != null && !new File(scriptLocation).delete()) { throw new IllegalStateException("Failed to delete file: " + scriptLocation); @@ -66,12 +66,12 @@ public void roleProfileCanInheritFromAnotherFile() { ProfileFile configProfile = aggregateFileProfiles(configChild, credentialsSource); Consumer profileValidator = profileFile -> - Assertions.assertThatThrownBy(new ProfileCredentialsUtils(profileFile, profileFile.profiles().get("child"), + assertThatThrownBy(new ProfileCredentialsUtils(profileFile, profileFile.profiles().get("child"), profileFile::profile)::credentialsProvider) .hasMessageContaining("the 'sts' service module must be on the class path"); - Assertions.assertThat(sourceProfile).satisfies(profileValidator); - Assertions.assertThat(configProfile).satisfies(profileValidator); + assertThat(sourceProfile).satisfies(profileValidator); + assertThat(configProfile).satisfies(profileValidator); } @Test @@ -79,7 +79,7 @@ public void roleProfileWithMissingSourceThrowsException() { ProfileFile profileFile = configFile("[profile test]\n" + "source_profile=source\n" + "role_arn=arn:aws:iam::123456789012:role/testRole"); - Assertions.assertThatThrownBy(new ProfileCredentialsUtils(profileFile, profileFile.profile("test") + assertThatThrownBy(new ProfileCredentialsUtils(profileFile, profileFile.profile("test") .get(), profileFile::profile)::credentialsProvider) .hasMessageContaining("source profile has no credentials configured."); } @@ -93,7 +93,7 @@ public void roleProfileWithSourceThatHasNoCredentialsThrowsExceptionWhenLoadingC assertThat(profiles.profile("test")).hasValueSatisfying(profile -> { ProfileCredentialsUtils profileCredentialsUtils = new ProfileCredentialsUtils(profiles, profile, profiles::profile); - Assertions.assertThatThrownBy(profileCredentialsUtils::credentialsProvider) + assertThatThrownBy(profileCredentialsUtils::credentialsProvider) .hasMessageContaining("source profile has no credentials configured"); }); } @@ -132,7 +132,7 @@ public void profileFileWithSessionCredentialsLoadsCorrectly() { assertThat(credentials).isInstanceOf(AwsSessionCredentials.class); assertThat(credentials.accessKeyId()).isEqualTo("defaultAccessKey"); assertThat(credentials.secretAccessKey()).isEqualTo("defaultSecretAccessKey"); - Assertions.assertThat(((AwsSessionCredentials) credentials).sessionToken()).isEqualTo("awsSessionToken"); + assertThat(((AwsSessionCredentials) credentials).sessionToken()).isEqualTo("awsSessionToken"); }); }); }); @@ -160,7 +160,7 @@ public void profileFileWithAssumeRoleThrowsExceptionWhenRetrievingCredentialsPro assertThat(profile.property(ProfileProperty.REGION)).isNotPresent(); ProfileCredentialsUtils profileCredentialsUtils = new ProfileCredentialsUtils(profileFile, profile, profileFile::profile); - Assertions.assertThatThrownBy(profileCredentialsUtils::credentialsProvider).isInstanceOf(IllegalStateException.class); + assertThatThrownBy(profileCredentialsUtils::credentialsProvider).isInstanceOf(IllegalStateException.class); }); } @@ -177,7 +177,7 @@ public void profileFileWithCredentialSourceThrowsExceptionWhenRetrievingCredenti assertThat(profile.property(ProfileProperty.REGION)).isNotPresent(); ProfileCredentialsUtils profileCredentialsUtils = new ProfileCredentialsUtils(profileFile, profile, profileFile::profile); - Assertions.assertThatThrownBy(profileCredentialsUtils::credentialsProvider).isInstanceOf(IllegalStateException.class); + assertThatThrownBy(profileCredentialsUtils::credentialsProvider).isInstanceOf(IllegalStateException.class); }); }); } @@ -199,7 +199,7 @@ public void profileFileWithCircularDependencyThrowsExceptionWhenResolvingCredent "[profile test3]\n" + "source_profile=test2\n" + "role_arn=arn:aws:iam::123456789012:role/testRole3"); - Assertions.assertThatThrownBy(() -> new ProfileCredentialsUtils(configFile, configFile.profile("test").get(), configFile::profile) + assertThatThrownBy(() -> new ProfileCredentialsUtils(configFile, configFile.profile("test").get(), configFile::profile) .credentialsProvider()) .isInstanceOf(IllegalStateException.class) .hasMessageContaining("Invalid profile file: Circular relationship detected with profiles"); @@ -215,7 +215,7 @@ public void profileWithBothCredentialSourceAndSourceProfileThrowsException() { "[profile source]\n" + "aws_access_key_id=defaultAccessKey\n" + "aws_secret_access_key=defaultSecretAccessKey"); - Assertions.assertThatThrownBy(() -> new ProfileCredentialsUtils(configFile, configFile.profile("test").get(), configFile::profile) + assertThatThrownBy(() -> new ProfileCredentialsUtils(configFile, configFile.profile("test").get(), configFile::profile) .credentialsProvider()) .isInstanceOf(IllegalStateException.class) .hasMessageContaining("Invalid profile file: profile has both source_profile and credential_source."); @@ -226,7 +226,7 @@ public void profileWithInvalidCredentialSourceThrowsException() { ProfileFile configFile = configFile("[profile test]\n" + "credential_source=foobar\n" + "role_arn=arn:aws:iam::123456789012:role/testRole3"); - Assertions.assertThatThrownBy(() -> new ProfileCredentialsUtils(configFile, configFile.profile("test").get(), configFile::profile) + assertThatThrownBy(() -> new ProfileCredentialsUtils(configFile, configFile.profile("test").get(), configFile::profile) .credentialsProvider()) .isInstanceOf(IllegalArgumentException.class) .hasMessageContaining("foobar is not a valid credential_source"); diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/AbstractAws4SignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/AbstractAws4SignerTest.java index 9b028c2444bf..da099da64b47 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/AbstractAws4SignerTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/AbstractAws4SignerTest.java @@ -15,9 +15,9 @@ package software.amazon.awssdk.auth.signer; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.signer.internal.AbstractAws4Signer; public class AbstractAws4SignerTest { diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4EventStreamSignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4EventStreamSignerTest.java index eedded3748f9..7414d8ff3f89 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4EventStreamSignerTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/Aws4EventStreamSignerTest.java @@ -15,6 +15,7 @@ package software.amazon.awssdk.auth.signer; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -43,8 +44,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.assertj.core.util.Lists; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; @@ -152,13 +152,13 @@ public void onNext(Object o) { @Override public void onError(Throwable t) { - Assert.fail("onError should never been called"); + fail("onError should never been called"); } @Override public void onComplete() { - Assert.fail("onComplete should never been called"); + fail("onComplete should never been called"); } }); diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/EventStreamAws4SignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/EventStreamAws4SignerTest.java index 6c4b8bbec0a2..ce2f2745b77e 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/EventStreamAws4SignerTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/EventStreamAws4SignerTest.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentials; import software.amazon.awssdk.auth.signer.internal.SignerTestUtils; diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/NonStreamingAsyncBodyAws4SignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/NonStreamingAsyncBodyAws4SignerTest.java index d112676e2ccf..28f94e983a38 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/NonStreamingAsyncBodyAws4SignerTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/NonStreamingAsyncBodyAws4SignerTest.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; + import io.reactivex.Flowable; import java.io.ByteArrayInputStream; import java.nio.ByteBuffer; @@ -31,7 +32,7 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParamsTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParamsTest.java index 8b470001fbb0..41ebf8260680 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParamsTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/Aws4SignerRequestParamsTest.java @@ -16,9 +16,10 @@ package software.amazon.awssdk.auth.signer.internal; import static org.assertj.core.api.Assertions.assertThat; + import java.time.Duration; import java.time.Instant; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.signer.params.Aws4SignerParams; import software.amazon.awssdk.regions.Region; diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4SignerTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4SignerTest.java index 6e78ea6f8f79..1eaca27065c4 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4SignerTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/BaseEventStreamAsyncAws4SignerTest.java @@ -16,12 +16,13 @@ package software.amazon.awssdk.auth.signer.internal; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; import java.util.Random; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.BinaryUtils; import software.amazon.eventstream.HeaderValue; import software.amazon.eventstream.Message; @@ -29,7 +30,7 @@ public class BaseEventStreamAsyncAws4SignerTest { private static Map headers; - @BeforeClass + @BeforeAll public static void setup() { headers = new LinkedHashMap<>(); headers.put("header1", HeaderValue.fromInteger(42)); diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/ChunkedEncodingFunctionalTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/ChunkedEncodingFunctionalTest.java index 9763b2b8d99f..975c0e937469 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/ChunkedEncodingFunctionalTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/ChunkedEncodingFunctionalTest.java @@ -23,10 +23,10 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; -import software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig; -import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsSignedChunkedEncodingInputStream; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsS3V4ChunkSigner; +import software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsSignedChunkedEncodingInputStream; +import software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig; import software.amazon.awssdk.utils.BinaryUtils; /** diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/DigestComputingSubscriberTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/DigestComputingSubscriberTest.java index c82dbec4c673..41bf5b43eb32 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/DigestComputingSubscriberTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/DigestComputingSubscriberTest.java @@ -21,10 +21,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; + import io.reactivex.Flowable; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscription; import software.amazon.awssdk.utils.BinaryUtils; diff --git a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerKeyTest.java b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerKeyTest.java index 9100c163965c..8109370aeb21 100644 --- a/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerKeyTest.java +++ b/core/auth/src/test/java/software/amazon/awssdk/auth/signer/internal/SignerKeyTest.java @@ -16,8 +16,9 @@ package software.amazon.awssdk.auth.signer.internal; import static org.assertj.core.api.Assertions.assertThat; + import java.time.Instant; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SignerKeyTest { diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/endpoint/DefaultServiceEndpointBuilderTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/endpoint/DefaultServiceEndpointBuilderTest.java index 38b65f87a653..4037e5bf1dcf 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/endpoint/DefaultServiceEndpointBuilderTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/endpoint/DefaultServiceEndpointBuilderTest.java @@ -15,9 +15,9 @@ package software.amazon.awssdk.awscore.client.endpoint; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.awscore.endpoint.DefaultServiceEndpointBuilder; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption; diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/eventstream/EventStreamInitialRequestInterceptorTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/eventstream/EventStreamInitialRequestInterceptorTest.java index 6d3cd56598da..07d486478163 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/eventstream/EventStreamInitialRequestInterceptorTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/eventstream/EventStreamInitialRequestInterceptorTest.java @@ -15,9 +15,9 @@ package software.amazon.awssdk.awscore.eventstream; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.when; import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.HAS_INITIAL_REQUEST_EVENT; import static software.amazon.awssdk.core.internal.util.Mimetype.MIMETYPE_EVENT_STREAM; @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.core.async.AsyncRequestBody; import software.amazon.awssdk.core.interceptor.Context.ModifyHttpRequest; diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsErrorDetailsTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsErrorDetailsTest.java index 36c949822e10..f4b140f7688d 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsErrorDetailsTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsErrorDetailsTest.java @@ -15,14 +15,13 @@ package software.amazon.awssdk.awscore.exception; -import java.io.IOException; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AwsErrorDetailsTest { @Test - public void equals_hashcode() throws IOException, ClassNotFoundException { + public void equals_hashcode() throws Exception { EqualsVerifier.forClass(AwsErrorDetails.class) .usingGetClass() .verify(); diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionSerializationTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionSerializationTest.java index e71d1abf86a8..6c7713d4b8e5 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionSerializationTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionSerializationTest.java @@ -19,23 +19,19 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.Duration; -import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.AbortableInputStream; import software.amazon.awssdk.http.SdkHttpFullResponse; import software.amazon.awssdk.http.SdkHttpResponse; -import software.amazon.awssdk.testutils.InputStreamUtils; -import software.amazon.awssdk.utils.IoUtils; import software.amazon.awssdk.utils.StringInputStream; public class AwsServiceExceptionSerializationTest { @Test - public void serializeServiceException() throws IOException, ClassNotFoundException { + public void serializeServiceException() throws Exception { AwsServiceException expectedException = createException(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java index b9e003a4c4e4..189b7c0d9215 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/exception/AwsServiceExceptionTest.java @@ -19,7 +19,7 @@ import java.time.Duration; import java.time.Instant; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpFullResponse; import software.amazon.awssdk.http.SdkHttpResponse; import software.amazon.awssdk.utils.DateUtils; diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptorTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptorTest.java index 471eedcff9b8..76dc2cc3c465 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptorTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/interceptor/HelpfulUnknownHostExceptionInterceptorTest.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.net.UnknownHostException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.awscore.AwsExecutionAttribute; import software.amazon.awssdk.core.SdkRequest; diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/internal/defaultsmode/DefaultsModeConfigurationTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/internal/defaultsmode/DefaultsModeConfigurationTest.java index e7a2ba9f7b9b..d0fe6e1927c3 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/internal/defaultsmode/DefaultsModeConfigurationTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/internal/defaultsmode/DefaultsModeConfigurationTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.awscore.defaultsmode.DefaultsMode; import software.amazon.awssdk.utils.AttributeMap; diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicyTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicyTest.java index 002e93f81633..38c306d1c4de 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicyTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/AwsRetryPolicyTest.java @@ -15,15 +15,15 @@ package software.amazon.awssdk.awscore.retry; import static java.time.temporal.ChronoUnit.HOURS; -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 static software.amazon.awssdk.awscore.retry.AwsRetryPolicy.defaultRetryCondition; import java.io.IOException; import java.time.Duration; import java.time.Instant; import java.util.function.Consumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.awscore.exception.AwsErrorDetails; import software.amazon.awssdk.awscore.exception.AwsServiceException; import software.amazon.awssdk.core.exception.NonRetryableException; @@ -31,7 +31,6 @@ import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.core.retry.RetryPolicyContext; import software.amazon.awssdk.http.SdkHttpFullResponse; -import software.amazon.awssdk.http.SdkHttpResponse; import software.amazon.awssdk.utils.DateUtils; public class AwsRetryPolicyTest { diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/RetryOnErrorCodeConditionTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/RetryOnErrorCodeConditionTest.java index bb72774c6511..229fcf6b1dee 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/RetryOnErrorCodeConditionTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/retry/RetryOnErrorCodeConditionTest.java @@ -15,16 +15,15 @@ package software.amazon.awssdk.awscore.retry; -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 com.google.common.collect.Sets; import java.util.function.Consumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.awscore.exception.AwsErrorDetails; import software.amazon.awssdk.awscore.exception.AwsServiceException; import software.amazon.awssdk.awscore.retry.conditions.RetryOnErrorCodeCondition; -import software.amazon.awssdk.core.exception.SdkServiceException; import software.amazon.awssdk.core.retry.RetryPolicyContext; public class RetryOnErrorCodeConditionTest { diff --git a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/util/AwsHostNameUtilsTest.java b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/util/AwsHostNameUtilsTest.java index 91a2cb1cfd90..bd49c77e2667 100644 --- a/core/aws-core/src/test/java/software/amazon/awssdk/awscore/util/AwsHostNameUtilsTest.java +++ b/core/aws-core/src/test/java/software/amazon/awssdk/awscore/util/AwsHostNameUtilsTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static software.amazon.awssdk.awscore.util.AwsHostNameUtils.parseSigningRegion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.regions.Region; /** Unit tests for the utility methods that parse information from AWS URLs. */ diff --git a/core/json-utils/src/test/java/software/amazon/awssdk/protocols/jsoncore/JsonNodeTest.java b/core/json-utils/src/test/java/software/amazon/awssdk/protocols/jsoncore/JsonNodeTest.java index 756c891a9225..1f79c0d6b605 100644 --- a/core/json-utils/src/test/java/software/amazon/awssdk/protocols/jsoncore/JsonNodeTest.java +++ b/core/json-utils/src/test/java/software/amazon/awssdk/protocols/jsoncore/JsonNodeTest.java @@ -4,7 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.StringInputStream; public class JsonNodeTest { diff --git a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/MetricLevelTest.java b/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/MetricLevelTest.java index 317538e32b16..d265253609e4 100644 --- a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/MetricLevelTest.java +++ b/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/MetricLevelTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MetricLevelTest { @Test diff --git a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollectionTest.java b/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollectionTest.java index 65d168b4e1a7..183cb51b12e4 100644 --- a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollectionTest.java +++ b/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollectionTest.java @@ -25,8 +25,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.metrics.MetricCategory; import software.amazon.awssdk.metrics.MetricLevel; import software.amazon.awssdk.metrics.MetricRecord; @@ -35,7 +35,7 @@ public class DefaultMetricCollectionTest { private static final SdkMetric M1 = SdkMetric.create("m1", Integer.class, MetricLevel.INFO, MetricCategory.CORE); - @AfterClass + @AfterAll public static void teardown() { DefaultSdkMetric.clearDeclaredMetrics(); } diff --git a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollectorTest.java b/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollectorTest.java index d3f0682d6c8d..1e9abdf09702 100644 --- a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollectorTest.java +++ b/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultMetricCollectorTest.java @@ -16,10 +16,11 @@ package software.amazon.awssdk.metrics.internal; import static org.assertj.core.api.Assertions.assertThat; + import java.util.stream.Stream; -import org.junit.AfterClass; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.metrics.MetricCategory; import software.amazon.awssdk.metrics.MetricCollection; @@ -33,7 +34,7 @@ public class DefaultMetricCollectorTest { @Rule public ExpectedException thrown = ExpectedException.none(); - @AfterClass + @AfterAll public static void teardown() { DefaultSdkMetric.clearDeclaredMetrics(); } diff --git a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultSdkMetricRecordTest.java b/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultSdkMetricRecordTest.java index a6a2fbbc18d6..abca8e23b2c2 100644 --- a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultSdkMetricRecordTest.java +++ b/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultSdkMetricRecordTest.java @@ -16,11 +16,12 @@ package software.amazon.awssdk.metrics.internal; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import software.amazon.awssdk.metrics.MetricCategory; import software.amazon.awssdk.metrics.MetricLevel; -import software.amazon.awssdk.metrics.SdkMetric; import software.amazon.awssdk.metrics.MetricRecord; +import software.amazon.awssdk.metrics.SdkMetric; /** * Tests for {@link DefaultMetricRecord}. diff --git a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultSdkMetricTest.java b/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultSdkMetricTest.java index 1fe8d4fbea1a..86dc9a85f68f 100644 --- a/core/metrics-spi/src/test/java/software/amazon/awssdk/metrics/internal/DefaultSdkMetricTest.java +++ b/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.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.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(); - @Before + @BeforeEach public void methodSetup() { DefaultSdkMetric.clearDeclaredMetrics(); } diff --git a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java index 116bb48df3e1..6463f10315b7 100644 --- a/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java +++ b/core/profiles/src/test/java/software/amazon/awssdk/profiles/ProfileFileTest.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.StringInputStream; /** diff --git a/core/protocols/aws-cbor-protocol/src/test/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactoryTest.java b/core/protocols/aws-cbor-protocol/src/test/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactoryTest.java index 6cc6cbaf2ccd..961510922379 100644 --- a/core/protocols/aws-cbor-protocol/src/test/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactoryTest.java +++ b/core/protocols/aws-cbor-protocol/src/test/java/software/amazon/awssdk/protocols/cbor/AwsCborProtocolFactoryTest.java @@ -22,8 +22,8 @@ import static software.amazon.awssdk.core.traits.TimestampFormatTrait.Format.UNIX_TIMESTAMP_MILLIS; 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.core.protocol.MarshallLocation; import software.amazon.awssdk.core.traits.TimestampFormatTrait; @@ -31,7 +31,7 @@ public class AwsCborProtocolFactoryTest { private static AwsCborProtocolFactory factory; - @BeforeClass + @BeforeAll public static void setup() { factory = AwsCborProtocolFactory.builder().build(); } diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/AwsJsonErrorMessageParserTest.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/AwsJsonErrorMessageParserTest.java index 54e2a89c591e..6e26cad3edda 100644 --- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/AwsJsonErrorMessageParserTest.java +++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/AwsJsonErrorMessageParserTest.java @@ -15,12 +15,12 @@ package software.amazon.awssdk.protocols.json; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.UUID; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpFullResponse; import software.amazon.awssdk.protocols.json.internal.unmarshall.AwsJsonErrorMessageParser; import software.amazon.awssdk.protocols.json.internal.unmarshall.ErrorMessageParser; @@ -40,7 +40,7 @@ public class AwsJsonErrorMessageParserTest { private JsonNodeParser jsonParser; - @Before + @BeforeEach public void setup() { jsonParser = JsonNode.parser(); responseBuilder = ValidSdkObjects.sdkHttpFullResponse(); diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/JsonErrorCodeParserTest.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/JsonErrorCodeParserTest.java index bc814da1d1ad..0a141b494826 100644 --- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/JsonErrorCodeParserTest.java +++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/JsonErrorCodeParserTest.java @@ -15,11 +15,11 @@ package software.amazon.awssdk.protocols.json; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpFullResponse; import software.amazon.awssdk.protocols.json.internal.unmarshall.JsonErrorCodeParser; import software.amazon.awssdk.protocols.jsoncore.JsonNode; diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java index 59058d76f251..5dd5bb32aa7e 100644 --- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java +++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/SdkJsonGeneratorTest.java @@ -15,17 +15,17 @@ package software.amazon.awssdk.protocols.json; -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.ByteArrayInputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.time.Instant; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.protocols.jsoncore.JsonNode; import software.amazon.awssdk.thirdparty.jackson.core.JsonFactory; import software.amazon.awssdk.utils.BinaryUtils; @@ -38,7 +38,7 @@ public class SdkJsonGeneratorTest { private StructuredJsonGenerator jsonGenerator; - @Before + @BeforeEach public void setup() { jsonGenerator = new SdkJsonGenerator(JsonFactory.builder().build(), "application/json"); } @@ -145,17 +145,17 @@ public void testNumericNoQuote() { // (with no decimal point nor places.) System.out.println(s); final String prefix = "{\"foo\":"; - assertTrue(s, s.startsWith(prefix)); + assertTrue(s.startsWith(prefix), s); final int startPos = prefix.length(); // verify no starting quote for the value - assertFalse(s, s.startsWith("{\"foo\":\"")); - assertTrue(s, s.endsWith("}")); + assertFalse(s.startsWith("{\"foo\":\""), s); + assertTrue(s.endsWith("}"), s); // Not: {"foo":"1408378076.135"}. // verify no ending quote for the value - assertFalse(s, s.endsWith("\"}")); + assertFalse(s.endsWith("\"}"), s); final int endPos = s.indexOf("}"); final int dotPos = s.length() - 5; - assertTrue(s, s.charAt(dotPos) == '.'); + assertTrue(s.charAt(dotPos) == '.', s); // verify all numeric before '.' char[] a = s.toCharArray(); for (int i = startPos; i < dotPos; i++) { diff --git a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/internal/dom/DocumentUnmarshallerTest.java b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/internal/dom/DocumentUnmarshallerTest.java index cbd57689cf90..bf6de4cb9059 100644 --- a/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/internal/dom/DocumentUnmarshallerTest.java +++ b/core/protocols/aws-json-protocol/src/test/java/software/amazon/awssdk/protocols/json/internal/dom/DocumentUnmarshallerTest.java @@ -3,24 +3,19 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - -import org.junit.Test; -import software.amazon.awssdk.core.SdkNumber; -import software.amazon.awssdk.core.document.Document; -import software.amazon.awssdk.protocols.json.internal.unmarshall.document.DocumentUnmarshaller; import java.math.BigDecimal; import java.text.ParseException; import java.util.ArrayList; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.core.SdkNumber; +import software.amazon.awssdk.core.document.Document; +import software.amazon.awssdk.protocols.json.internal.unmarshall.document.DocumentUnmarshaller; import software.amazon.awssdk.protocols.jsoncore.JsonNode; import software.amazon.awssdk.protocols.jsoncore.internal.EmbeddedObjectJsonNode; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.hamcrest.MatcherAssert.assertThat; - public class DocumentUnmarshallerTest { @Test diff --git a/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/XmlDomParserTest.java b/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/XmlDomParserTest.java index 16ea0957c23e..365bfd01aa89 100644 --- a/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/XmlDomParserTest.java +++ b/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/XmlDomParserTest.java @@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import javax.xml.stream.XMLStreamException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.protocols.query.unmarshall.XmlDomParser; import software.amazon.awssdk.protocols.query.unmarshall.XmlElement; diff --git a/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptorTest.java b/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptorTest.java index 2398ab806589..47039837bb4c 100644 --- a/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptorTest.java +++ b/core/protocols/aws-query-protocol/src/test/java/software/amazon/awssdk/protocols/query/interceptor/QueryParametersToBodyInterceptorTest.java @@ -15,8 +15,16 @@ package software.amazon.awssdk.protocols.query.interceptor; -import org.junit.Before; -import org.junit.Test; +import static java.util.Collections.singletonList; +import static org.assertj.core.api.Assertions.assertThat; + +import java.io.ByteArrayInputStream; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.Optional; +import java.util.stream.Stream; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.async.AsyncRequestBody; @@ -28,15 +36,6 @@ import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.utils.IoUtils; -import java.io.ByteArrayInputStream; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.util.Optional; -import java.util.stream.Stream; - -import static java.util.Collections.singletonList; -import static org.assertj.core.api.Assertions.assertThat; - public class QueryParametersToBodyInterceptorTest { public static final URI HTTP_LOCALHOST = URI.create("http://localhost:8080"); @@ -46,7 +45,7 @@ public class QueryParametersToBodyInterceptorTest { private SdkHttpFullRequest.Builder requestBuilder; - @Before + @BeforeEach public void setup() { interceptor = new QueryParametersToBodyInterceptor(); diff --git a/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseHandlerTest.java b/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseHandlerTest.java index 877324d4496d..f881b0c357fe 100644 --- a/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseHandlerTest.java +++ b/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/AwsXmlResponseHandlerTest.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.awscore.AwsResponse; import software.amazon.awssdk.core.SdkField; diff --git a/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshallerTest.java b/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshallerTest.java index e69c1e585e52..db5fe6cb869b 100644 --- a/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshallerTest.java +++ b/core/protocols/aws-xml-protocol/src/test/java/software/amazon/awssdk/protocols/xml/internal/unmarshall/DecorateErrorFromResponseBodyUnmarshallerTest.java @@ -19,9 +19,7 @@ import java.util.Optional; import java.util.function.Function; - -import org.junit.Test; - +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpFullResponse; import software.amazon.awssdk.protocols.query.unmarshall.XmlElement; diff --git a/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/ProtocolUtilsTest.java b/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/ProtocolUtilsTest.java index ffb7c9048f4e..ce5b33ceb4c0 100644 --- a/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/ProtocolUtilsTest.java +++ b/core/protocols/protocol-core/src/test/java/software/amazon/awssdk/protocols/core/ProtocolUtilsTest.java @@ -17,10 +17,12 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.net.URI; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; @@ -89,13 +91,13 @@ public void createSdkHttpRequest_NoTrailingOrLeadingSlash_RequestUriAppendedToEn @Test public void request_null_returns_null() { - Assert.assertNull(ProtocolUtils.addStaticQueryParametersToRequest(null, + assertNull(ProtocolUtils.addStaticQueryParametersToRequest(null, "foo")); } @Test public void uri_resource_path_null_returns_null() { - Assert.assertNull(ProtocolUtils + assertNull(ProtocolUtils .addStaticQueryParametersToRequest(emptyRequest(), null)); } @@ -108,7 +110,7 @@ public void uri_resource_path_doesnot_have_static_query_params_returns_uri_resou final String uriResourcePath = "/foo/bar"; - Assert.assertEquals(uriResourcePath, ProtocolUtils + assertEquals(uriResourcePath, ProtocolUtils .addStaticQueryParametersToRequest(emptyRequest(), uriResourcePath)); } @@ -119,7 +121,7 @@ public void uri_resource_path_ends_with_question_mark_returns_path_removed_with_ final String expectedResourcePath = "/foo/bar"; final String pathWithEmptyStaticQueryParams = expectedResourcePath + "?"; - Assert.assertEquals(expectedResourcePath, ProtocolUtils + assertEquals(expectedResourcePath, ProtocolUtils .addStaticQueryParametersToRequest(emptyRequest(), pathWithEmptyStaticQueryParams)); } @@ -132,11 +134,11 @@ public void queryparam_value_empty_adds_parameter_with_empty_string_to_request() SdkHttpFullRequest.Builder request = emptyRequest(); - Assert.assertEquals(uriResourcePath, ProtocolUtils + assertEquals(uriResourcePath, ProtocolUtils .addStaticQueryParametersToRequest(request, uriResourcePathWithParams)); - Assert.assertTrue(request.rawQueryParameters().containsKey("param1")); - Assert.assertEquals(singletonList(""), request.rawQueryParameters().get("param1")); + assertTrue(request.rawQueryParameters().containsKey("param1")); + assertEquals(singletonList(""), request.rawQueryParameters().get("param1")); } @Test @@ -146,13 +148,13 @@ public void static_queryparams_in_path_added_to_request() { uriResourcePath + "?param1=value1¶m2=value2"; SdkHttpFullRequest.Builder request = emptyRequest(); - Assert.assertEquals(uriResourcePath, ProtocolUtils + assertEquals(uriResourcePath, ProtocolUtils .addStaticQueryParametersToRequest(request, uriResourcePathWithParams)); - Assert.assertTrue(request.rawQueryParameters().containsKey("param1")); - Assert.assertTrue(request.rawQueryParameters().containsKey("param2")); - Assert.assertEquals(singletonList("value1"), request.rawQueryParameters().get("param1")); - Assert.assertEquals(singletonList("value2"), request.rawQueryParameters().get("param2")); + assertTrue(request.rawQueryParameters().containsKey("param1")); + assertTrue(request.rawQueryParameters().containsKey("param2")); + assertEquals(singletonList("value1"), request.rawQueryParameters().get("param1")); + assertEquals(singletonList("value2"), request.rawQueryParameters().get("param2")); } @@ -163,10 +165,10 @@ public void queryparam_without_value_returns_list_containing_null_value() { uriResourcePath + "?param"; SdkHttpFullRequest.Builder request = emptyRequest(); - Assert.assertEquals(uriResourcePath, ProtocolUtils.addStaticQueryParametersToRequest(request, uriResourcePathWithParams)); + assertEquals(uriResourcePath, ProtocolUtils.addStaticQueryParametersToRequest(request, uriResourcePathWithParams)); - Assert.assertTrue(request.rawQueryParameters().containsKey("param")); - Assert.assertEquals(singletonList((String) null), request.rawQueryParameters().get("param")); + assertTrue(request.rawQueryParameters().containsKey("param")); + assertEquals(singletonList((String) null), request.rawQueryParameters().get("param")); } } diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionEndpointKeyTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionEndpointKeyTest.java index 356038720b92..87521aa7ce63 100644 --- a/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionEndpointKeyTest.java +++ b/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionEndpointKeyTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.regions; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PartitionEndpointKeyTest { @Test diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java index d82312850906..9378e00e621a 100644 --- a/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java +++ b/core/regions/src/test/java/software/amazon/awssdk/regions/PartitionServiceMetadataTest.java @@ -18,9 +18,8 @@ import java.util.Arrays; import java.util.List; -import java.util.Optional; import java.util.stream.Collectors; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PartitionServiceMetadataTest { diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/ServiceEndpointKeyTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/ServiceEndpointKeyTest.java index 8b88a8e24be6..25161e340517 100644 --- a/core/regions/src/test/java/software/amazon/awssdk/regions/ServiceEndpointKeyTest.java +++ b/core/regions/src/test/java/software/amazon/awssdk/regions/ServiceEndpointKeyTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.regions; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ServiceEndpointKeyTest { @Test diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/ConnectionUtilsComponentTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/ConnectionUtilsComponentTest.java index 04f3579ef809..6d1427703d68 100644 --- a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/ConnectionUtilsComponentTest.java +++ b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/ConnectionUtilsComponentTest.java @@ -17,7 +17,6 @@ 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; @@ -27,11 +26,11 @@ 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.Test; -import software.amazon.awssdk.regions.internal.util.ConnectionUtils; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Test; public class ConnectionUtilsComponentTest { @@ -43,7 +42,7 @@ public class ConnectionUtilsComponentTest { private final ConnectionUtils sut = ConnectionUtils.create(); - @After + @AfterEach public void cleanup() { System.getProperties().remove("http.proxyHost"); System.getProperties().remove("http.proxyPort"); @@ -51,7 +50,7 @@ public void cleanup() { @Test public void proxiesAreNotUsedEvenIfPropertyIsSet() throws IOException { - assumeTrue(Inet4Address.getLocalHost().isReachable(100)); + Assumptions.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()); diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsTest.java index 4172db957e78..7e5af1399574 100644 --- a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/EC2MetadataUtilsTest.java +++ b/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.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.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(); - @Before + @BeforeEach public void methodSetup() { System.setProperty(SdkSystemSetting.AWS_EC2_METADATA_SERVICE_ENDPOINT.property(), "http://localhost:" + mockMetadataEndpoint.port()); EC2MetadataUtils.clearCache(); diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/Ec2MetadataUtilsTt0049160280Test.java b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/Ec2MetadataUtilsTt0049160280Test.java index f58860822c5f..1d806c672d39 100644 --- a/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/Ec2MetadataUtilsTt0049160280Test.java +++ b/core/regions/src/test/java/software/amazon/awssdk/regions/internal/util/Ec2MetadataUtilsTt0049160280Test.java @@ -15,9 +15,10 @@ package software.amazon.awssdk.regions.internal.util; -import org.junit.Assert; -import org.junit.Test; -import software.amazon.awssdk.regions.internal.util.EC2MetadataUtils; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; public class Ec2MetadataUtilsTt0049160280Test { private static final String JSON = "{" @@ -40,15 +41,15 @@ public class Ec2MetadataUtilsTt0049160280Test { @Test public void getRegionIntern() throws Exception { String region = EC2MetadataUtils.doGetEC2InstanceRegion(JSON); - Assert.assertEquals("us-east-1", region); + assertEquals("us-east-1", region); } @Test public void tt0049160280() { EC2MetadataUtils.InstanceInfo info = EC2MetadataUtils.doGetInstanceInfo(JSON); String[] billingProducts = info.getBillingProducts(); - Assert.assertTrue(billingProducts.length == 1); - Assert.assertEquals(billingProducts[0], "bp-6ba54002"); + assertTrue(billingProducts.length == 1); + assertEquals(billingProducts[0], "bp-6ba54002"); } @Test @@ -71,8 +72,8 @@ public void devProductCodes() { + "}"; EC2MetadataUtils.InstanceInfo info = EC2MetadataUtils.doGetInstanceInfo(JSON); String[] devpayProductCodes = info.getDevpayProductCodes(); - Assert.assertTrue(devpayProductCodes.length == 2); - Assert.assertEquals(devpayProductCodes[0], "foo"); - Assert.assertEquals(devpayProductCodes[1], "bar"); + assertTrue(devpayProductCodes.length == 2); + assertEquals(devpayProductCodes[0], "foo"); + assertEquals(devpayProductCodes[1], "bar"); } } diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProviderTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProviderTest.java index 1a73d8025b4e..0e6c73d9315e 100644 --- a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProviderTest.java +++ b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/AwsProfileRegionProviderTest.java @@ -21,9 +21,8 @@ import java.net.URISyntaxException; import java.nio.file.Paths; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.SdkClientException; -import software.amazon.awssdk.profiles.ProfileFile; import software.amazon.awssdk.profiles.ProfileFileSystemSetting; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.testutils.EnvironmentVariableHelper; diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProviderTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProviderTest.java index 83bff94bdbdc..05134891e45f 100644 --- a/core/regions/src/test/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProviderTest.java +++ b/core/regions/src/test/java/software/amazon/awssdk/regions/providers/LazyAwsRegionProviderTest.java @@ -16,8 +16,8 @@ package software.amazon.awssdk.regions.providers; import java.util.function.Supplier; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; public class LazyAwsRegionProviderTest { @@ -26,7 +26,7 @@ public class LazyAwsRegionProviderTest { private AwsRegionProvider regionProvider = Mockito.mock(AwsRegionProvider.class); - @Before + @BeforeEach public void reset() { Mockito.reset(regionProvider, regionProviderConstructor); Mockito.when(regionProviderConstructor.get()).thenReturn(regionProvider); diff --git a/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/GeneratedServiceMetadataProviderTest.java b/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/GeneratedServiceMetadataProviderTest.java index 6a99b1e71b7c..c019dd249283 100644 --- a/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/GeneratedServiceMetadataProviderTest.java +++ b/core/regions/src/test/java/software/amazon/awssdk/regions/servicemetadata/GeneratedServiceMetadataProviderTest.java @@ -16,7 +16,8 @@ package software.amazon.awssdk.regions.servicemetadata; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import software.amazon.awssdk.regions.GeneratedServiceMetadataProvider; public class GeneratedServiceMetadataProviderTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/RequestOverrideConfigurationTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/RequestOverrideConfigurationTest.java index 5e9ea642a9ce..729131c87e2e 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/RequestOverrideConfigurationTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/RequestOverrideConfigurationTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.core; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import java.time.Duration; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.interceptor.ExecutionAttribute; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.core.signer.Signer; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/ResponseBytesTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/ResponseBytesTest.java index f41a0179b6ad..f76b86f73ddf 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/ResponseBytesTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/ResponseBytesTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ResponseBytesTest { private static final Object OBJECT = new Object(); diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/SdkBytesTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/SdkBytesTest.java index 1503f08ae54b..3a630dfdadf0 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/SdkBytesTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/SdkBytesTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SdkBytesTest { @Test diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/SdkNumberTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/SdkNumberTest.java index cf8e650af200..d475dd6e6216 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/SdkNumberTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/SdkNumberTest.java @@ -18,10 +18,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Objects; +import org.junit.jupiter.api.Test; public class SdkNumberTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SdkPublishersTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SdkPublishersTest.java index 838ff2af095d..592873971934 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SdkPublishersTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/SdkPublishersTest.java @@ -22,12 +22,10 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; - import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerExceptionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerExceptionTest.java index fa1e75bd5b0a..633c2b420077 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerExceptionTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/AsyncClientHandlerExceptionTest.java @@ -15,8 +15,7 @@ package software.amazon.awssdk.core.client; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -27,11 +26,10 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.function.Predicate; import java.util.function.Supplier; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.stubbing.Answer; import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.SdkResponse; @@ -78,7 +76,7 @@ public class AsyncClientHandlerExceptionTest { private ClientExecutionParams executionParams; - @Before + @BeforeEach public void methodSetup() throws Exception { executionParams = new ClientExecutionParams() .withInput(request) @@ -112,7 +110,7 @@ public void methodSetup() throws Exception { } @Test - public void marshallerThrowsReportedThroughFuture() throws ExecutionException, InterruptedException { + public void marshallerThrowsReportedThroughFuture() throws Exception { final SdkClientException e = SdkClientException.create("Could not marshall"); when(marshaller.marshall(any(SdkRequest.class))).thenThrow(e); doVerify(() -> clientHandler.execute(executionParams), e); diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ClientOverrideConfigurationTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ClientOverrideConfigurationTest.java index 284bb66d6ec0..b1a60552361b 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ClientOverrideConfigurationTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ClientOverrideConfigurationTest.java @@ -16,7 +16,9 @@ package software.amazon.awssdk.core.client.config; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import java.util.ArrayList; @@ -25,7 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.interceptor.ExecutionAttribute; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.core.interceptor.ExecutionInterceptor; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ConfigurationBuilderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ConfigurationBuilderTest.java index b50ac6618a06..3b600218ae43 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ConfigurationBuilderTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/ConfigurationBuilderTest.java @@ -26,8 +26,7 @@ import java.util.Arrays; import java.util.Map; import java.util.Optional; -import org.junit.Test; -import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration; +import org.junit.jupiter.api.Test; /** * Validate the functionality of the Client*Configuration classes diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/SdkClientConfigurationTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/SdkClientConfigurationTest.java index c943b3eef096..74c94c5bc39a 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/SdkClientConfigurationTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/client/config/SdkClientConfigurationTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.core.client.config; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SdkClientConfigurationTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/document/DocumentTypeTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/document/DocumentTypeTest.java index 28733794e390..dad5ed9ca781 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/document/DocumentTypeTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/document/DocumentTypeTest.java @@ -15,9 +15,8 @@ package software.amazon.awssdk.core.document; -import org.junit.Test; -import software.amazon.awssdk.core.SdkNumber; -import software.amazon.awssdk.core.document.internal.ListDocument; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.math.BigDecimal; import java.math.BigInteger; @@ -29,9 +28,9 @@ import java.util.List; import java.util.Map; import java.util.Objects; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.core.SdkNumber; +import software.amazon.awssdk.core.document.internal.ListDocument; public class DocumentTypeTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/exception/SdkExceptionMessageTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/exception/SdkExceptionMessageTest.java index 55cccdd40bd7..70917c2417c2 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/exception/SdkExceptionMessageTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/exception/SdkExceptionMessageTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Verifies the ways in which a message in an {@link SdkException} can be populated. diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientWireMockTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientWireMockTest.java index 963ae396647f..2a4526711c36 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientWireMockTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/AmazonHttpClientWireMockTest.java @@ -26,9 +26,8 @@ import static software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils.executionContext; import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient; import software.amazon.awssdk.core.internal.http.response.NullErrorResponseHandler; import software.amazon.awssdk.http.SdkHttpFullRequest; @@ -42,7 +41,7 @@ public class AmazonHttpClientWireMockTest extends WireMockTestBase { private static final String CONFIG_HEADER_VALUE = "client config header value"; private static final String REQUEST_HEADER_VALUE = "request header value"; - @Before + @BeforeEach public void setUp() { stubFor(any(urlPathEqualTo(OPERATION)).willReturn(aResponse())); } diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/ContentStreamProviderWireMockTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/ContentStreamProviderWireMockTest.java index 94f9f91c3237..349b4b0f3eb1 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/ContentStreamProviderWireMockTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/ContentStreamProviderWireMockTest.java @@ -20,7 +20,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static software.amazon.awssdk.core.internal.http.timers.ClientExecutionAndRequestTimerTestUtils.executionContext; import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler; import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely; @@ -31,9 +31,7 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; - -import org.junit.Test; - +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.SdkServiceException; import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient; import software.amazon.awssdk.core.internal.http.response.NullErrorResponseHandler; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/SdkTransactionIdInHeaderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/SdkTransactionIdInHeaderTest.java index 73dc1f34acfa..2049b68cd51a 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/SdkTransactionIdInHeaderTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/http/SdkTransactionIdInHeaderTest.java @@ -21,15 +21,13 @@ import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.combinedSyncResponseHandler; import com.github.tomakehurst.wiremock.verification.LoggedRequest; - -import org.junit.Test; - +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.SdkServiceException; import software.amazon.awssdk.core.internal.http.AmazonSyncHttpClient; import software.amazon.awssdk.core.internal.http.pipeline.stages.ApplyTransactionIdStage; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/interceptor/ExecutionAttributesTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/interceptor/ExecutionAttributesTest.java index 8a7a8dd6f14a..50b6bc12aede 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/interceptor/ExecutionAttributesTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/interceptor/ExecutionAttributesTest.java @@ -16,7 +16,8 @@ package software.amazon.awssdk.core.interceptor; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; + +import org.junit.jupiter.api.Test; public class ExecutionAttributesTest { private static final ExecutionAttribute ATTR_1 = new ExecutionAttribute<>("Attr1"); diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBodyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBodyTest.java index 6b6ba94f504e..378fbf2f59c3 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBodyTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/ByteArrayAsyncRequestBodyTest.java @@ -15,10 +15,11 @@ package software.amazon.awssdk.core.internal.async; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import software.amazon.awssdk.core.internal.util.Mimetype; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncRequestBodyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncRequestBodyTest.java index 8e7c231f2b3c..da9daf557e22 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncRequestBodyTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncRequestBodyTest.java @@ -16,11 +16,10 @@ package software.amazon.awssdk.core.internal.async; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely; import java.io.ByteArrayOutputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -30,14 +29,12 @@ import java.nio.file.attribute.FileTime; import java.time.Instant; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.Semaphore; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import software.amazon.awssdk.core.async.AsyncRequestBody; @@ -49,12 +46,12 @@ public class FileAsyncRequestBodyTest { private static final long TEST_FILE_SIZE = 10 * MiB; private static Path testFile; - @Before + @BeforeEach public void setup() throws IOException { testFile = new RandomTempFile(TEST_FILE_SIZE).toPath(); } - @After + @AfterEach public void teardown() throws IOException { try { Files.delete(testFile); @@ -66,7 +63,7 @@ public void teardown() throws IOException { // If we issue just enough requests to read the file entirely but not more (to go past EOF), we should still receive // an onComplete @Test - public void readFully_doesNotRequestPastEndOfFile_receivesComplete() throws InterruptedException, ExecutionException, TimeoutException { + public void readFully_doesNotRequestPastEndOfFile_receivesComplete() throws Exception { int chunkSize = 16384; AsyncRequestBody asyncRequestBody = FileAsyncRequestBody.builder() .path(testFile) diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformerTest.java index 47684bd4b280..53b72e8f9226 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformerTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/async/FileAsyncResponseTransformerTest.java @@ -28,9 +28,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.lang3.RandomStringUtils; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import software.amazon.awssdk.core.async.SdkPublisher; @@ -41,12 +41,12 @@ public class FileAsyncResponseTransformerTest { private static FileSystem testFs; - @BeforeClass + @BeforeAll public static void setup() { testFs = Jimfs.newFileSystem(); } - @AfterClass + @AfterAll public static void teardown() throws IOException { testFs.close(); } diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExceptionReportingUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExceptionReportingUtilsTest.java index 4742dcfb3a5d..68ddd4379601 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExceptionReportingUtilsTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ExceptionReportingUtilsTest.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.ApiCallTimeoutException; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.core.http.ExecutionContext; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/RetryableStageAdaptiveModeTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/RetryableStageAdaptiveModeTest.java index 0f8e46827c9b..3e6033443702 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/RetryableStageAdaptiveModeTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/RetryableStageAdaptiveModeTest.java @@ -26,8 +26,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.Response; import software.amazon.awssdk.core.client.config.SdkClientConfiguration; import software.amazon.awssdk.core.client.config.SdkClientOption; @@ -55,7 +55,7 @@ public class RetryableStageAdaptiveModeTest { private RetryableStage retryableStage; - @Before + @BeforeEach public void setup() throws Exception { tokenBucket = spy(RateLimitingTokenBucket.class); mockChildPipeline = mock(RequestPipeline.class); diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/AsyncHttpClientApiCallTimeoutTests.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/AsyncHttpClientApiCallTimeoutTests.java index 50c47c953bee..2ad0cac27b84 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/AsyncHttpClientApiCallTimeoutTests.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/AsyncHttpClientApiCallTimeoutTests.java @@ -27,18 +27,15 @@ import static software.amazon.awssdk.core.internal.util.AsyncResponseHandlerTestUtils.superSlowResponseHandler; import static utils.HttpTestUtils.testAsyncClientBuilder; +import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.io.ByteArrayInputStream; import java.time.Duration; import java.util.Arrays; import java.util.Collections; import java.util.concurrent.CompletableFuture; - -import com.github.tomakehurst.wiremock.junit.WireMockRule; - -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException; import software.amazon.awssdk.core.exception.ApiCallTimeoutException; import software.amazon.awssdk.core.exception.SdkServiceException; @@ -63,7 +60,7 @@ public class AsyncHttpClientApiCallTimeoutTests { private AmazonAsyncHttpClient httpClient; - @Before + @BeforeEach public void setup() { httpClient = testAsyncClientBuilder() .retryPolicy(RetryPolicy.none()) diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallAttemptTimeoutTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallAttemptTimeoutTest.java index b0f0ee487e66..685e6bfed700 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallAttemptTimeoutTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallAttemptTimeoutTest.java @@ -27,15 +27,12 @@ import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.superSlowResponseHandler; import static utils.HttpTestUtils.testClientBuilder; +import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.io.ByteArrayInputStream; import java.util.Arrays; - -import com.github.tomakehurst.wiremock.junit.WireMockRule; - -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException; import software.amazon.awssdk.core.http.ExecutionContext; import software.amazon.awssdk.core.http.NoopTestRequest; @@ -59,7 +56,7 @@ public class HttpClientApiCallAttemptTimeoutTest { private AmazonSyncHttpClient httpClient; - @Before + @BeforeEach public void setup() { httpClient = testClientBuilder() .retryPolicy(RetryPolicy.none()) diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallTimeoutTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallTimeoutTest.java index 937d3bf851cb..d8f480d07660 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallTimeoutTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/HttpClientApiCallTimeoutTest.java @@ -27,15 +27,12 @@ import static software.amazon.awssdk.core.internal.util.ResponseHandlerTestUtils.superSlowResponseHandler; import static utils.HttpTestUtils.testClientBuilder; +import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.io.ByteArrayInputStream; import java.util.Arrays; - -import com.github.tomakehurst.wiremock.junit.WireMockRule; - -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.ApiCallTimeoutException; import software.amazon.awssdk.core.http.ExecutionContext; import software.amazon.awssdk.core.http.NoopTestRequest; @@ -59,7 +56,7 @@ public class HttpClientApiCallTimeoutTest { private AmazonSyncHttpClient httpClient; - @Before + @BeforeEach public void setup() { httpClient = testClientBuilder() .retryPolicy(RetryPolicy.none()) diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTaskTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTaskTest.java index 27a4b027974f..2a5d17aa5bc1 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTaskTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/http/timers/SyncTimeoutTaskTest.java @@ -17,17 +17,18 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; public class SyncTimeoutTaskTest { private static final ExecutorService EXEC = Executors.newSingleThreadExecutor(); - @AfterClass + @AfterAll public static void teardown() { EXEC.shutdown(); } diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/BufferedInputStreamResetTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/BufferedInputStreamResetTest.java index 9d2a1dd1a760..1f86f3cbcda5 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/BufferedInputStreamResetTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/io/BufferedInputStreamResetTest.java @@ -15,13 +15,13 @@ package software.amazon.awssdk.core.internal.io; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * This test demonstrates why we should call mark(Integer.MAX_VALUE) instead of diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjusterTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjusterTest.java index ee057515a8d0..d18e48ce1d3d 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjusterTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/ClockSkewAdjusterTest.java @@ -22,7 +22,7 @@ import java.time.Instant; import java.time.temporal.ChronoUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpFullResponse; import software.amazon.awssdk.utils.DateUtils; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/RateLimitingTokenBucketTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/RateLimitingTokenBucketTest.java index 2eb0b6ea0f40..2af13755dea2 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/RateLimitingTokenBucketTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/retry/RateLimitingTokenBucketTest.java @@ -15,12 +15,11 @@ package software.amazon.awssdk.core.internal.retry; -import static org.assertj.core.api.Assertions.as; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; public class RateLimitingTokenBucketTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProviderTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProviderTest.java index 9b6c9e1c83c1..a4be2795ab69 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProviderTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/sync/FileContentStreamProviderTest.java @@ -25,9 +25,9 @@ import java.nio.file.FileSystem; import java.nio.file.Files; import java.nio.file.Path; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * Tests for {@link FileContentStreamProvider}. @@ -36,7 +36,7 @@ public class FileContentStreamProviderTest { private static FileSystem testFs; private static Path testFile; - @BeforeClass + @BeforeAll public static void setup() throws IOException { testFs = Jimfs.newFileSystem("FileContentStreamProviderTest"); testFile = testFs.getPath("test_file.dat"); @@ -46,7 +46,7 @@ public static void setup() throws IOException { } } - @AfterClass + @AfterAll public static void teardown() throws IOException { testFs.close(); } diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/CapacityManagerTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/CapacityManagerTest.java index 8e1c66f44522..dc5c50087b05 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/CapacityManagerTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/CapacityManagerTest.java @@ -15,8 +15,11 @@ package software.amazon.awssdk.core.internal.util; -import org.junit.Assert; -import org.junit.Test; +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 org.junit.jupiter.api.Test; /** * Tests the behavior of the {@link CapacityManager} @@ -30,13 +33,13 @@ public class CapacityManagerTest { @Test public void acquire() { CapacityManager mgr = new CapacityManager(10); - Assert.assertTrue(mgr.acquire()); - Assert.assertEquals(mgr.availableCapacity(), 9); - Assert.assertEquals(mgr.consumedCapacity(), 1); - Assert.assertTrue(mgr.acquire(9)); - Assert.assertEquals(mgr.availableCapacity(), 0); - Assert.assertEquals(mgr.consumedCapacity(), 10); - Assert.assertFalse(mgr.acquire(1)); + assertTrue(mgr.acquire()); + assertEquals(mgr.availableCapacity(), 9); + assertEquals(mgr.consumedCapacity(), 1); + assertTrue(mgr.acquire(9)); + assertEquals(mgr.availableCapacity(), 0); + assertEquals(mgr.consumedCapacity(), 10); + assertFalse(mgr.acquire(1)); } /** @@ -48,11 +51,11 @@ public void release() { CapacityManager mgr = new CapacityManager(10); mgr.acquire(10); mgr.release(); - Assert.assertEquals(mgr.availableCapacity(), 1); - Assert.assertEquals(mgr.consumedCapacity(), 9); + assertEquals(mgr.availableCapacity(), 1); + assertEquals(mgr.consumedCapacity(), 9); mgr.release(50); - Assert.assertEquals(mgr.availableCapacity(), 10); - Assert.assertEquals(mgr.consumedCapacity(), 0); + assertEquals(mgr.availableCapacity(), 10); + assertEquals(mgr.consumedCapacity(), 0); } /** @@ -62,11 +65,11 @@ public void release() { @Test public void noOp() { CapacityManager mgr = new CapacityManager(-1); - Assert.assertTrue(mgr.acquire()); + assertTrue(mgr.acquire()); mgr.release(); - Assert.assertTrue(mgr.acquire()); - Assert.assertEquals(mgr.availableCapacity(), -1); - Assert.assertEquals(mgr.consumedCapacity(), 0); + assertTrue(mgr.acquire()); + assertEquals(mgr.availableCapacity(), -1); + assertEquals(mgr.consumedCapacity(), 0); } } diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MetricUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MetricUtilsTest.java index b32a543a7404..c73ec6d3b8dd 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MetricUtilsTest.java +++ b/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.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.core.http.HttpResponseHandler; import software.amazon.awssdk.core.metrics.CoreMetric; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MimetypeTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MimetypeTest.java index a4dbd7df4611..95406a1f119c 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MimetypeTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/util/MimetypeTest.java @@ -20,14 +20,14 @@ import static org.mockito.Mockito.when; import java.nio.file.Path; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class MimetypeTest { private static Mimetype mimetype; - @BeforeClass + @BeforeAll public static void setup() { mimetype = Mimetype.getInstance(); } diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/waiters/WaiterConfigurationTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/waiters/WaiterConfigurationTest.java index f0db2165ff96..8993d554f5dc 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/waiters/WaiterConfigurationTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/internal/waiters/WaiterConfigurationTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.retry.backoff.BackoffStrategy; import software.amazon.awssdk.core.retry.backoff.FixedDelayBackoffStrategy; import software.amazon.awssdk.core.waiters.WaiterOverrideConfiguration; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/DefaultRetryConditionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/DefaultRetryConditionTest.java index 038f1ad53d95..a006bf0477df 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/DefaultRetryConditionTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/DefaultRetryConditionTest.java @@ -14,12 +14,12 @@ */ package software.amazon.awssdk.core.retry; -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 java.io.IOException; import java.util.function.Consumer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.NonRetryableException; import software.amazon.awssdk.core.exception.RetryableException; import software.amazon.awssdk.core.exception.SdkClientException; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedDelayBackoffStrategyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedDelayBackoffStrategyTest.java index 9bf82d503f58..a2d8570d708f 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedDelayBackoffStrategyTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/FixedDelayBackoffStrategyTest.java @@ -15,10 +15,10 @@ package software.amazon.awssdk.core.retry; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.retry.backoff.FixedDelayBackoffStrategy; public class FixedDelayBackoffStrategyTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/MaxNumberOfRetriesConditionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/MaxNumberOfRetriesConditionTest.java index 6034e9e86d04..5a6bf44aa3ed 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/MaxNumberOfRetriesConditionTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/MaxNumberOfRetriesConditionTest.java @@ -15,10 +15,10 @@ package software.amazon.awssdk.core.retry; -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; import software.amazon.awssdk.core.retry.conditions.MaxNumberOfRetriesCondition; public class MaxNumberOfRetriesConditionTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContextTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContextTest.java index f460c9232de1..e472dea686dc 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContextTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/RetryPolicyContextTest.java @@ -15,10 +15,10 @@ package software.amazon.awssdk.core.retry; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.core.http.NoopTestRequest; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategyTest.java index 8e5723e140bb..d581bcbedde6 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategyTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/backoff/EqualJitterBackoffStrategyTest.java @@ -15,19 +15,18 @@ package software.amazon.awssdk.core.retry.backoff; -import org.junit.Test; -import org.mockito.Mock; -import software.amazon.awssdk.core.retry.RetryPolicyContext; - -import java.time.Duration; -import java.util.Random; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertThrows; +import java.time.Duration; +import java.util.Random; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import software.amazon.awssdk.core.retry.RetryPolicyContext; + public class EqualJitterBackoffStrategyTest { private static final int RANDOM_RESULT = 12345; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryConditionTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryConditionTest.java index 1c9b6965d861..480ecac7134b 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryConditionTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/retry/conditions/TokenBucketRetryConditionTest.java @@ -16,14 +16,14 @@ package software.amazon.awssdk.core.retry.conditions; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.fail; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.core.exception.SdkException; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; @@ -155,7 +155,7 @@ public void conditionSeemsToBeThreadSafe() throws InterruptedException { executor.shutdown(); if (!executor.awaitTermination(1, TimeUnit.MINUTES)) { - Assert.fail(); + fail(); } assertThat(failure.get()).isFalse(); diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/sync/RequestBodyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/sync/RequestBodyTest.java index 2959646885eb..e8be2a64c23f 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/sync/RequestBodyTest.java +++ b/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.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.TemporaryFolder; import software.amazon.awssdk.core.internal.util.Mimetype; import software.amazon.awssdk.utils.IoUtils; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/Crc32ChecksumInputStreamTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/Crc32ChecksumInputStreamTest.java index c7e31c9ffd24..556a2479bf39 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/Crc32ChecksumInputStreamTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/Crc32ChecksumInputStreamTest.java @@ -15,12 +15,12 @@ package software.amazon.awssdk.core.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.zip.CRC32; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.internal.util.Crc32ChecksumCalculatingInputStream; /** diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructListTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructListTest.java index d831b8bef3ff..a37f54328302 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructListTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructListTest.java @@ -16,8 +16,9 @@ package software.amazon.awssdk.core.util; import static org.assertj.core.api.Assertions.assertThat; + import java.util.LinkedList; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultSdkAutoConstructListTest { private static final DefaultSdkAutoConstructList INSTANCE = DefaultSdkAutoConstructList.getInstance(); diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMapTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMapTest.java index 5293670c466b..7cdf8b84f432 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMapTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/DefaultSdkAutoConstructMapTest.java @@ -16,8 +16,9 @@ package software.amazon.awssdk.core.util; import static org.assertj.core.api.Assertions.assertThat; + import java.util.HashMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultSdkAutoConstructMapTest { private static final DefaultSdkAutoConstructMap AUTO_CONSTRUCT_MAP = DefaultSdkAutoConstructMap.getInstance(); diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/IdempotentUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/IdempotentUtilsTest.java index e1ba62ec6a31..17e8e47e592d 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/IdempotentUtilsTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/IdempotentUtilsTest.java @@ -15,10 +15,10 @@ package software.amazon.awssdk.core.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class IdempotentUtilsTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/PaginatorUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/PaginatorUtilsTest.java index a30b176b2118..fd80ab49d3e8 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/PaginatorUtilsTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/PaginatorUtilsTest.java @@ -15,13 +15,13 @@ package software.amazon.awssdk.core.util; -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 java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PaginatorUtilsTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/RetryUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/RetryUtilsTest.java index f19b2d7d9252..76f28b527fd1 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/RetryUtilsTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/RetryUtilsTest.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.core.exception.SdkClientException; import software.amazon.awssdk.core.exception.SdkServiceException; import software.amazon.awssdk.core.retry.RetryUtils; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/SdkUserAgentTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/SdkUserAgentTest.java index 4d4430833fa2..4c06a42e445f 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/SdkUserAgentTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/SdkUserAgentTest.java @@ -16,11 +16,10 @@ package software.amazon.awssdk.core.util; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.Arrays; -import org.junit.Test; -import software.amazon.awssdk.core.util.SdkUserAgent; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.JavaSystemSetting; public class SdkUserAgentTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/ThrowableUtilsTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/ThrowableUtilsTest.java index 44f9cd5dc728..0116fce791da 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/ThrowableUtilsTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/ThrowableUtilsTest.java @@ -15,10 +15,10 @@ package software.amazon.awssdk.core.util; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.internal.util.ThrowableUtils; public class ThrowableUtilsTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/VersionInfoTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/VersionInfoTest.java index 2b4accf0dc0b..baa291ceef61 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/VersionInfoTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/util/VersionInfoTest.java @@ -24,7 +24,7 @@ import java.nio.file.Paths; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class VersionInfoTest { diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/AsyncWaiterTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/AsyncWaiterTest.java index d54e2a01abd7..9c1309e9831d 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/AsyncWaiterTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/AsyncWaiterTest.java @@ -23,7 +23,7 @@ import java.util.concurrent.CompletionException; import java.util.function.BiFunction; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.retry.backoff.BackoffStrategy; import software.amazon.awssdk.utils.CompletableFutureUtils; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/BaseWaiterTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/BaseWaiterTest.java index 5ed83a1ab979..5283e01fd5d0 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/BaseWaiterTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/BaseWaiterTest.java @@ -17,7 +17,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.assertj.core.api.Assertions.fail; import java.time.Duration; import java.util.ArrayList; @@ -25,9 +24,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.function.BiFunction; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.retry.backoff.BackoffStrategy; import software.amazon.awssdk.core.retry.backoff.FixedDelayBackoffStrategy; @@ -37,12 +36,12 @@ public abstract class BaseWaiterTest { static final String NON_SUCCESS_STATE_MESSAGE = "other"; static ScheduledExecutorService executorService; - @BeforeClass + @BeforeAll public static void setUp() { executorService = Executors.newScheduledThreadPool(2); } - @AfterClass + @AfterAll public static void tearDown() { executorService.shutdown(); } diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/WaiterOverrideConfigurationTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/WaiterOverrideConfigurationTest.java index d82004ff3051..f780fc2673f0 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/WaiterOverrideConfigurationTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/WaiterOverrideConfigurationTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.retry.backoff.BackoffStrategy; import software.amazon.awssdk.core.retry.backoff.FixedDelayBackoffStrategy; diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/WaiterTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/WaiterTest.java index 5f4a7873e8ea..6842423a3ab9 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/WaiterTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/waiters/WaiterTest.java @@ -22,8 +22,8 @@ import java.util.concurrent.CompletableFuture; import java.util.function.BiFunction; import java.util.function.Supplier; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.retry.backoff.BackoffStrategy; import software.amazon.awssdk.core.retry.backoff.FixedDelayBackoffStrategy; @@ -33,7 +33,7 @@ public class WaiterTest extends BaseWaiterTest { private static final String NON_SUCCESS_STATE_MESSAGE = "other"; private BackoffStrategy backoffStrategy; - @Before + @BeforeEach public void setup() { backoffStrategy = FixedDelayBackoffStrategy.create(Duration.ofMillis(10)); } diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/ClientTlsAuthTestBase.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/ClientTlsAuthTestBase.java index cdbbee02a96e..b882f5a1f80c 100644 --- a/http-client-spi/src/test/java/software/amazon/awssdk/http/ClientTlsAuthTestBase.java +++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/ClientTlsAuthTestBase.java @@ -19,8 +19,8 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; abstract class ClientTlsAuthTestBase { protected static final String STORE_PASSWORD = "password"; @@ -32,13 +32,13 @@ abstract class ClientTlsAuthTestBase { protected static Path serverKeyStore; protected static Path clientKeyStore; - @BeforeClass + @BeforeAll public static void setUp() throws IOException { tempDir = Files.createTempDirectory(ClientTlsAuthTestBase.class.getSimpleName()); copyCertsToTmpDir(); } - @AfterClass + @AfterAll public static void teardown() throws IOException { Files.deleteIfExists(serverKeyStore); Files.deleteIfExists(clientKeyStore); diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/HttpStatusFamilyTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/HttpStatusFamilyTest.java index 3ddd51b6a8ae..b8cb9292cd4e 100644 --- a/http-client-spi/src/test/java/software/amazon/awssdk/http/HttpStatusFamilyTest.java +++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/HttpStatusFamilyTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class HttpStatusFamilyTest { @Test diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/SdkHttpRequestResponseTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/SdkHttpRequestResponseTest.java index 875e664d4303..e6833c4e0077 100644 --- a/http-client-spi/src/test/java/software/amazon/awssdk/http/SdkHttpRequestResponseTest.java +++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/SdkHttpRequestResponseTest.java @@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.net.URI; -import java.net.URISyntaxException; import java.util.AbstractMap; import java.util.Arrays; import java.util.LinkedHashMap; @@ -31,7 +30,7 @@ import java.util.Map; import java.util.function.Consumer; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Verify that {@link DefaultSdkHttpFullRequest} and {@link DefaultSdkHttpFullResponse} properly fulfill the contracts in their diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProviderTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProviderTest.java index ec9a4e0e1bb2..db825a813847 100644 --- a/http-client-spi/src/test/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProviderTest.java +++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/SystemPropertyTlsKeyManagersProviderTest.java @@ -19,30 +19,31 @@ import static software.amazon.awssdk.utils.JavaSystemSetting.SSL_KEY_STORE; import static software.amazon.awssdk.utils.JavaSystemSetting.SSL_KEY_STORE_PASSWORD; import static software.amazon.awssdk.utils.JavaSystemSetting.SSL_KEY_STORE_TYPE; + import java.io.IOException; import java.nio.file.Paths; import java.security.Security; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; public class SystemPropertyTlsKeyManagersProviderTest extends ClientTlsAuthTestBase { private static final SystemPropertyTlsKeyManagersProvider PROVIDER = SystemPropertyTlsKeyManagersProvider.create(); - @BeforeClass + @BeforeAll public static void setUp() throws IOException { ClientTlsAuthTestBase.setUp(); } - @After + @AfterEach public void methodTeardown() { System.clearProperty(SSL_KEY_STORE.property()); System.clearProperty(SSL_KEY_STORE_TYPE.property()); System.clearProperty(SSL_KEY_STORE_PASSWORD.property()); } - @AfterClass + @AfterAll public static void teardown() throws IOException { ClientTlsAuthTestBase.teardown(); } diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/TlsKeyManagersProviderTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/TlsKeyManagersProviderTest.java index be97ba0ef7a7..fcff1509521d 100644 --- a/http-client-spi/src/test/java/software/amazon/awssdk/http/TlsKeyManagersProviderTest.java +++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/TlsKeyManagersProviderTest.java @@ -16,7 +16,8 @@ package software.amazon.awssdk.http; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; + +import org.junit.jupiter.api.Test; public class TlsKeyManagersProviderTest { diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProviderTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProviderTest.java index 776277e3c56f..566718e2dc64 100644 --- a/http-client-spi/src/test/java/software/amazon/awssdk/http/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProviderTest.java +++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/software/amazon/awssdk/internal/http/NoneTlsKeyManagersProviderTest.java @@ -16,7 +16,8 @@ package software.amazon.awssdk.http.software.amazon.awssdk.internal.http; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import software.amazon.awssdk.internal.http.NoneTlsKeyManagersProvider; public class NoneTlsKeyManagersProviderTest { diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java index f6721255ce2b..16e087e3fa60 100644 --- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java +++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java @@ -25,18 +25,19 @@ import static software.amazon.awssdk.utils.JavaSystemSetting.SSL_KEY_STORE; import static software.amazon.awssdk.utils.JavaSystemSetting.SSL_KEY_STORE_PASSWORD; import static software.amazon.awssdk.utils.JavaSystemSetting.SSL_KEY_STORE_TYPE; + import com.github.tomakehurst.wiremock.WireMockServer; import java.io.IOException; import java.net.SocketException; 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.Test; +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.rules.ExpectedException; import software.amazon.awssdk.http.FileStoreTlsKeyManagersProvider; import software.amazon.awssdk.http.HttpExecuteRequest; @@ -60,7 +61,7 @@ public class ApacheClientTlsAuthTest extends ClientTlsAuthTestBase { @Rule public ExpectedException thrown = ExpectedException.none(); - @BeforeClass + @BeforeAll public static void setUp() throws IOException { ClientTlsAuthTestBase.setUp(); @@ -82,12 +83,12 @@ public static void setUp() throws IOException { keyManagersProvider = FileStoreTlsKeyManagersProvider.create(clientKeyStore, CLIENT_STORE_TYPE, STORE_PASSWORD); } - @Before + @BeforeEach public void methodSetup() { wireMockServer.stubFor(any(urlMatching(".*")).willReturn(aResponse().withStatus(200).withBody("{}"))); } - @AfterClass + @AfterAll public static void teardown() throws IOException { wireMockServer.stop(); System.clearProperty("javax.net.ssl.trustStore"); @@ -96,7 +97,7 @@ public static void teardown() throws IOException { ClientTlsAuthTestBase.teardown(); } - @After + @AfterEach public void methodTeardown() { if (client != null) { client.close(); diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientTest.java index bd5534d8812d..fefa018b653b 100644 --- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientTest.java +++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientTest.java @@ -24,15 +24,15 @@ import org.apache.http.conn.DnsResolver; import org.apache.http.conn.routing.HttpRoutePlanner; import org.apache.http.impl.conn.SystemDefaultDnsResolver; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; /** * @see ApacheHttpClientWireMockTest */ public class ApacheHttpClientTest { - @After + @AfterEach public void cleanup() { System.clearProperty("http.proxyHost"); System.clearProperty("http.proxyPort"); diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheMetricsTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheMetricsTest.java index 6aca164d293f..f489c3ca85c4 100644 --- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheMetricsTest.java +++ b/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.Test; +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.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(); - @BeforeClass + @BeforeAll public static void setUp() throws IOException { wireMockServer = new WireMockServer(); wireMockServer.start(); } - @Before + @BeforeEach public void methodSetup() { wireMockServer.stubFor(any(urlMatching(".*")).willReturn(aResponse().withStatus(200).withBody("{}"))); } - @AfterClass + @AfterAll public static void teardown() throws IOException { wireMockServer.stop(); } - @After + @AfterEach public void methodTeardown() { if (client != null) { client.close(); diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ClientTlsAuthTestBase.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ClientTlsAuthTestBase.java index 8f3bdca14428..0ffd58bb4313 100644 --- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ClientTlsAuthTestBase.java +++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ClientTlsAuthTestBase.java @@ -19,8 +19,8 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; abstract class ClientTlsAuthTestBase { protected static final String STORE_PASSWORD = "password"; @@ -32,13 +32,13 @@ abstract class ClientTlsAuthTestBase { protected static Path serverKeyStore; protected static Path clientKeyStore; - @BeforeClass + @BeforeAll public static void setUp() throws IOException { tempDir = Files.createTempDirectory(ClientTlsAuthTestBase.class.getSimpleName()); copyCertsToTmpDir(); } - @AfterClass + @AfterAll public static void teardown() throws IOException { Files.deleteIfExists(serverKeyStore); Files.deleteIfExists(clientKeyStore); diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ProxyConfigurationTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ProxyConfigurationTest.java index e2bb5dd07241..f740843e8d31 100644 --- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ProxyConfigurationTest.java +++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ProxyConfigurationTest.java @@ -20,18 +20,18 @@ import java.net.URI; import java.util.HashSet; import java.util.Set; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ProxyConfigurationTest { - @Before + @BeforeEach public void setup() { clearProxyProperties(); } - @AfterClass + @AfterAll public static void cleanup() { clearProxyProperties(); } diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlannerTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlannerTest.java index 3a81c89dcc1d..3685df2b3bbd 100644 --- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlannerTest.java +++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/SdkProxyRoutePlannerTest.java @@ -15,14 +15,14 @@ package software.amazon.awssdk.http.apache.internal; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import org.apache.http.HttpException; import org.apache.http.HttpHost; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.protocol.HttpClientContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link SdkProxyRoutePlanner}. diff --git a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactoryTest.java b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactoryTest.java index 5455921e8e81..d3e31155a61d 100644 --- a/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactoryTest.java +++ b/http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/internal/impl/ApacheHttpRequestFactoryTest.java @@ -16,17 +16,17 @@ package software.amazon.awssdk.http.apache.internal.impl; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.net.InetAddress; import java.net.URI; import java.time.Duration; -import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.Header; import org.apache.http.HttpHeaders; -import org.junit.Before; -import org.junit.Test; +import org.apache.http.client.methods.HttpRequestBase; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.HttpExecuteRequest; import software.amazon.awssdk.http.SdkHttpMethod; import software.amazon.awssdk.http.SdkHttpRequest; @@ -37,7 +37,7 @@ public class ApacheHttpRequestFactoryTest { private ApacheHttpRequestConfig requestConfig; private ApacheHttpRequestFactory instance; - @Before + @BeforeEach public void setup() { instance = new ApacheHttpRequestFactory(); requestConfig = ApacheHttpRequestConfig.builder() diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java index 4c7feb9a3929..9451751046c5 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientSpiVerificationTest.java @@ -33,15 +33,12 @@ import java.time.Duration; import java.util.Random; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; - -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -67,7 +64,7 @@ public class AwsCrtHttpClientSpiVerificationTest { private SdkAsyncHttpClient client; - @Before + @BeforeEach public void setup() throws Exception { CrtResource.waitForNoResources(); @@ -77,7 +74,7 @@ public void setup() throws Exception { .build(); } - @After + @AfterEach public void tearDown() { client.close(); EventLoopGroup.closeStaticDefault(); @@ -92,7 +89,7 @@ private byte[] generateRandomBody(int size) { } @Test - public void signalsErrorViaOnErrorAndFuture() throws InterruptedException, ExecutionException, TimeoutException { + public void signalsErrorViaOnErrorAndFuture() throws Exception { stubFor(any(urlEqualTo("/")).willReturn(aResponse().withFault(Fault.RANDOM_DATA_THEN_CLOSE))); CompletableFuture errorSignaled = new CompletableFuture<>(); diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientWireMockTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientWireMockTest.java index 8758c8212aab..f907dc894531 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientWireMockTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientWireMockTest.java @@ -28,11 +28,11 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Rule; -import org.junit.Test; +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 software.amazon.awssdk.crt.CrtResource; import software.amazon.awssdk.crt.io.EventLoopGroup; import software.amazon.awssdk.crt.io.HostResolver; @@ -53,17 +53,17 @@ public class AwsCrtHttpClientWireMockTest { .dynamicHttpsPort() .networkTrafficListener(wiremockTrafficListener)); - @BeforeClass + @BeforeAll public static void setup() { System.setProperty("aws.crt.debugnative", "true"); } - @Before + @BeforeEach public void methodSetup() { wiremockTrafficListener.reset(); } - @After + @AfterEach public void tearDown() { // Verify there is no resource leak. EventLoopGroup.closeStaticDefault(); diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ConnectionHealthChecksConfigurationTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ConnectionHealthChecksConfigurationTest.java index bc7eef8b9b14..a0b642d844e3 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ConnectionHealthChecksConfigurationTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ConnectionHealthChecksConfigurationTest.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ConnectionHealthChecksConfigurationTest { diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyConfigurationTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyConfigurationTest.java index 7114d2ae1ce6..8f1c9b3d78b0 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyConfigurationTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyConfigurationTest.java @@ -16,13 +16,14 @@ package software.amazon.awssdk.http.crt; import static org.assertj.core.api.Assertions.assertThat; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Random; import java.util.stream.Stream; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ProxyConfiguration}. @@ -34,12 +35,12 @@ public class ProxyConfigurationTest { private static final String TEST_USER = "testuser"; private static final String TEST_PASSWORD = "123"; - @Before + @BeforeEach public void setup() { clearProxyProperties(); } - @AfterClass + @AfterAll public static void cleanup() { clearProxyProperties(); } diff --git a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyWireMockTest.java b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyWireMockTest.java index 1487344b099e..7c56119bc26e 100644 --- a/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyWireMockTest.java +++ b/http-clients/aws-crt-client/src/test/java/software/amazon/awssdk/http/crt/ProxyWireMockTest.java @@ -21,6 +21,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static java.util.Collections.emptyMap; import static org.assertj.core.api.Assertions.assertThat; + import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import java.net.URI; @@ -28,9 +29,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import software.amazon.awssdk.crt.CrtResource; import software.amazon.awssdk.crt.io.EventLoopGroup; @@ -60,7 +61,7 @@ public class ProxyWireMockTest { .dynamicHttpsPort()); - @Before + @BeforeEach public void setup() { mockProxy.start(); mockServer.start(); @@ -77,7 +78,7 @@ public void setup() { .build(); } - @After + @AfterEach public void teardown() { mockServer.stop(); mockProxy.stop(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ClientTlsAuthTestBase.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ClientTlsAuthTestBase.java index 468aad992e47..d2f1f873a695 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ClientTlsAuthTestBase.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ClientTlsAuthTestBase.java @@ -19,8 +19,8 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; abstract class ClientTlsAuthTestBase { protected static final String STORE_PASSWORD = "password"; @@ -32,13 +32,13 @@ abstract class ClientTlsAuthTestBase { protected static Path serverKeyStore; protected static Path clientKeyStore; - @BeforeClass + @BeforeAll public static void setUp() throws IOException { tempDir = Files.createTempDirectory(ClientTlsAuthTestBase.class.getSimpleName()); copyCertsToTmpDir(); } - @AfterClass + @AfterAll public static void teardown() throws IOException { Files.deleteIfExists(serverKeyStore); Files.deleteIfExists(clientKeyStore); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2ConfigurationTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2ConfigurationTest.java index ec93d1455fb5..0b23bb51859f 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2ConfigurationTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2ConfigurationTest.java @@ -16,8 +16,9 @@ package software.amazon.awssdk.http.nio.netty; import static org.assertj.core.api.Assertions.assertThat; + import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; public class Http2ConfigurationTest { diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2MetricsTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2MetricsTest.java index 92b9a7669aee..5c6b9a074a27 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2MetricsTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/Http2MetricsTest.java @@ -37,9 +37,9 @@ import io.netty.handler.codec.http2.Http2StreamFrame; import io.netty.util.ReferenceCountUtil; import java.net.URI; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.Http2Metric; import software.amazon.awssdk.http.HttpMetric; @@ -59,12 +59,12 @@ public class Http2MetricsTest { private static final TestHttp2Server SERVER = new TestHttp2Server(); - @BeforeClass + @BeforeAll public static void setup() throws InterruptedException { SERVER.start(); } - @AfterClass + @AfterAll public static void teardown() throws InterruptedException { SERVER.stop(); } diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyClientTlsAuthTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyClientTlsAuthTest.java index 8f1e486d3a07..b08a7c6a3831 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyClientTlsAuthTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyClientTlsAuthTest.java @@ -26,11 +26,11 @@ import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import java.io.IOException; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.FileStoreTlsKeyManagersProvider; @@ -60,7 +60,7 @@ public class NettyClientTlsAuthTest extends ClientTlsAuthTestBase { private SdkAsyncHttpClient netty; - @BeforeClass + @BeforeAll public static void setUp() throws IOException { ClientTlsAuthTestBase.setUp(); @@ -89,7 +89,7 @@ public static void setUp() throws IOException { keyManagersProvider = FileStoreTlsKeyManagersProvider.create(clientKeyStore, CLIENT_STORE_TYPE, STORE_PASSWORD); } - @AfterClass + @AfterAll public static void teardown() throws IOException { ClientTlsAuthTestBase.teardown(); @@ -100,7 +100,7 @@ public static void teardown() throws IOException { System.clearProperty("javax.net.ssl.trustStoreType"); } - @After + @AfterEach public void methodTeardown() { if (netty != null) { netty.close(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientDefaultWireMockTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientDefaultWireMockTest.java index 559edc8f2af6..e32b6eaeb3af 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientDefaultWireMockTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientDefaultWireMockTest.java @@ -35,7 +35,6 @@ import static org.assertj.core.api.Assertions.assertThat; import com.github.tomakehurst.wiremock.junit.WireMockRule; -import java.io.IOException; import java.net.URI; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -43,25 +42,21 @@ import java.util.Collections; import java.util.Map; import java.util.Optional; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.stream.Stream; import org.assertj.core.api.Condition; -import org.junit.AfterClass; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import software.amazon.awssdk.http.SdkHttpConfigurationOption; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.http.async.AsyncExecuteRequest; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; import software.amazon.awssdk.http.async.SdkHttpContentPublisher; -import software.amazon.awssdk.utils.AttributeMap; public class NettyNioAsyncHttpClientDefaultWireMockTest { @@ -75,12 +70,12 @@ public class NettyNioAsyncHttpClientDefaultWireMockTest { private static SdkAsyncHttpClient client = NettyNioAsyncHttpClient.create(); - @Before + @BeforeEach public void methodSetup() { wiremockTrafficListener.reset(); } - @AfterClass + @AfterAll public static void tearDown() throws Exception { client.close(); } @@ -149,7 +144,7 @@ public void canSendContentAndGetThatContentBack() throws Exception { } @Test - public void requestContentOnlyEqualToContentLengthHeaderFromProvider() throws InterruptedException, ExecutionException, TimeoutException, IOException { + public void requestContentOnlyEqualToContentLengthHeaderFromProvider() throws Exception { final String content = randomAlphabetic(32); final String streamContent = content + reverse(content); stubFor(any(urlEqualTo("/echo?reversed=true")) diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientSpiVerificationTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientSpiVerificationTest.java index a4e4047fde13..dd0141a1a6a6 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientSpiVerificationTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClientSpiVerificationTest.java @@ -32,12 +32,10 @@ import java.nio.ByteBuffer; import java.util.Map; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import org.junit.AfterClass; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -63,14 +61,14 @@ public class NettyNioAsyncHttpClientSpiVerificationTest { private static SdkAsyncHttpClient client = NettyNioAsyncHttpClient.builder().buildWithDefaults(mapWithTrustAllCerts()); - @AfterClass + @AfterAll public static void tearDown() throws Exception { client.close(); } // CONNECTION_RESET_BY_PEER does not work on JDK 11. See https://github.com/tomakehurst/wiremock/issues/1009 @Test - public void signalsErrorViaOnErrorAndFuture() throws InterruptedException, ExecutionException, TimeoutException { + public void signalsErrorViaOnErrorAndFuture() throws Exception { stubFor(any(urlEqualTo("/")).willReturn(aResponse().withFault(Fault.RANDOM_DATA_THEN_CLOSE))); CompletableFuture errorSignaled = new CompletableFuture<>(); @@ -95,7 +93,7 @@ public void onError(Throwable error) { } @Test - public void callsOnStreamForEmptyResponseContent() throws InterruptedException, ExecutionException, TimeoutException { + public void callsOnStreamForEmptyResponseContent() throws Exception { stubFor(any(urlEqualTo("/")).willReturn(aResponse().withStatus(204).withHeader("foo", "bar"))); CompletableFuture streamReceived = new CompletableFuture<>(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java index 068e9d88c865..e9700555b7fc 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/ProxyConfigurationTest.java @@ -23,9 +23,9 @@ import java.util.Random; import java.util.Set; import java.util.stream.Stream; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ProxyConfiguration}. @@ -38,12 +38,12 @@ public class ProxyConfigurationTest { private static final String TEST_USER = "testuser"; private static final String TEST_PASSWORD = "123"; - @Before + @BeforeEach public void setup() { clearProxyProperties(); } - @AfterClass + @AfterAll public static void cleanup() { clearProxyProperties(); } diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/GoAwayTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/GoAwayTest.java index 957dcaa7fc71..ff9e7814b45d 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/GoAwayTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/GoAwayTest.java @@ -55,9 +55,10 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; +import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; @@ -65,7 +66,6 @@ import software.amazon.awssdk.http.async.AsyncExecuteRequest; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler; -import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient; import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup; import software.amazon.awssdk.http.nio.netty.internal.http2.GoAwayException; @@ -78,7 +78,7 @@ public class GoAwayTest { private SdkAsyncHttpClient netty; private SimpleEndpointDriver endpointDriver; - @After + @AfterEach public void teardown() throws InterruptedException { if (endpointDriver != null) { endpointDriver.shutdown(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/H2ServerErrorTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/H2ServerErrorTest.java index a6995323c589..27b1ae52313c 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/H2ServerErrorTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/H2ServerErrorTest.java @@ -18,8 +18,8 @@ import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static org.assertj.core.api.Assertions.assertThat; -import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES; import static software.amazon.awssdk.http.HttpTestUtils.sendGetRequest; +import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; @@ -45,9 +45,9 @@ import io.netty.handler.ssl.util.SelfSignedCertificate; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient; @@ -63,7 +63,7 @@ public class H2ServerErrorTest { private SdkAsyncHttpClient netty; private Server server; - @Before + @BeforeEach public void setup() throws Exception { server = new Server(); server.init(); @@ -74,7 +74,7 @@ public void setup() throws Exception { .buildWithDefaults(AttributeMap.builder().put(TRUST_ALL_CERTIFICATES, true).build()); } - @After + @AfterEach public void teardown() throws InterruptedException { if (server != null) { server.shutdown(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/PingTimeoutTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/PingTimeoutTest.java index f88c5af2bfcd..da6805b8386f 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/PingTimeoutTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/PingTimeoutTest.java @@ -52,14 +52,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; +import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; @@ -67,7 +68,6 @@ import software.amazon.awssdk.http.async.AsyncExecuteRequest; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler; -import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.nio.netty.Http2Configuration; import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient; import software.amazon.awssdk.http.nio.netty.internal.http2.PingFailedException; @@ -82,13 +82,13 @@ public class PingTimeoutTest { private Server server; private SdkAsyncHttpClient netty; - @Before + @BeforeEach public void methodSetup() throws Exception { server = new Server(); server.init(); } - @After + @AfterEach public void methodTeardown() throws InterruptedException { server.shutdown(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerCloseConnectionTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerCloseConnectionTest.java index cc6fbda166b5..a84eca2d138a 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerCloseConnectionTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerCloseConnectionTest.java @@ -52,10 +52,11 @@ import java.time.Duration; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; +import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; @@ -63,7 +64,6 @@ import software.amazon.awssdk.http.async.AsyncExecuteRequest; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler; -import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient; import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup; import software.amazon.awssdk.utils.AttributeMap; @@ -78,7 +78,7 @@ public class ServerCloseConnectionTest { private SdkAsyncHttpClient netty; private Server server; - @Before + @BeforeEach public void setup() throws Exception { server = new Server(); server.init(); @@ -90,7 +90,7 @@ public void setup() throws Exception { .buildWithDefaults(AttributeMap.builder().put(TRUST_ALL_CERTIFICATES, true).build()); } - @After + @AfterEach public void teardown() throws InterruptedException { if (server != null) { server.shutdown(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerNotRespondingTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerNotRespondingTest.java index 88eb36716106..af9a0204434b 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerNotRespondingTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/ServerNotRespondingTest.java @@ -54,10 +54,11 @@ import java.time.Duration; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; +import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; @@ -65,7 +66,6 @@ import software.amazon.awssdk.http.async.AsyncExecuteRequest; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler; -import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient; import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup; import software.amazon.awssdk.utils.AttributeMap; @@ -80,7 +80,7 @@ public class ServerNotRespondingTest { private SdkAsyncHttpClient netty; private Server server; - @Before + @BeforeEach public void setup() throws Exception { server = new Server(); server.init(); @@ -93,7 +93,7 @@ public void setup() throws Exception { .buildWithDefaults(AttributeMap.builder().put(TRUST_ALL_CERTIFICATES, true).build()); } - @After + @AfterEach public void teardown() throws InterruptedException { if (server != null) { server.shutdown(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMapTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMapTest.java index 3b72f71be4db..aa76e04883e8 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMapTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/AwaitCloseChannelPoolMapTest.java @@ -38,9 +38,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.RandomStringUtils; -import org.junit.After; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.TlsKeyManagersProvider; @@ -60,7 +60,7 @@ public class AwaitCloseChannelPoolMapTest { .dynamicPort() .networkTrafficListener(recorder)); - @After + @AfterEach public void methodTeardown() { if (channelPoolMap != null) { channelPoolMap.close(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializerTest.java index 12e0627bb1e4..aa5f60329b3d 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializerTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializerTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.http.nio.netty.internal; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static software.amazon.awssdk.http.SdkHttpConfigurationOption.GLOBAL_HTTP_DEFAULTS; import io.netty.buffer.UnpooledByteBufAllocator; @@ -33,7 +33,7 @@ import java.time.Duration; import java.util.concurrent.atomic.AtomicReference; import javax.net.ssl.SSLException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.Protocol; public class ChannelPipelineInitializerTest { diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPoolTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPoolTest.java index e610884e3eff..724d59b571a5 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPoolTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HealthCheckedChannelPoolTest.java @@ -41,8 +41,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.mockito.stubbing.Answer; @@ -66,7 +66,7 @@ public class HealthCheckedChannelPoolTest { NETTY_CONFIGURATION, downstreamChannelPool); - @Before + @BeforeEach public void reset() { Mockito.reset(eventLoopGroup, eventLoop, downstreamChannelPool, scheduledFuture, attribute); channels.clear(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPoolTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPoolTest.java index 58941ef0c6b8..de5b4288e62a 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPoolTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HonorCloseOnReleaseChannelPoolTest.java @@ -25,7 +25,7 @@ import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Promise; import java.util.concurrent.TimeUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.mockito.internal.verification.Times; diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandlerTest.java index 33263a5911d8..e8f368e699cf 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandlerTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentHandlerTest.java @@ -20,9 +20,9 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.LastHttpContent; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -32,7 +32,7 @@ public class LastHttpContentHandlerTest { private ChannelHandlerContext handlerContext; private LastHttpContentHandler contentHandler = LastHttpContentHandler.create(); - @Before + @BeforeEach public void setup() throws Exception { channel = new MockChannel(); channel.attr(LAST_HTTP_CONTENT_RECEIVED_KEY).set(false); @@ -40,7 +40,7 @@ public void setup() throws Exception { Mockito.when(handlerContext.channel()).thenReturn(channel); } - @After + @AfterEach public void cleanup() { channel.close(); } diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallowerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallowerTest.java index 75e90ef19f11..9f40aa646290 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallowerTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/LastHttpContentSwallowerTest.java @@ -26,8 +26,8 @@ import io.netty.handler.codec.http.HttpContent; import io.netty.handler.codec.http.HttpObject; import io.netty.handler.codec.http.LastHttpContent; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link LastHttpContentSwallower}. @@ -37,7 +37,7 @@ public class LastHttpContentSwallowerTest { private ChannelHandlerContext mockCtx; private ChannelPipeline mockPipeline; - @Before + @BeforeEach public void setUp() { mockCtx = mock(ChannelHandlerContext.class); mockPipeline = mock(ChannelPipeline.class); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutorTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutorTest.java index ed7260d9a318..3e03ae5544dc 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutorTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutorTest.java @@ -39,9 +39,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.stubbing.Answer; import software.amazon.awssdk.http.Protocol; @@ -60,7 +60,7 @@ public class NettyRequestExecutorTest { private RequestContext requestContext; - @Before + @BeforeEach public void setup() { mockChannelPool = mock(SdkChannelPool.class); @@ -82,7 +82,7 @@ public void setup() { nettyRequestExecutor = new NettyRequestExecutor(requestContext); } - @After + @AfterEach public void teardown() throws InterruptedException { eventLoopGroup.shutdownGracefully().await(); } diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandlerTest.java index e5e3f6f57210..1be84615840d 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandlerTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/OldConnectionReaperHandlerTest.java @@ -19,7 +19,7 @@ import static org.mockito.Matchers.any; import io.netty.channel.ChannelHandlerContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.mockito.internal.verification.Times; diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapterTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapterTest.java index 31e2aca3c9e7..5b3f660c4196 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapterTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/RequestAdapterTest.java @@ -16,8 +16,8 @@ package software.amazon.awssdk.http.nio.netty.internal; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import io.netty.handler.codec.http.HttpHeaderNames; import io.netty.handler.codec.http.HttpMethod; @@ -26,7 +26,7 @@ import io.netty.handler.codec.http2.HttpConversionUtil; import java.net.URI; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.SdkHttpMethod; import software.amazon.awssdk.http.SdkHttpRequest; diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ResponseCompletionTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ResponseCompletionTest.java index 56601cf8bdb3..c6aa85864ed5 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ResponseCompletionTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/ResponseCompletionTest.java @@ -50,9 +50,10 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import org.apache.commons.lang3.RandomStringUtils; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; +import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; @@ -60,7 +61,6 @@ import software.amazon.awssdk.http.async.AsyncExecuteRequest; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler; -import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient; import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup; import software.amazon.awssdk.utils.AttributeMap; @@ -70,7 +70,7 @@ public class ResponseCompletionTest { private SdkAsyncHttpClient netty; private Server server; - @After + @AfterEach public void teardown() throws InterruptedException { if (server != null) { server.shutdown(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptionsTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptionsTest.java index 49fbf116b674..dc548c8b5de3 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptionsTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SdkChannelOptionsTest.java @@ -15,12 +15,12 @@ package software.amazon.awssdk.http.nio.netty.internal; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import io.netty.channel.ChannelOption; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SdkChannelOptionsTest { diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroupTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroupTest.java index 755630f1ee31..25578820abf9 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroupTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SharedSdkEventLoopGroupTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Java6Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.nio.netty.SdkEventLoopGroup; public class SharedSdkEventLoopGroupTest { diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandlerTest.java index 1e1dcea1c6a9..b0235f4e3d99 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandlerTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslCloseCompletionEventHandlerTest.java @@ -23,23 +23,23 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.ssl.SslCloseCompletionEvent; import java.nio.channels.ClosedChannelException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class SslCloseCompletionEventHandlerTest { private ChannelHandlerContext ctx; private MockChannel channel; - @Before + @BeforeEach public void setup() throws Exception { ctx = mock(ChannelHandlerContext.class); channel = new MockChannel(); when(ctx.channel()).thenReturn(channel); } - @After + @AfterEach public void teardown() { channel.close(); } diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslContextProviderTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslContextProviderTest.java index 6f8954261fd7..ee279eabdb07 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslContextProviderTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/SslContextProviderTest.java @@ -24,7 +24,7 @@ import io.netty.handler.codec.http2.Http2SecurityUtil; import io.netty.handler.ssl.SslProvider; import javax.net.ssl.TrustManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.SdkHttpConfigurationOption; diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactoryTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactoryTest.java index 4e79ad583d5e..bdc0c7e2aef8 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactoryTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/StaticKeyManagerFactoryTest.java @@ -17,9 +17,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; + import java.util.stream.IntStream; import javax.net.ssl.KeyManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link StaticKeyManagerFactory}. diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListenerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListenerTest.java index 67f8c28df2cf..002c5b5c01b2 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListenerTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2GoAwayEventListenerTest.java @@ -15,7 +15,7 @@ package software.amazon.awssdk.http.nio.netty.internal.http2; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.mock; @@ -28,10 +28,9 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; -import io.netty.handler.codec.http2.DefaultHttp2GoAwayFrame; import io.netty.util.Attribute; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey; public class Http2GoAwayEventListenerTest { @@ -40,7 +39,7 @@ public class Http2GoAwayEventListenerTest { private ChannelPipeline channelPipeline; private Attribute attribute; - @Before + @BeforeEach public void setup() { this.ctx = mock(ChannelHandlerContext.class); this.channel = mock(Channel.class); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandlerTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandlerTest.java index 2788337dacba..437e342b7ad4 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandlerTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/Http2PingHandlerTest.java @@ -34,8 +34,8 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey; @@ -46,7 +46,7 @@ public class Http2PingHandlerTest { private Http2PingHandler fastChecker; private Http2PingHandler slowChecker; - @Before + @BeforeEach public void setup() throws Exception { this.fastChecker = new Http2PingHandler(FAST_CHECKER_DURATION_MILLIS); this.slowChecker = new Http2PingHandler(30 * 1_000); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecordTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecordTest.java index 28a54eefc024..5e9359be28cb 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecordTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/MultiplexedChannelRecordTest.java @@ -32,10 +32,9 @@ import java.io.IOException; import java.time.Duration; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.nio.netty.internal.ChannelAttributeKey; import software.amazon.awssdk.http.nio.netty.internal.MockChannel; @@ -45,13 +44,13 @@ public class MultiplexedChannelRecordTest { private EventLoopGroup loopGroup; private MockChannel channel; - @Before + @BeforeEach public void setup() throws Exception { loopGroup = new NioEventLoopGroup(4); channel = new MockChannel(); } - @After + @AfterEach public void teardown() { loopGroup.shutdownGracefully().awaitUninterruptibly(); channel.close(); @@ -198,7 +197,7 @@ public void acquireClaimedConnection_channelClosed_shouldThrowIOException() { } @Test - public void closeChildChannels_shouldDeliverException() throws ExecutionException, InterruptedException { + public void closeChildChannels_shouldDeliverException() throws Exception { EmbeddedChannel channel = newHttp2Channel(); loopGroup.register(channel).awaitUninterruptibly(); Promise channelPromise = new DefaultPromise<>(loopGroup.next()); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/ReadTimeoutTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/ReadTimeoutTest.java index f1d66aa9f726..79ac42d587cc 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/ReadTimeoutTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/ReadTimeoutTest.java @@ -40,8 +40,8 @@ import java.time.Duration; import java.util.Optional; import java.util.function.Supplier; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import software.amazon.awssdk.http.Protocol; @@ -59,7 +59,7 @@ public class ReadTimeoutTest { private TestH2Server testServer; private SdkAsyncHttpClient netty; - @After + @AfterEach public void methodTeardown() throws InterruptedException { if (testServer != null) { testServer.shutdown(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/WindowSizeTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/WindowSizeTest.java index e33ddfcb6e17..c83e8d2be52a 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/WindowSizeTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/http2/WindowSizeTest.java @@ -16,6 +16,7 @@ package software.amazon.awssdk.http.nio.netty.internal.http2; import static org.assertj.core.api.Assertions.assertThat; + import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -42,11 +43,12 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.junit.After; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import org.reactivestreams.Publisher; +import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.Protocol; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; @@ -54,7 +56,6 @@ import software.amazon.awssdk.http.async.AsyncExecuteRequest; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; import software.amazon.awssdk.http.async.SdkAsyncHttpResponseHandler; -import software.amazon.awssdk.http.EmptyPublisher; import software.amazon.awssdk.http.nio.netty.Http2Configuration; import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient; @@ -67,7 +68,7 @@ public class WindowSizeTest { @Rule public ExpectedException expected = ExpectedException.none(); - @After + @AfterEach public void methodTeardown() throws InterruptedException { if (netty != null) { netty.close(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/ChannelPublisherTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/ChannelPublisherTest.java index 7f8755545108..18976f5e82ab 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/ChannelPublisherTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/ChannelPublisherTest.java @@ -17,9 +17,9 @@ package software.amazon.awssdk.http.nio.netty.internal.nrs; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; @@ -39,9 +39,9 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -61,7 +61,7 @@ public class ChannelPublisherTest { private Publisher publisher; private SubscriberProbe subscriber; - @Before + @BeforeEach public void start() throws Exception { group = new NioEventLoopGroup(); EventLoop eventLoop = group.next(); @@ -82,7 +82,7 @@ public void start() throws Exception { subscriber = new SubscriberProbe<>(); } - @After + @AfterEach public void stop() throws Exception { channel.unsafe().closeForcibly(); group.shutdownGracefully(); diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberTest.java index 4b47365fce1f..8ec96828e153 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/nrs/HandlerSubscriberTest.java @@ -36,9 +36,9 @@ import java.util.ArrayDeque; import java.util.Queue; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscription; /** @@ -54,7 +54,7 @@ public class HandlerSubscriberTest { private CustomEmbeddedEventLoop eventLoop; private HandlerSubscriber handler; - @Before + @BeforeEach public void setup() throws Exception { channel = new CustomEmbeddedChannel(); eventLoop = new CustomEmbeddedEventLoop(); @@ -64,7 +64,7 @@ public void setup() throws Exception { channel.pipeline().addLast(handler); } - @After + @AfterEach public void teardown() { channel.close(); } diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtilsTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtilsTest.java index 1bf5c0e509a5..1087ce62778a 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtilsTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/ChannelUtilsTest.java @@ -25,7 +25,7 @@ import io.netty.handler.logging.LoggingHandler; import io.netty.handler.timeout.ReadTimeoutHandler; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.nio.netty.internal.MockChannel; public class ChannelUtilsTest { diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtilsTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtilsTest.java index 2b3c5040bbd3..7c95eb8a7c11 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtilsTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtilsTest.java @@ -37,21 +37,21 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import javax.net.ssl.SSLEngine; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.nio.netty.internal.MockChannel; public class NettyUtilsTest { private static EventLoopGroup eventLoopGroup; - @BeforeClass + @BeforeAll public static void setup() { eventLoopGroup = new NioEventLoopGroup(1); } - @AfterClass + @AfterAll public static void teardown() throws InterruptedException { eventLoopGroup.shutdownGracefully().await(); } diff --git a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolverTest.java b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolverTest.java index 2dbfefa4e46d..472c417d4485 100644 --- a/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolverTest.java +++ b/http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/utils/SocketChannelResolverTest.java @@ -16,7 +16,6 @@ package software.amazon.awssdk.http.nio.netty.internal.utils; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; import static software.amazon.awssdk.http.nio.netty.internal.utils.SocketChannelResolver.resolveSocketChannelFactory; import io.netty.channel.epoll.Epoll; @@ -26,7 +25,8 @@ import io.netty.channel.oio.OioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.channel.socket.oio.OioSocketChannel; -import org.junit.Test; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.nio.netty.internal.DelegatingEventLoopGroup; public class SocketChannelResolverTest { @@ -38,7 +38,7 @@ public void canDetectFactoryForStandardNioEventLoopGroup() { @Test public void canDetectEpollEventLoopGroupFactory() { - assumeTrue(Epoll.isAvailable()); + Assumptions.assumeTrue(Epoll.isAvailable()); assertThat(resolveSocketChannelFactory(new EpollEventLoopGroup()).newChannel()).isInstanceOf(EpollSocketChannel.class); } diff --git a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientDefaultWireMockTest.java b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientDefaultWireMockTest.java index 3dc3035d4274..66cbc4e3b814 100644 --- a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientDefaultWireMockTest.java +++ b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientDefaultWireMockTest.java @@ -17,7 +17,7 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSocketFactory; -import org.junit.After; +import org.junit.jupiter.api.AfterEach; import software.amazon.awssdk.http.SdkHttpClient; import software.amazon.awssdk.http.SdkHttpClientDefaultTestSuite; @@ -28,7 +28,7 @@ protected SdkHttpClient createSdkHttpClient() { return UrlConnectionHttpClient.create(); } - @After + @AfterEach public void reset() { HttpsURLConnection.setDefaultSSLSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault()); } diff --git a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWireMockTest.java b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWireMockTest.java index 24588be760d1..939484a8d0de 100644 --- a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWireMockTest.java +++ b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWireMockTest.java @@ -18,7 +18,7 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSocketFactory; -import org.junit.After; +import org.junit.jupiter.api.AfterEach; import software.amazon.awssdk.http.SdkHttpClient; import software.amazon.awssdk.http.SdkHttpClientTestSuite; import software.amazon.awssdk.utils.AttributeMap; @@ -41,7 +41,7 @@ protected SdkHttpClient createSdkHttpClient(SdkHttpClientOptions options) { return builder.buildWithDefaults(attributeMap.build()); } - @After + @AfterEach public void reset() { HttpsURLConnection.setDefaultSSLSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault()); } diff --git a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWithCustomCreateWireMockTest.java b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWithCustomCreateWireMockTest.java index e64392dee52f..7c9601cdb6a1 100644 --- a/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWithCustomCreateWireMockTest.java +++ b/http-clients/url-connection-client/src/test/java/software/amazon/awssdk/http/urlconnection/UrlConnectionHttpClientWithCustomCreateWireMockTest.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.util.function.Function; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpClient; import software.amazon.awssdk.http.SdkHttpClientTestSuite; @@ -40,17 +40,17 @@ protected SdkHttpClient createSdkHttpClient(SdkHttpClientOptions options) { })); } - @Ignore // Not supported when using custom factory + @Disabled // Not supported when using custom factory @Override public void testCustomTlsTrustManager() { } - @Ignore // Not supported when using custom factory + @Disabled // Not supported when using custom factory @Override public void testTrustAllWorks() { } - @Ignore // Not supported when using custom factory + @Disabled // Not supported when using custom factory @Override public void testCustomTlsTrustManagerAndTrustAllFails() { } diff --git a/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/MetricUploaderTest.java b/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/MetricUploaderTest.java index daaec59916c9..df3198860d42 100644 --- a/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/MetricUploaderTest.java +++ b/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/MetricUploaderTest.java @@ -24,8 +24,8 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.CompletableFuture; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient; import software.amazon.awssdk.services.cloudwatch.model.PutMetricDataRequest; @@ -38,7 +38,7 @@ public class MetricUploaderTest { private MetricUploader uploader; - @Before + @BeforeEach public void setUp() { client = Mockito.mock(CloudWatchAsyncClient.class); uploader = new MetricUploader(client); diff --git a/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/task/UploadMetricsTasksTest.java b/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/task/UploadMetricsTasksTest.java index 619802355503..eb4d5825d057 100644 --- a/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/task/UploadMetricsTasksTest.java +++ b/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/task/UploadMetricsTasksTest.java @@ -19,8 +19,8 @@ import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import software.amazon.awssdk.metrics.publishers.cloudwatch.internal.MetricUploader; @@ -32,7 +32,7 @@ public class UploadMetricsTasksTest { private MetricUploader uploader; private UploadMetricsTasks task; - @Before + @BeforeEach public void setUp() { aggregator = Mockito.mock(MetricCollectionAggregator.class); uploader = Mockito.mock(MetricUploader.class); diff --git a/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/transform/MetricCollectionAggregatorTest.java b/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/transform/MetricCollectionAggregatorTest.java index e2d537853811..68857c62f085 100644 --- a/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/transform/MetricCollectionAggregatorTest.java +++ b/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/internal/transform/MetricCollectionAggregatorTest.java @@ -17,6 +17,7 @@ import static java.time.temporal.ChronoUnit.HOURS; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.fail; import java.time.Duration; import java.time.Instant; @@ -26,8 +27,7 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.metrics.CoreMetric; import software.amazon.awssdk.http.HttpMetric; import software.amazon.awssdk.metrics.MetricCategory; @@ -329,7 +329,7 @@ public void detailedMetricsAreCorrect() { assertThat(count).isEqualTo(2.0); break; default: - Assert.fail(); + fail(); } } }); diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeDocumentationConfigurationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeDocumentationConfigurationTest.java index 5111d8792d62..f5ab69193132 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeDocumentationConfigurationTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeDocumentationConfigurationTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class EnhancedTypeDocumentationConfigurationTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeTest.java index 76bda6417c76..a8732a15aba4 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/EnhancedTypeTest.java @@ -28,7 +28,7 @@ import java.util.SortedMap; import java.util.SortedSet; import java.util.concurrent.ConcurrentMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema; public class EnhancedTypeTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java index 055654c8fa6c..da6343d56fbb 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ExpressionTest.java @@ -15,15 +15,15 @@ package software.amazon.awssdk.enhanced.dynamodb; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import java.util.Collections; import java.util.HashMap; import java.util.Map; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/KeyTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/KeyTest.java index 885302926417..ec47e04cec69 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/KeyTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/KeyTest.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItemWithIndices; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/NestedAttributeNameTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/NestedAttributeNameTest.java index c5144d16fbd7..6f62657c28e0 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/NestedAttributeNameTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/NestedAttributeNameTest.java @@ -3,9 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NestedAttributeNameTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ProjectionExpressionTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ProjectionExpressionTest.java index 95128b7ff775..968b7dfcedad 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ProjectionExpressionTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/ProjectionExpressionTest.java @@ -1,18 +1,16 @@ package software.amazon.awssdk.enhanced.dynamodb; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Test; -import software.amazon.awssdk.enhanced.dynamodb.internal.ProjectionExpression; +import static org.assertj.core.api.Assertions.assertThat; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Optional; - -import static org.assertj.core.api.Assertions.assertThat; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.enhanced.dynamodb.internal.ProjectionExpression; public class ProjectionExpressionTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/TableSchemaTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/TableSchemaTest.java index d42296dfe110..d0ab3ad46c4a 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/TableSchemaTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/TableSchemaTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem; import software.amazon.awssdk.enhanced.dynamodb.mapper.BeanTableSchema; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/TypeConvertingVisitorTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/TypeConvertingVisitorTest.java index b0aae190a287..2c403b37ad7e 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/TypeConvertingVisitorTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/TypeConvertingVisitorTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BinaryAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BinaryAttributeConvertersTest.java index 14b36ca29f86..fa733b340f89 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BinaryAttributeConvertersTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BinaryAttributeConvertersTest.java @@ -21,14 +21,14 @@ import java.nio.ByteBuffer; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ByteArrayAttributeConverter; +import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ByteBufferAttributeConverter; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SdkBytesAttributeConverter; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.SetAttributeConverter; -import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ByteBufferAttributeConverter; public class BinaryAttributeConvertersTest { @Test diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BooleanAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BooleanAttributeConvertersTest.java index 75c6d2a953e6..a3974e3ee4e7 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BooleanAttributeConvertersTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/BooleanAttributeConvertersTest.java @@ -22,7 +22,7 @@ import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.AtomicBooleanAttributeConverter; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.BooleanAttributeConverter; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/EnhancedAttributeValueTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/EnhancedAttributeValueTest.java index 07f669b96a8c..362d0c7b955a 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/EnhancedAttributeValueTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/EnhancedAttributeValueTest.java @@ -22,7 +22,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/InstantAsStringAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/InstantAsStringAttributeConvertersTest.java index 7abccac079fc..ddbff47377a5 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/InstantAsStringAttributeConvertersTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/InstantAsStringAttributeConvertersTest.java @@ -21,7 +21,7 @@ import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo; import java.time.Instant; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsStringAttributeConverter; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateAttributeConverterTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateAttributeConverterTest.java index ce4b4025464d..43e3170385a8 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateAttributeConverterTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateAttributeConverterTest.java @@ -6,7 +6,7 @@ import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo; import java.time.LocalDate; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalDateAttributeConverter; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateTimeAttributeConverterTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateTimeAttributeConverterTest.java index 70a68b74c97f..73e901ace7b4 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateTimeAttributeConverterTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalDateTimeAttributeConverterTest.java @@ -21,7 +21,7 @@ import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo; import java.time.LocalDateTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalDateTimeAttributeConverter; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalTimeAttributeConverterTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalTimeAttributeConverterTest.java index 584b8614841d..01d597c93acd 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalTimeAttributeConverterTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/LocalTimeAttributeConverterTest.java @@ -6,7 +6,7 @@ import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo; import java.time.LocalTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalTimeAttributeConverter; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/MonthDayAttributeConverterTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/MonthDayAttributeConverterTest.java index 7e972ae32a87..75760c9a363d 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/MonthDayAttributeConverterTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/MonthDayAttributeConverterTest.java @@ -6,7 +6,7 @@ import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformTo; import java.time.MonthDay; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.MonthDayAttributeConverter; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/NumberAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/NumberAttributeConvertersTest.java index d9ba57f5e15c..bfbbf0ca6081 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/NumberAttributeConvertersTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/NumberAttributeConvertersTest.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.AtomicIntegerAttributeConverter; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.AtomicLongAttributeConverter; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OffsetDateTimeAsStringAttributeConverterTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OffsetDateTimeAsStringAttributeConverterTest.java index d7839a99d948..9f4f972b59d4 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OffsetDateTimeAsStringAttributeConverterTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OffsetDateTimeAsStringAttributeConverterTest.java @@ -8,7 +8,7 @@ import java.time.Instant; import java.time.OffsetDateTime; import java.time.ZoneOffset; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OffsetDateTimeAsStringAttributeConverter; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OptionalAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OptionalAttributeConvertersTest.java index 31d1b2fb95d5..6f48a883005a 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OptionalAttributeConvertersTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/OptionalAttributeConvertersTest.java @@ -24,7 +24,7 @@ import java.util.OptionalDouble; import java.util.OptionalInt; import java.util.OptionalLong; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalDoubleAttributeConverter; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalIntAttributeConverter; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.OptionalLongAttributeConverter; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/StringAttributeConvertersTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/StringAttributeConvertersTest.java index 2a6f608c8ad5..3ee5b55326fe 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/StringAttributeConvertersTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/StringAttributeConvertersTest.java @@ -37,7 +37,7 @@ import java.time.ZoneOffset; import java.util.Set; import java.util.UUID; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType; import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/ZonedDateTimeAsStringAttributeConverterTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/ZonedDateTimeAsStringAttributeConverterTest.java index 3f44c03e2824..daf585bb4081 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/ZonedDateTimeAsStringAttributeConverterTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/ZonedDateTimeAsStringAttributeConverterTest.java @@ -11,7 +11,7 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.temporal.ChronoUnit; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnhancedAttributeValue; import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ZonedDateTimeAsStringAttributeConverter; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AnnotatedImmutableTableSchemaTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AnnotatedImmutableTableSchemaTest.java index 998f13998280..772f42936412 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AnnotatedImmutableTableSchemaTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AnnotatedImmutableTableSchemaTest.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; @@ -33,7 +33,7 @@ public class AnnotatedImmutableTableSchemaTest extends LocalDynamoDbSyncTestBase .dynamoDbClient(getDynamoDbClient()) .build(); - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName(TABLE_NAME)) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicControlPlaneTableOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicControlPlaneTableOperationTest.java index d9060ccdfb89..b00b882aace7 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicControlPlaneTableOperationTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicControlPlaneTableOperationTest.java @@ -20,9 +20,9 @@ import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey; import java.util.Objects; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; @@ -53,7 +53,7 @@ public class AsyncBasicControlPlaneTableOperationTest extends LocalDynamoDbAsync private final DynamoDbAsyncTable asyncMappedTable = enhancedAsyncClient.table(tableName, TABLE_SCHEMA); - @Before + @BeforeEach public void createTable() { asyncMappedTable.createTable( CreateTableEnhancedRequest.builder() @@ -62,7 +62,7 @@ public void createTable() { getDynamoDbAsyncClient().waiter().waitUntilTableExists(b -> b.tableName(tableName)).join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(tableName) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicCrudTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicCrudTest.java index 7901f42fe594..ee3a7a172f70 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicCrudTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicCrudTest.java @@ -27,10 +27,10 @@ import java.util.Objects; import java.util.concurrent.CompletionException; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; @@ -219,7 +219,7 @@ public int hashCode() { @Rule public ExpectedException exception = ExpectedException.none(); - @Before + @BeforeEach public void createTable() { mappedTable.createTable( @@ -233,7 +233,7 @@ public void createTable() { .join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicQueryTest.java index b7fe4c041801..32330162c59c 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicQueryTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicQueryTest.java @@ -32,9 +32,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.async.SdkPublisher; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; @@ -129,12 +129,12 @@ private void insertRecords() { RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)).join()); } - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicScanTest.java index e69ff876e4ad..23920a256c0e 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicScanTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBasicScanTest.java @@ -31,9 +31,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.async.SdkPublisher; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; @@ -113,12 +113,12 @@ private void insertRecords() { RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)).join()); } - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchGetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchGetItemTest.java index 3c90d04562da..d48b3a54ae7d 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchGetItemTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchGetItemTest.java @@ -24,9 +24,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.async.SdkPublisher; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; @@ -130,13 +130,13 @@ public int hashCode() { .mapToObj(i -> new Record2().setId(i)) .collect(Collectors.toList()); - @Before + @BeforeEach public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchWriteItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchWriteItemTest.java index bcc703e803c7..f0a72ce1c83c 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchWriteItemTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncBatchWriteItemTest.java @@ -26,9 +26,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; @@ -158,13 +158,13 @@ public int hashCode() { .mapToObj(i -> new Record2().setId(i).setAttribute(Integer.toString(i))) .collect(Collectors.toList()); - @Before + @BeforeEach public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexQueryTest.java index 0a53549e6f62..6f659d16b569 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexQueryTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexQueryTest.java @@ -33,9 +33,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.async.SdkPublisher; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncIndex; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; @@ -178,7 +178,7 @@ private void insertRecords() { RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)).join()); } - @Before + @BeforeEach public void createTable() { mappedTable.createTable( CreateTableEnhancedRequest.builder() @@ -192,7 +192,7 @@ public void createTable() { .join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexScanTest.java index 9de11ea5c0fd..537aa2f401eb 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexScanTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncIndexScanTest.java @@ -33,9 +33,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.async.SdkPublisher; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncIndex; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; @@ -177,7 +177,7 @@ private void insertRecords() { RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record)).join()); } - @Before + @BeforeEach public void createTable() { mappedTable.createTable( r -> r.provisionedThroughput(getDefaultProvisionedThroughput()) @@ -189,7 +189,7 @@ public void createTable() { .join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactGetItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactGetItemsTest.java index 18c2466cddab..70a20cede793 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactGetItemsTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactGetItemsTest.java @@ -24,9 +24,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.Document; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; @@ -128,13 +128,13 @@ public int hashCode() { .mapToObj(i -> new Record2().setId(i)) .collect(Collectors.toList()); - @Before + @BeforeEach public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactWriteItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactWriteItemsTest.java index 6a1348fd1cf2..bc95d963857e 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactWriteItemsTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncTransactWriteItemsTest.java @@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue; import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey; @@ -29,9 +29,9 @@ import java.util.concurrent.CompletionException; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; import software.amazon.awssdk.enhanced.dynamodb.Expression; @@ -163,13 +163,13 @@ public int hashCode() { .mapToObj(i -> new Record2().setId(i).setAttribute(Integer.toString(i))) .collect(Collectors.toList()); - @Before + @BeforeEach public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncUpdateItemWithResponseTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncUpdateItemWithResponseTest.java index 6e4f5103d0f3..3f44b7e86f8d 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncUpdateItemWithResponseTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AsyncUpdateItemWithResponseTest.java @@ -19,9 +19,9 @@ import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey; import java.util.Objects; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; @@ -87,7 +87,7 @@ public int hashCode() { private DynamoDbAsyncTable mappedTable1; - @Before + @BeforeEach public void createTable() { enhancedClient = DynamoDbEnhancedAsyncClient.builder() .dynamoDbClient(getDynamoDbAsyncClient()) @@ -98,7 +98,7 @@ public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AutoGeneratedTimestampRecordTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AutoGeneratedTimestampRecordTest.java index d682fb4181e0..62f26b1fbcc1 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AutoGeneratedTimestampRecordTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/AutoGeneratedTimestampRecordTest.java @@ -32,10 +32,10 @@ import java.util.Objects; import java.util.UUID; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; @@ -45,8 +45,8 @@ import software.amazon.awssdk.enhanced.dynamodb.TableMetadata; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; import software.amazon.awssdk.enhanced.dynamodb.converters.EpochMillisFormatTestConverter; -import software.amazon.awssdk.enhanced.dynamodb.extensions.AutoGeneratedTimestampRecordExtension; import software.amazon.awssdk.enhanced.dynamodb.converters.TimeFormatUpdateTestConverter; +import software.amazon.awssdk.enhanced.dynamodb.extensions.AutoGeneratedTimestampRecordExtension; import software.amazon.awssdk.enhanced.dynamodb.internal.extensions.DefaultDynamoDbExtensionContext; import software.amazon.awssdk.enhanced.dynamodb.internal.operations.DefaultOperationContext; import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema; @@ -135,13 +135,13 @@ public static Record createUniqueFakeItem() { return record; } - @Before + @BeforeEach public void createTable() { Mockito.when(mockCLock.instant()).thenReturn(MOCKED_INSTANT_NOW); mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicControlPlaneTableOperationTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicControlPlaneTableOperationTest.java index 42b380fa2a1d..0bb48f292c70 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicControlPlaneTableOperationTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicControlPlaneTableOperationTest.java @@ -20,9 +20,9 @@ import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey; import java.util.Objects; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; @@ -53,7 +53,7 @@ public class BasicControlPlaneTableOperationTest extends LocalDynamoDbSyncTestBa private final DynamoDbTable mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA); - @Before + @BeforeEach public void createTable() { mappedTable.createTable( CreateTableEnhancedRequest.builder() @@ -62,7 +62,7 @@ public void createTable() { getDynamoDbClient().waiter().waitUntilTableExists(b -> b.tableName(tableName)); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(tableName) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicCrudTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicCrudTest.java index 205d9ec86fe2..8f727ced5af2 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicCrudTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicCrudTest.java @@ -25,10 +25,10 @@ import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.secondarySortKey; import java.util.Objects; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; @@ -216,7 +216,7 @@ public int hashCode() { @Rule public ExpectedException exception = ExpectedException.none(); - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput()) .globalSecondaryIndices( @@ -227,7 +227,7 @@ public void createTable() { .build())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicQueryTest.java index b3fcf4ab4098..6de862f436a6 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicQueryTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicQueryTest.java @@ -28,20 +28,31 @@ import static software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional.keyEqualTo; import static software.amazon.awssdk.enhanced.dynamodb.model.QueryConditional.sortBetween; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.pagination.sync.SdkIterable; -import software.amazon.awssdk.enhanced.dynamodb.*; +import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; +import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; +import software.amazon.awssdk.enhanced.dynamodb.Expression; +import software.amazon.awssdk.enhanced.dynamodb.Key; import software.amazon.awssdk.enhanced.dynamodb.NestedAttributeName; +import software.amazon.awssdk.enhanced.dynamodb.TableSchema; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.InnerAttributeRecord; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.NestedTestRecord; import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema; -import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable; import software.amazon.awssdk.enhanced.dynamodb.model.Page; +import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable; import software.amazon.awssdk.enhanced.dynamodb.model.QueryEnhancedRequest; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; @@ -150,14 +161,14 @@ private void insertNestedRecords() { NESTED_TEST_RECORDS.forEach(nestedTestRecord -> mappedNestedTable.putItem(r -> r.item(nestedTestRecord))); } - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); mappedNestedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicScanTest.java index b11666510d3c..3181dbfad9a2 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicScanTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BasicScanTest.java @@ -17,20 +17,34 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.numberValue; import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue; import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey; import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.pagination.sync.SdkIterable; -import software.amazon.awssdk.enhanced.dynamodb.*; +import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; +import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; +import software.amazon.awssdk.enhanced.dynamodb.Expression; +import software.amazon.awssdk.enhanced.dynamodb.NestedAttributeName; +import software.amazon.awssdk.enhanced.dynamodb.TableSchema; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.InnerAttributeRecord; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.NestedTestRecord; import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema; @@ -129,14 +143,14 @@ private void insertNestedRecords() { } - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); mappedNestedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchGetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchGetItemTest.java index 721739157e32..7bfe27be094d 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchGetItemTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchGetItemTest.java @@ -24,9 +24,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.pagination.sync.SdkIterable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; @@ -126,13 +126,13 @@ public int hashCode() { .mapToObj(i -> new Record2().setId(i)) .collect(Collectors.toList()); - @Before + @BeforeEach public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchWriteItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchWriteItemTest.java index 536c34fe8da1..05c1c15154db 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchWriteItemTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BatchWriteItemTest.java @@ -24,9 +24,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; @@ -151,13 +151,13 @@ public int hashCode() { .mapToObj(i -> new Record2().setId(i).setAttribute(Integer.toString(i))) .collect(Collectors.toList()); - @Before + @BeforeEach public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BeanTableSchemaRecursiveTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BeanTableSchemaRecursiveTest.java index e2919f9769c3..f2ffbe93614b 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BeanTableSchemaRecursiveTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/BeanTableSchemaRecursiveTest.java @@ -19,7 +19,7 @@ import java.util.Collections; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.RecursiveRecordBean; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.RecursiveRecordImmutable; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FailedConversionAsyncTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FailedConversionAsyncTest.java index 9cb864bc38aa..d13fa9c14594 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FailedConversionAsyncTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FailedConversionAsyncTest.java @@ -15,13 +15,15 @@ package software.amazon.awssdk.enhanced.dynamodb.functionaltests; -import java.util.Iterator; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import java.util.List; import java.util.concurrent.CompletionException; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedAsyncClient; @@ -34,9 +36,6 @@ import software.amazon.awssdk.enhanced.dynamodb.model.Page; import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - public class FailedConversionAsyncTest extends LocalDynamoDbAsyncTestBase { private static final TableSchema TABLE_SCHEMA = TableSchema.fromClass(FakeEnumRecord.class); private static final TableSchema SHORT_TABLE_SCHEMA = @@ -55,12 +54,12 @@ public class FailedConversionAsyncTest extends LocalDynamoDbAsyncTestBase { @Rule public ExpectedException exception = ExpectedException.none(); - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())).join(); } - @After + @AfterEach public void deleteTable() { getDynamoDbAsyncClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FailedConversionSyncTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FailedConversionSyncTest.java index db93471f8cba..3209cdc676a2 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FailedConversionSyncTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FailedConversionSyncTest.java @@ -15,11 +15,13 @@ package software.amazon.awssdk.enhanced.dynamodb.functionaltests; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import java.util.Iterator; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; @@ -29,11 +31,8 @@ import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeEnumRecord; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeEnumShortenedRecord; import software.amazon.awssdk.enhanced.dynamodb.model.Page; -import software.amazon.awssdk.enhanced.dynamodb.model.PageIterable; import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - public class FailedConversionSyncTest extends LocalDynamoDbSyncTestBase { private static final TableSchema TABLE_SCHEMA = TableSchema.fromClass(FakeEnumRecord.class); private static final TableSchema SHORT_TABLE_SCHEMA = @@ -51,12 +50,12 @@ public class FailedConversionSyncTest extends LocalDynamoDbSyncTestBase { @Rule public ExpectedException exception = ExpectedException.none(); - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenTest.java index 69e410ac08df..ad2b85abd3a9 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenTest.java @@ -20,13 +20,12 @@ import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey; import java.util.Objects; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; - import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema; import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; @@ -147,12 +146,12 @@ public int hashCode() { private DynamoDbTable mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA); - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenWithTagsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenWithTagsTest.java index 5cda96444073..bba96fec8af4 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenWithTagsTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/FlattenWithTagsTest.java @@ -21,10 +21,9 @@ import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primarySortKey; import java.util.Objects; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; @@ -149,12 +148,12 @@ public int hashCode() { private DynamoDbTable mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA); - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/ImmutableTableSchemaRecursiveTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/ImmutableTableSchemaRecursiveTest.java index 308f3f405e0f..532160d99d05 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/ImmutableTableSchemaRecursiveTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/ImmutableTableSchemaRecursiveTest.java @@ -19,7 +19,7 @@ import java.util.Collections; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.RecursiveRecordBean; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.RecursiveRecordImmutable; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexQueryTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexQueryTest.java index e82e340e90ac..754b7fa644ce 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexQueryTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexQueryTest.java @@ -34,9 +34,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbIndex; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; @@ -177,7 +177,7 @@ private void insertRecords() { RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record))); } - @Before + @BeforeEach public void createTable() { mappedTable.createTable( CreateTableEnhancedRequest.builder() @@ -191,7 +191,7 @@ public void createTable() { .build()); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexScanTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexScanTest.java index 9cc674ed489a..3e0e2d58fd7b 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexScanTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/IndexScanTest.java @@ -34,9 +34,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbIndex; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; @@ -175,7 +175,7 @@ private void insertRecords() { RECORDS.forEach(record -> mappedTable.putItem(r -> r.item(record))); } - @Before + @BeforeEach public void createTable() { mappedTable.createTable( r -> r.provisionedThroughput(getDefaultProvisionedThroughput()) @@ -187,7 +187,7 @@ public void createTable() { .build())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactGetItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactGetItemsTest.java index d5a12246dde2..02dfc9d98c30 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactGetItemsTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactGetItemsTest.java @@ -24,9 +24,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.Document; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; @@ -124,13 +124,13 @@ public int hashCode() { .mapToObj(i -> new Record2().setId(i)) .collect(Collectors.toList()); - @Before + @BeforeEach public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactWriteItemsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactWriteItemsTest.java index b3f7b510d3d8..ae583cad75db 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactWriteItemsTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/TransactWriteItemsTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues.stringValue; import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey; @@ -27,9 +27,9 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; import software.amazon.awssdk.enhanced.dynamodb.Expression; @@ -37,13 +37,10 @@ import software.amazon.awssdk.enhanced.dynamodb.TableSchema; import software.amazon.awssdk.enhanced.dynamodb.mapper.StaticTableSchema; import software.amazon.awssdk.enhanced.dynamodb.model.ConditionCheck; -import software.amazon.awssdk.enhanced.dynamodb.model.DeleteItemEnhancedRequest; import software.amazon.awssdk.enhanced.dynamodb.model.TransactDeleteItemEnhancedRequest; import software.amazon.awssdk.enhanced.dynamodb.model.TransactPutItemEnhancedRequest; -import software.amazon.awssdk.enhanced.dynamodb.model.TransactPutItemEnhancedRequestTest; import software.amazon.awssdk.enhanced.dynamodb.model.TransactUpdateItemEnhancedRequest; import software.amazon.awssdk.enhanced.dynamodb.model.TransactWriteItemsEnhancedRequest; -import software.amazon.awssdk.enhanced.dynamodb.model.UpdateItemEnhancedRequest; import software.amazon.awssdk.services.dynamodb.model.CancellationReason; import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest; import software.amazon.awssdk.services.dynamodb.model.ReturnValuesOnConditionCheckFailure; @@ -165,13 +162,13 @@ public int hashCode() { .mapToObj(i -> new Record2().setId(i).setAttribute(Integer.toString(i))) .collect(Collectors.toList()); - @Before + @BeforeEach public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); mappedTable2.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/UpdateBehaviorTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/UpdateBehaviorTest.java index ed693b66e702..838b87204610 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/UpdateBehaviorTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/UpdateBehaviorTest.java @@ -1,21 +1,20 @@ package software.amazon.awssdk.enhanced.dynamodb.functionaltests; +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.Instant; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; import software.amazon.awssdk.enhanced.dynamodb.extensions.AutoGeneratedTimestampRecordExtension; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.RecordWithUpdateBehaviors; - -import java.time.Instant; import software.amazon.awssdk.enhanced.dynamodb.internal.client.ExtensionResolver; -import static org.assertj.core.api.Assertions.assertThat; - public class UpdateBehaviorTest extends LocalDynamoDbSyncTestBase { private static final Instant INSTANT_1 = Instant.parse("2020-05-03T10:00:00Z"); private static final Instant INSTANT_2 = Instant.parse("2020-05-03T10:05:00Z"); @@ -33,12 +32,12 @@ public class UpdateBehaviorTest extends LocalDynamoDbSyncTestBase { private final DynamoDbTable mappedTable = enhancedClient.table(getConcreteTableName("table-name"), TABLE_SCHEMA); - @Before + @BeforeEach public void createTable() { mappedTable.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(r -> r.tableName(getConcreteTableName("table-name"))); } diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/UpdateItemWithResponseTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/UpdateItemWithResponseTest.java index c7557f7542b8..da11594a352c 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/UpdateItemWithResponseTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/functionaltests/UpdateItemWithResponseTest.java @@ -19,9 +19,9 @@ import static software.amazon.awssdk.enhanced.dynamodb.mapper.StaticAttributeTags.primaryPartitionKey; import java.util.Objects; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; @@ -87,7 +87,7 @@ public int hashCode() { private DynamoDbTable mappedTable1; - @Before + @BeforeEach public void createTable() { enhancedClient = DynamoDbEnhancedClient.builder() .dynamoDbClient(getDynamoDbClient()) @@ -98,7 +98,7 @@ public void createTable() { mappedTable1.createTable(r -> r.provisionedThroughput(getDefaultProvisionedThroughput())); } - @After + @AfterEach public void deleteTable() { getDynamoDbClient().deleteTable(DeleteTableRequest.builder() .tableName(getConcreteTableName("table-name-1")) diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptorTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptorTest.java index 087171a8d6ea..9f1539765c39 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptorTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/ApplyUserAgentInterceptorTest.java @@ -19,12 +19,11 @@ import java.util.List; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.RequestOverrideConfiguration; import software.amazon.awssdk.core.SdkField; import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; -import software.amazon.awssdk.core.util.VersionInfo; import software.amazon.awssdk.services.dynamodb.model.GetItemRequest; public class ApplyUserAgentInterceptorTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtilsTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtilsTest.java index adb51a92cdab..6f85a6019c57 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtilsTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/EnhancedClientUtilsTest.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.Key; import software.amazon.awssdk.enhanced.dynamodb.TableMetadata; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalAttributeValueConverterTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalAttributeValueConverterTest.java index 8cb798e71b7e..b7c9ee6d3abf 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalAttributeValueConverterTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/attribute/OptionalAttributeValueConverterTest.java @@ -15,7 +15,7 @@ package software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; public class OptionalAttributeValueConverterTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/DefaultDynamoDbExtensionContextTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/DefaultDynamoDbExtensionContextTest.java index 3befe2b6a56c..5d20d56e21d7 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/DefaultDynamoDbExtensionContextTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/extensions/DefaultDynamoDbExtensionContextTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.enhanced.dynamodb.internal.extensions; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; public class DefaultDynamoDbExtensionContextTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/immutable/ImmutableIntrospectorTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/immutable/ImmutableIntrospectorTest.java index 350467f4bc05..e59bfe2ae198 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/immutable/ImmutableIntrospectorTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/immutable/ImmutableIntrospectorTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbIgnore; import software.amazon.awssdk.enhanced.dynamodb.mapper.annotations.DynamoDbImmutable; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/MetaTableSchemaCacheTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/MetaTableSchemaCacheTest.java index cc191a7a7e1d..37e0592cce46 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/MetaTableSchemaCacheTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/mapper/MetaTableSchemaCacheTest.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.enhanced.dynamodb.functionaltests.models.FakeItem; public class MetaTableSchemaCacheTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DefaultOperationContextTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DefaultOperationContextTest.java index 8c37782e588e..ff0a42d66da8 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DefaultOperationContextTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/internal/operations/DefaultOperationContextTest.java @@ -15,11 +15,11 @@ package software.amazon.awssdk.enhanced.dynamodb.internal.operations; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.TableMetadata; public class DefaultOperationContextTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/ImmutableTableSchemaTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/ImmutableTableSchemaTest.java index 89f8a5ea76ee..3e97f4d4b660 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/ImmutableTableSchemaTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/ImmutableTableSchemaTest.java @@ -25,7 +25,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AbstractBean; import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.AbstractImmutable; import software.amazon.awssdk.enhanced.dynamodb.mapper.testbeans.DocumentImmutable; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaExtendTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaExtendTest.java index a540fbd8449a..818f25cf38f6 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaExtendTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaExtendTest.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaFlattenTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaFlattenTest.java index fde9d5db1259..bdf207c361cc 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaFlattenTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mapper/StaticImmutableTableSchemaFlattenTest.java @@ -23,7 +23,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.TableSchema; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/AsyncBatchGetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/AsyncBatchGetItemTest.java index be9fc8cd9210..91407f1ec1ef 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/AsyncBatchGetItemTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/AsyncBatchGetItemTest.java @@ -24,10 +24,10 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.util.List; -import org.junit.After; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.async.SdkPublisher; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbAsyncTable; @@ -48,7 +48,7 @@ public class AsyncBatchGetItemTest { @Rule public WireMockRule wireMock = new WireMockRule(0); - @Before + @BeforeEach public void setup() { DynamoDbAsyncClient dynamoDbClient = @@ -72,7 +72,7 @@ public void setup() { table = enhancedClient.table("table", tableSchema); } - @After + @AfterEach public void cleanup() { wireMock.resetAll(); } diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetItemTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetItemTest.java index 41dc56faa8fa..b765799f4313 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetItemTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/mocktests/BatchGetItemTest.java @@ -20,14 +20,14 @@ import static software.amazon.awssdk.enhanced.dynamodb.mocktests.BatchGetTestUtils.stubResponseWithUnprocessedKeys; import static software.amazon.awssdk.enhanced.dynamodb.mocktests.BatchGetTestUtils.stubSuccessfulResponse; +import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.util.Iterator; import java.util.List; -import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.util.stream.Collectors; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.pagination.sync.SdkIterable; import software.amazon.awssdk.enhanced.dynamodb.DynamoDbEnhancedClient; @@ -48,7 +48,7 @@ public class BatchGetItemTest { @Rule public WireMockRule wireMock = new WireMockRule(0); - @Before + @BeforeEach public void setup() { DynamoDbClient dynamoDbClient = diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedResponseTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedResponseTest.java index 7145c3a0a479..61402e415c12 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedResponseTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DeleteItemEnhancedResponseTest.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DescribeTableEnhancedResponseTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DescribeTableEnhancedResponseTest.java index 33bf8106d610..4d6e32018c81 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DescribeTableEnhancedResponseTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/DescribeTableEnhancedResponseTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DescribeTableEnhancedResponseTest { diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedResponseTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedResponseTest.java index e7f057d23126..4c59f400cda2 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedResponseTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/PutItemEnhancedResponseTest.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity; diff --git a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedResponseTest.java b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedResponseTest.java index 38a9726de008..06dce9078940 100644 --- a/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedResponseTest.java +++ b/services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/model/UpdateItemEnhancedResponseTest.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.enhanced.dynamodb.functionaltests.models.FakeItem; import software.amazon.awssdk.services.dynamodb.model.AttributeValue; import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedDirectoryUploadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedDirectoryUploadTest.java index 4d18abc06ce6..9e6d30d0df03 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedDirectoryUploadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedDirectoryUploadTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.transfer.s3; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CompletedDirectoryUploadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedDownloadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedDownloadTest.java index bfc90e8128cd..44fcc241c603 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedDownloadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedDownloadTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CompletedDownloadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedFileDownloadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedFileDownloadTest.java index 1ff2e059f891..6b2234d74178 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedFileDownloadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedFileDownloadTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CompletedFileDownloadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedFileUploadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedFileUploadTest.java index 807668c5012e..6900e08e9269 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedFileUploadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedFileUploadTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CompletedFileUploadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedUploadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedUploadTest.java index 7f3738de6c4a..d097f5d86328 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedUploadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/CompletedUploadTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CompletedUploadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/DownloadFileRequestTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/DownloadFileRequestTest.java index 7d59dfc43e78..557995162290 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/DownloadFileRequestTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/DownloadFileRequestTest.java @@ -22,7 +22,7 @@ import java.nio.file.Paths; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; public class DownloadFileRequestTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/DownloadRequestTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/DownloadRequestTest.java index a83e73347a77..2c434b9d3946 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/DownloadRequestTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/DownloadRequestTest.java @@ -19,7 +19,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.core.ResponseBytes; import software.amazon.awssdk.core.async.AsyncResponseTransformer; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/FailedFileUploadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/FailedFileUploadTest.java index 828e1e8ced40..d15df196701e 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/FailedFileUploadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/FailedFileUploadTest.java @@ -19,7 +19,7 @@ import java.nio.file.Paths; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.exception.SdkClientException; public class FailedFileUploadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/S3ClientConfigurationTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/S3ClientConfigurationTest.java index ec2a2b67de6e..a30b970f8b91 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/S3ClientConfigurationTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/S3ClientConfigurationTest.java @@ -20,7 +20,7 @@ import static software.amazon.awssdk.transfer.s3.SizeConstant.MB; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; import software.amazon.awssdk.regions.Region; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/S3TransferManagerOverrideConfigurationTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/S3TransferManagerOverrideConfigurationTest.java index 00fa560be571..b126e7944338 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/S3TransferManagerOverrideConfigurationTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/S3TransferManagerOverrideConfigurationTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.Executor; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; public class S3TransferManagerOverrideConfigurationTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadDirectoryOverrideConfigurationTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadDirectoryOverrideConfigurationTest.java index 09a8fa590867..c900aff1e722 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadDirectoryOverrideConfigurationTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadDirectoryOverrideConfigurationTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UploadDirectoryOverrideConfigurationTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadDirectoryRequestTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadDirectoryRequestTest.java index 896bfc8d67f7..ad973444de5d 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadDirectoryRequestTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadDirectoryRequestTest.java @@ -19,7 +19,7 @@ import java.nio.file.Paths; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UploadDirectoryRequestTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadFileRequestTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadFileRequestTest.java index 6fea04afe0b0..1b08a6627994 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadFileRequestTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadFileRequestTest.java @@ -22,7 +22,7 @@ import java.nio.file.Paths; import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.services.s3.model.PutObjectRequest; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadRequestTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadRequestTest.java index 5fc97c2c8312..f86c6aee4b86 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadRequestTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/UploadRequestTest.java @@ -19,7 +19,7 @@ import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.core.async.AsyncRequestBody; import software.amazon.awssdk.services.s3.model.PutObjectRequest; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/CrtCredentialProviderAdapterTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/CrtCredentialProviderAdapterTest.java index b3769c02b383..72a1d97db426 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/CrtCredentialProviderAdapterTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/CrtCredentialProviderAdapterTest.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.when; import java.nio.charset.StandardCharsets; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentials; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultDirectoryUploadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultDirectoryUploadTest.java index 2690a2fdb14c..91018de30119 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultDirectoryUploadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultDirectoryUploadTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.transfer.s3.internal; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.transfer.s3.UploadRequest; public class DefaultDirectoryUploadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultDownloadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultDownloadTest.java index 4d5889e9bb2a..cb9b7ff44112 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultDownloadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultDownloadTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.transfer.s3.internal; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultDownloadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultFileDownloadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultFileDownloadTest.java index a07cb6a26cb1..be96e0b8bd0a 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultFileDownloadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultFileDownloadTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.transfer.s3.internal; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultFileDownloadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultFileUploadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultFileUploadTest.java index c0f36785482d..a694ef8b3a83 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultFileUploadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultFileUploadTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.transfer.s3.internal; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultFileUploadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultTransferProgressSnapshotTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultTransferProgressSnapshotTest.java index 58713ca19e98..1d455d4e32c2 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultTransferProgressSnapshotTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultTransferProgressSnapshotTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.transfer.s3.internal.progress.DefaultTransferProgressSnapshot; import software.amazon.awssdk.transfer.s3.progress.TransferProgressSnapshot; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultUploadTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultUploadTest.java index b08cc523dcb3..084c058bdbe5 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultUploadTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/DefaultUploadTest.java @@ -16,7 +16,7 @@ package software.amazon.awssdk.transfer.s3.internal; import nl.jqno.equalsverifier.EqualsVerifier; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DefaultUploadTest { diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/RequestDataSupplierAdapterTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/RequestDataSupplierAdapterTest.java index b01cada9e1c6..ecd49477593a 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/RequestDataSupplierAdapterTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/RequestDataSupplierAdapterTest.java @@ -26,10 +26,9 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/ResponseHeadersHandlerTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/ResponseHeadersHandlerTest.java index 847517181623..fde79558b417 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/ResponseHeadersHandlerTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/ResponseHeadersHandlerTest.java @@ -19,14 +19,14 @@ import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.crt.http.HttpHeader; public class ResponseHeadersHandlerTest { private ResponseHeadersHandler handler; - @Before + @BeforeEach public void setUp() { handler = new ResponseHeadersHandler(); } diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3CrtDataPublisherTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3CrtDataPublisherTest.java index 28d2ac3ff1d1..9e5a0089d621 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3CrtDataPublisherTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3CrtDataPublisherTest.java @@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.lang3.RandomUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -36,7 +36,7 @@ public class S3CrtDataPublisherTest { private S3CrtDataPublisher dataPublisher; - @Before + @BeforeEach public void setup() { dataPublisher = new S3CrtDataPublisher(); } diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3CrtPojoConversionTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3CrtPojoConversionTest.java index fcea2c0810db..c690a74080e9 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3CrtPojoConversionTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3CrtPojoConversionTest.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Random; import org.apache.commons.lang3.RandomStringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.signer.AwsS3V4Signer; import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3TransferManagerListenerTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3TransferManagerListenerTest.java index 716e03b94560..dd5d0729b29f 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3TransferManagerListenerTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3TransferManagerListenerTest.java @@ -37,9 +37,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.ThreadLocalRandom; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.stubbing.Answer; import software.amazon.awssdk.core.ResponseBytes; @@ -68,7 +68,7 @@ public class S3TransferManagerListenerTest { private S3TransferManager tm; private long contentLength; - @Before + @BeforeEach public void methodSetup() { s3Crt = mock(S3CrtAsyncClient.class); tm = new DefaultS3TransferManager(s3Crt, mock(UploadDirectoryHelper.class), mock(TransferManagerConfiguration.class)); @@ -79,7 +79,7 @@ public void methodSetup() { .thenAnswer(randomGetResponseBody(contentLength)); } - @After + @AfterEach public void methodTeardown() { tm.close(); } diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3TransferManagerTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3TransferManagerTest.java index 86c61bcedf78..ea05989defd6 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3TransferManagerTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3TransferManagerTest.java @@ -24,9 +24,9 @@ import java.nio.file.Paths; import java.util.concurrent.CompletableFuture; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.ResponseBytes; import software.amazon.awssdk.core.async.AsyncRequestBody; import software.amazon.awssdk.core.async.AsyncResponseTransformer; @@ -49,7 +49,7 @@ public class S3TransferManagerTest { private UploadDirectoryHelper uploadDirectoryManager; private TransferManagerConfiguration configuration; - @Before + @BeforeEach public void methodSetup() { mockS3Crt = mock(S3CrtAsyncClient.class); uploadDirectoryManager = mock(UploadDirectoryHelper.class); @@ -57,7 +57,7 @@ public void methodSetup() { tm = new DefaultS3TransferManager(mockS3Crt, uploadDirectoryManager, configuration); } - @After + @AfterEach public void methodTeardown() { tm.close(); } diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/TransferManagerConfigurationTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/TransferManagerConfigurationTest.java index 443dd4539cfa..8f23a18a0ac5 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/TransferManagerConfigurationTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/TransferManagerConfigurationTest.java @@ -25,7 +25,7 @@ import java.nio.file.Paths; import java.util.concurrent.ExecutorService; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.transfer.s3.UploadDirectoryOverrideConfiguration; import software.amazon.awssdk.transfer.s3.UploadDirectoryRequest; diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/UploadDirectoryHelperTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/UploadDirectoryHelperTest.java index f1518978cacd..7722ae1e5618 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/UploadDirectoryHelperTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/UploadDirectoryHelperTest.java @@ -30,14 +30,12 @@ import java.util.List; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import java.util.function.Function; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.services.s3.model.PutObjectRequest; @@ -59,7 +57,7 @@ public class UploadDirectoryHelperTest { private Function singleUploadFunction; private UploadDirectoryHelper uploadDirectoryHelper; - @BeforeClass + @BeforeAll public static void setUp() throws IOException { jimfs = Jimfs.newFileSystem(); directory = jimfs.getPath("test"); @@ -68,12 +66,12 @@ public static void setUp() throws IOException { Files.createFile(jimfs.getPath("test/2")); } - @AfterClass + @AfterAll public static void tearDown() throws IOException { jimfs.close(); } - @Before + @BeforeEach public void methodSetup() { singleUploadFunction = mock(Function.class); uploadDirectoryHelper = new UploadDirectoryHelper(TransferManagerConfiguration.builder().build(), singleUploadFunction); @@ -105,8 +103,7 @@ public void uploadDirectory_cancel_shouldCancelAllFutures() { } @Test - public void uploadDirectory_allUploadsSucceed_failedUploadsShouldBeEmpty() throws ExecutionException, InterruptedException, - TimeoutException { + public void uploadDirectory_allUploadsSucceed_failedUploadsShouldBeEmpty() throws Exception { PutObjectResponse putObjectResponse = PutObjectResponse.builder().eTag("1234").build(); CompletedFileUpload completedFileUpload = CompletedFileUpload.builder().response(putObjectResponse).build(); CompletableFuture successfulFuture = new CompletableFuture<>(); @@ -134,8 +131,7 @@ public void uploadDirectory_allUploadsSucceed_failedUploadsShouldBeEmpty() throw } @Test - public void uploadDirectory_partialSuccess_shouldProvideFailedUploads() throws ExecutionException, InterruptedException, - TimeoutException { + public void uploadDirectory_partialSuccess_shouldProvideFailedUploads() throws Exception { PutObjectResponse putObjectResponse = PutObjectResponse.builder().eTag("1234").build(); CompletedFileUpload completedFileUpload = CompletedFileUpload.builder().response(putObjectResponse).build(); CompletableFuture successfulFuture = new CompletableFuture<>(); diff --git a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/progress/LoggingTransferListenerTest.java b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/progress/LoggingTransferListenerTest.java index 2ea46b74fe85..aa135c8b9a42 100644 --- a/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/progress/LoggingTransferListenerTest.java +++ b/services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/progress/LoggingTransferListenerTest.java @@ -21,8 +21,8 @@ import java.util.List; import org.apache.log4j.Level; import org.apache.log4j.spi.LoggingEvent; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.testutils.LogCaptor; import software.amazon.awssdk.transfer.s3.CompletedObjectTransfer; import software.amazon.awssdk.transfer.s3.TransferObjectRequest; @@ -38,7 +38,7 @@ public class LoggingTransferListenerTest { private TransferListenerContext context; private LoggingTransferListener listener; - @Before + @BeforeEach public void setUp() throws Exception { TransferProgressSnapshot snapshot = DefaultTransferProgressSnapshot.builder() .transferSizeInBytes(TRANSFER_SIZE_IN_BYTES) diff --git a/services/cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain/SearchRequestUnitTest.java b/services/cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain/SearchRequestUnitTest.java index b1dd78002dbf..fce26845af6b 100644 --- a/services/cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain/SearchRequestUnitTest.java +++ b/services/cloudsearchdomain/src/test/java/software/amazon/awssdk/cloudsearchdomain/SearchRequestUnitTest.java @@ -28,9 +28,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.io.IOException; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -48,7 +48,7 @@ public class SearchRequestUnitTest { private CloudSearchDomainClient searchClient; - @Before + @BeforeEach public void testSetup() { searchClient = CloudSearchDomainClient.builder() .credentialsProvider(StaticCredentialsProvider.create(CREDENTIALS)) diff --git a/services/docdb/src/test/java/software/amazon/awssdk/services/docdb/internal/PresignRequestHandlerTest.java b/services/docdb/src/test/java/software/amazon/awssdk/services/docdb/internal/PresignRequestHandlerTest.java index 1b240bdf446b..4ffb5f70142f 100644 --- a/services/docdb/src/test/java/software/amazon/awssdk/services/docdb/internal/PresignRequestHandlerTest.java +++ b/services/docdb/src/test/java/software/amazon/awssdk/services/docdb/internal/PresignRequestHandlerTest.java @@ -15,11 +15,11 @@ package software.amazon.awssdk.services.docdb.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; import java.net.URI; @@ -28,8 +28,7 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.TimeZone; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute; diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicyTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicyTest.java index e712db0c02fd..c99de392ed52 100644 --- a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicyTest.java +++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/DynamoDbRetryPolicyTest.java @@ -3,9 +3,9 @@ import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkSystemSetting; import software.amazon.awssdk.core.client.config.SdkClientConfiguration; import software.amazon.awssdk.core.retry.RetryPolicy; @@ -17,12 +17,12 @@ public class DynamoDbRetryPolicyTest { private EnvironmentVariableHelper environmentVariableHelper; - @Before + @BeforeEach public void setup() { environmentVariableHelper = new EnvironmentVariableHelper(); } - @After + @AfterEach public void reset() { environmentVariableHelper.reset(); } diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/EmptyAttributeTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/EmptyAttributeTest.java index eeee13ceeff7..91f73278f93d 100644 --- a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/EmptyAttributeTest.java +++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/EmptyAttributeTest.java @@ -27,9 +27,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.util.Collections; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.SdkBytes; @@ -54,7 +54,7 @@ public class EmptyAttributeTest { private DynamoDbStreamsClient dynamoDbStreamsClient; private DynamoDbStreamsAsyncClient dynamoDbStreamsAsyncClient; - @Before + @BeforeEach public void setup() { dynamoDbClient = DynamoDbClient.builder() diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/GlobalRequestHandlerTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/GlobalRequestHandlerTest.java index e9a05226f543..cb2dff6e2152 100644 --- a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/GlobalRequestHandlerTest.java +++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/GlobalRequestHandlerTest.java @@ -15,11 +15,11 @@ package software.amazon.awssdk.services.dynamodb; -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.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.exception.SdkException; @@ -29,7 +29,7 @@ public class GlobalRequestHandlerTest { - @Before + @BeforeEach public void setup() { TestGlobalExecutionInterceptor.reset(); } diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PaginatorInUserAgentTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PaginatorInUserAgentTest.java index 3e5ce2ea94ca..f605e640bfd2 100644 --- a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PaginatorInUserAgentTest.java +++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PaginatorInUserAgentTest.java @@ -26,9 +26,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.io.IOException; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.util.VersionInfo; @@ -43,7 +43,7 @@ public class PaginatorInUserAgentTest { private DynamoDbClient dynamoDbClient; private DynamoDbAsyncClient dynamoDbAsyncClient; - @Before + @BeforeEach public void setup() { dynamoDbClient = DynamoDbClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("test", diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PutItemRequestMarshallerTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PutItemRequestMarshallerTest.java index ef288dfa569d..70b65c2c9b52 100644 --- a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PutItemRequestMarshallerTest.java +++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/PutItemRequestMarshallerTest.java @@ -15,14 +15,14 @@ package software.amazon.awssdk.services.dynamodb; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.nio.ByteBuffer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.core.client.config.SdkClientConfiguration; import software.amazon.awssdk.core.client.config.SdkClientOption; diff --git a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/WaitersUserAgentTest.java b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/WaitersUserAgentTest.java index 5f59cd8e2ada..a1da587a91aa 100644 --- a/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/WaitersUserAgentTest.java +++ b/services/dynamodb/src/test/java/software/amazon/awssdk/services/dynamodb/WaitersUserAgentTest.java @@ -21,16 +21,15 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.times; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.github.tomakehurst.wiremock.common.ConsoleNotifier; import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.util.concurrent.CompletableFuture; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Matchers; import org.mockito.Mockito; @@ -55,7 +54,7 @@ public class WaitersUserAgentTest { private DynamoDbAsyncClient dynamoDbAsyncClient; private ExecutionInterceptor interceptor; - @Before + @BeforeEach public void setup() { interceptor = Mockito.spy(AbstractExecutionInterceptor.class); diff --git a/services/dynamodb/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java b/services/dynamodb/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java index 79cc0f82214a..d1c20e11ffb9 100644 --- a/services/dynamodb/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java +++ b/services/dynamodb/src/test/java/utils/resources/ResourceCentricBlockJUnit4ClassRunner.java @@ -17,7 +17,7 @@ import java.util.HashSet; import java.util.Set; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; import org.junit.runner.Description; import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunNotifier; @@ -62,7 +62,7 @@ private static TestResource createResourceInstance(RequiredResource resourceAnno @Override protected void runChild(final FrameworkMethod method, RunNotifier notifier) { Description description = describeChild(method); - if (method.getAnnotation(Ignore.class) != null) { + if (method.getAnnotation(Disabled.class) != null) { notifier.fireTestIgnored(description); } else { RequiredResources annotation = method.getAnnotation(RequiredResources.class); diff --git a/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/AccountIdDefaultValueTest.java b/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/AccountIdDefaultValueTest.java index ae90ad624162..32161657544e 100644 --- a/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/AccountIdDefaultValueTest.java +++ b/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/AccountIdDefaultValueTest.java @@ -25,9 +25,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -43,7 +43,7 @@ public class AccountIdDefaultValueTest { private GlacierClient glacier; - @Before + @BeforeEach public void setup() { glacier = GlacierClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/UploadArchiveHeaderTest.java b/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/UploadArchiveHeaderTest.java index 6786273f3811..c8bcdc18d4b1 100644 --- a/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/UploadArchiveHeaderTest.java +++ b/services/glacier/src/test/java/software/amazon/awssdk/services/glacier/UploadArchiveHeaderTest.java @@ -29,13 +29,13 @@ import java.io.File; import java.io.IOException; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.core.internal.util.Mimetype; +import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.glacier.model.UploadArchiveRequest; import software.amazon.awssdk.testutils.RandomTempFile; @@ -49,7 +49,7 @@ public class UploadArchiveHeaderTest { private UploadArchiveRequest request; - @Before + @BeforeEach public void setup() { glacier = GlacierClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/services/inspector/src/test/java/software/amazon/awssdk/services/inspector/InspectorErrorUnmarshallingTest.java b/services/inspector/src/test/java/software/amazon/awssdk/services/inspector/InspectorErrorUnmarshallingTest.java index 9425629b2084..8928933dab81 100644 --- a/services/inspector/src/test/java/software/amazon/awssdk/services/inspector/InspectorErrorUnmarshallingTest.java +++ b/services/inspector/src/test/java/software/amazon/awssdk/services/inspector/InspectorErrorUnmarshallingTest.java @@ -32,13 +32,13 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.exception.SdkServiceException; @@ -53,7 +53,7 @@ public class InspectorErrorUnmarshallingTest { private InspectorClient inspector; - @Before + @BeforeEach public void setup() { StaticCredentialsProvider credsProvider = StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid")); inspector = InspectorClient.builder() diff --git a/services/neptune/src/test/java/software/amazon/awssdk/services/neptune/internal/PresignRequestHandlerTest.java b/services/neptune/src/test/java/software/amazon/awssdk/services/neptune/internal/PresignRequestHandlerTest.java index 7f37b545ab99..9ed640a617f4 100644 --- a/services/neptune/src/test/java/software/amazon/awssdk/services/neptune/internal/PresignRequestHandlerTest.java +++ b/services/neptune/src/test/java/software/amazon/awssdk/services/neptune/internal/PresignRequestHandlerTest.java @@ -15,7 +15,20 @@ package software.amazon.awssdk.services.neptune.internal; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + +import java.net.URI; +import java.net.URISyntaxException; +import java.time.Clock; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.TimeZone; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute; @@ -33,16 +46,6 @@ import software.amazon.awssdk.services.neptune.model.NeptuneRequest; import software.amazon.awssdk.services.neptune.transform.CopyDbClusterSnapshotRequestMarshaller; -import java.net.URI; -import java.net.URISyntaxException; -import java.time.Clock; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.TimeZone; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.when; - /** * Unit Tests for {@link RdsPresignInterceptor} */ diff --git a/services/pinpoint/src/it/java/software/amazon/awssdk/services/pinpoint/PinpointIntegTest.java b/services/pinpoint/src/it/java/software/amazon/awssdk/services/pinpoint/PinpointIntegTest.java index 93f58481d7e3..c516b414ae86 100644 --- a/services/pinpoint/src/it/java/software/amazon/awssdk/services/pinpoint/PinpointIntegTest.java +++ b/services/pinpoint/src/it/java/software/amazon/awssdk/services/pinpoint/PinpointIntegTest.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.testutils.service.AwsTestBase; import software.amazon.awssdk.utils.builder.SdkBuilder; @@ -27,7 +27,7 @@ public class PinpointIntegTest extends AwsTestBase { protected static PinpointAsyncClient pinpointAsyncClient; - @BeforeClass + @BeforeAll public static void setup() { pinpointAsyncClient = PinpointAsyncClient.builder() .region(Region.US_WEST_2) diff --git a/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerTest.java b/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerTest.java index 2f61853c7f72..f5a17a07b9bd 100644 --- a/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerTest.java +++ b/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/DefaultPollyPresignerTest.java @@ -18,13 +18,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; + import java.io.Closeable; import java.io.IOException; import java.net.URI; import java.net.URL; import java.time.Duration; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; @@ -49,7 +50,7 @@ public class DefaultPollyPresignerTest { private AwsCredentialsProvider credentialsProvider; - @Before + @BeforeEach public void methodSetup() { credentialsProvider = StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid")); } diff --git a/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshallerTest.java b/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshallerTest.java index e03997fe4736..44246a558495 100644 --- a/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshallerTest.java +++ b/services/polly/src/test/java/software/amazon/awssdk/services/polly/internal/presigner/model/transform/SynthesizeSpeechRequestMarshallerTest.java @@ -16,12 +16,13 @@ package software.amazon.awssdk.services.polly.internal.presigner.model.transform; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.HashMap; import java.util.List; 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.core.SdkField; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; @@ -30,7 +31,7 @@ public class SynthesizeSpeechRequestMarshallerTest { private static Map properties; - @BeforeClass + @BeforeAll public static void setup() { properties = new HashMap<>(); diff --git a/services/rds/src/test/java/software/amazon/awssdk/services/rds/DefaultRdsUtilitiesTest.java b/services/rds/src/test/java/software/amazon/awssdk/services/rds/DefaultRdsUtilitiesTest.java index 125b899a6d4a..a8648196dadb 100644 --- a/services/rds/src/test/java/software/amazon/awssdk/services/rds/DefaultRdsUtilitiesTest.java +++ b/services/rds/src/test/java/software/amazon/awssdk/services/rds/DefaultRdsUtilitiesTest.java @@ -1,19 +1,18 @@ package software.amazon.awssdk.services.rds; -import org.junit.Test; -import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; -import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; -import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.regions.Region; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import java.time.Clock; import java.time.ZoneId; import java.time.ZonedDateTime; +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; +import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; +import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; +import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.rds.DefaultRdsUtilities.DefaultBuilder; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; - public class DefaultRdsUtilitiesTest { private final ZoneId utcZone = ZoneId.of("UTC").normalized(); private final Clock fixedClock = Clock.fixed(ZonedDateTime.of(2016, 11, 7, 17, 39, 33, 0, utcZone).toInstant(), utcZone); diff --git a/services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestHandlerTest.java b/services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestHandlerTest.java index d377ab633fb4..e79a81d0b003 100644 --- a/services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestHandlerTest.java +++ b/services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestHandlerTest.java @@ -15,11 +15,11 @@ package software.amazon.awssdk.services.rds.internal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; import java.net.URI; @@ -28,7 +28,7 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute; diff --git a/services/route53/src/test/java/software/amazon/awssdk/services/route53/QueryParamBindingTest.java b/services/route53/src/test/java/software/amazon/awssdk/services/route53/QueryParamBindingTest.java index 29813c77ea81..8c1cdda76b46 100644 --- a/services/route53/src/test/java/software/amazon/awssdk/services/route53/QueryParamBindingTest.java +++ b/services/route53/src/test/java/software/amazon/awssdk/services/route53/QueryParamBindingTest.java @@ -15,11 +15,12 @@ package software.amazon.awssdk.services.route53; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.net.URI; import java.util.List; import java.util.Map; -import junit.framework.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.client.config.SdkClientConfiguration; import software.amazon.awssdk.core.client.config.SdkClientOption; import software.amazon.awssdk.http.SdkHttpFullRequest; @@ -55,12 +56,12 @@ public void testReservedCharInParamValue() { .build(); SdkHttpFullRequest httpReq_List = new ListHealthChecksRequestMarshaller(PROTOCOL_FACTORY).marshall(listReq); - Assert.assertEquals("/2013-04-01/healthcheck", httpReq_List.encodedPath()); + assertEquals("/2013-04-01/healthcheck", httpReq_List.encodedPath()); Map> queryParams = httpReq_List.rawQueryParameters(); - Assert.assertEquals(2, queryParams.size()); - Assert.assertEquals(VALUE_WITH_SEMICOLON, queryParams.get("marker").get(0)); - Assert.assertEquals(VALUE_WITH_AMPERSAND, queryParams.get("maxitems").get(0)); + assertEquals(2, queryParams.size()); + assertEquals(VALUE_WITH_SEMICOLON, queryParams.get("marker").get(0)); + assertEquals(VALUE_WITH_AMPERSAND, queryParams.get("maxitems").get(0)); GetHealthCheckLastFailureReasonRequest getFailureReq = GetHealthCheckLastFailureReasonRequest.builder() .healthCheckId(VALUE_WITH_QUESTION_MARK) @@ -70,11 +71,11 @@ public void testReservedCharInParamValue() { new GetHealthCheckLastFailureReasonRequestMarshaller(PROTOCOL_FACTORY).marshall(getFailureReq); System.out.println(httpReq_GetFailure); // parameter value should be URL encoded - Assert.assertEquals( + assertEquals( "/2013-04-01/healthcheck/%3Fcharlie/lastfailurereason", httpReq_GetFailure.encodedPath()); queryParams = httpReq_GetFailure.rawQueryParameters(); - Assert.assertEquals(0, queryParams.size()); + assertEquals(0, queryParams.size()); } } diff --git a/services/route53/src/test/java/software/amazon/awssdk/services/route53/Route53InterceptorTest.java b/services/route53/src/test/java/software/amazon/awssdk/services/route53/Route53InterceptorTest.java index e58496a68397..558f2bd4155c 100644 --- a/services/route53/src/test/java/software/amazon/awssdk/services/route53/Route53InterceptorTest.java +++ b/services/route53/src/test/java/software/amazon/awssdk/services/route53/Route53InterceptorTest.java @@ -15,9 +15,9 @@ package software.amazon.awssdk.services.route53; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkResponse; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.core.interceptor.ExecutionInterceptor; @@ -25,9 +25,9 @@ import software.amazon.awssdk.services.route53.internal.Route53IdInterceptor; import software.amazon.awssdk.services.route53.model.ActivateKeySigningKeyResponse; import software.amazon.awssdk.services.route53.model.ChangeInfo; -import software.amazon.awssdk.services.route53.model.CreateKeySigningKeyResponse; import software.amazon.awssdk.services.route53.model.CreateHostedZoneRequest; import software.amazon.awssdk.services.route53.model.CreateHostedZoneResponse; +import software.amazon.awssdk.services.route53.model.CreateKeySigningKeyResponse; import software.amazon.awssdk.services.route53.model.CreateReusableDelegationSetResponse; import software.amazon.awssdk.services.route53.model.DeactivateKeySigningKeyResponse; import software.amazon.awssdk.services.route53.model.DelegationSet; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/AclTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/AclTest.java index bc558e57fae7..dfef76be09ec 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/AclTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/AclTest.java @@ -29,9 +29,9 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -55,7 +55,7 @@ public class AclTest { private S3Client s3Client; - @Before + @BeforeEach public void setup() { URI endpoint = URI.create("http://localhost:" + mockServer.port()); s3Client = S3Client.builder() diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/EndpointOverrideTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/EndpointOverrideTest.java index 0d58559d4e5d..b498900749be 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/EndpointOverrideTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/EndpointOverrideTest.java @@ -24,9 +24,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.io.IOException; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.async.AsyncResponseTransformer; @@ -41,7 +41,7 @@ public class EndpointOverrideTest { private S3AsyncClient s3AsyncClient; - @Before + @BeforeEach public void setup() { s3Client = S3Client.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/InvalidRegionTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/InvalidRegionTest.java index 029d6ef6c5d0..82d85eaab25c 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/InvalidRegionTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/InvalidRegionTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.regions.Region; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/MultipartUploadTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/MultipartUploadTest.java index 1c314ded4fc5..9de4c7e79a65 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/MultipartUploadTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/MultipartUploadTest.java @@ -28,9 +28,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -44,7 +44,7 @@ public class MultipartUploadTest { private S3AsyncClient s3AsyncClient; - @Before + @BeforeEach public void setup() { s3Client = S3Client.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3ConfigurationTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3ConfigurationTest.java index 608fd8c133d9..42f7e567f1c2 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3ConfigurationTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/S3ConfigurationTest.java @@ -20,15 +20,15 @@ import static software.amazon.awssdk.services.s3.S3SystemSetting.AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS; import static software.amazon.awssdk.services.s3.S3SystemSetting.AWS_S3_USE_ARN_REGION; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.testutils.EnvironmentVariableHelper; public class S3ConfigurationTest { private final EnvironmentVariableHelper helper = new EnvironmentVariableHelper(); - @After + @AfterEach public void clearSystemProperty() { System.clearProperty(AWS_S3_USE_ARN_REGION.property()); System.clearProperty(AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS.property()); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumResetsOnRetryTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumResetsOnRetryTest.java index 7977ca2d01c2..19e69663fb58 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumResetsOnRetryTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumResetsOnRetryTest.java @@ -24,8 +24,6 @@ import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder; import com.github.tomakehurst.wiremock.client.WireMock; -import com.github.tomakehurst.wiremock.common.ConsoleNotifier; -import com.github.tomakehurst.wiremock.common.Slf4jNotifier; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import com.github.tomakehurst.wiremock.junit.WireMockRule; import com.github.tomakehurst.wiremock.stubbing.Scenario; @@ -33,9 +31,9 @@ import java.nio.charset.StandardCharsets; import java.util.function.Consumer; import org.apache.commons.lang3.ArrayUtils; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.ResponseBytes; @@ -65,7 +63,7 @@ public class ChecksumResetsOnRetryTest { private String bodyEtag; - @Before + @BeforeEach public void setup() { StaticCredentialsProvider credentials = StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid")); s3Client = S3Client.builder() diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStreamTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStreamTest.java index a83bf45b4155..c759263b1f8b 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStreamTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingInputStreamTest.java @@ -15,15 +15,15 @@ package software.amazon.awssdk.services.s3.checksums; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.checksums.Md5Checksum; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.utils.IoUtils; @@ -35,7 +35,7 @@ public class ChecksumValidatingInputStreamTest { private static byte[] testData; private static byte[] testDataWithoutChecksum; - @BeforeClass + @BeforeAll public static void populateData() { testData = new byte[TEST_DATA_SIZE + CHECKSUM_SIZE]; for (int i = 0; i < TEST_DATA_SIZE; i++) { @@ -72,7 +72,7 @@ public void invalidChecksumFails() throws IOException { try { IoUtils.toByteArray(validatingInputStream); - Assert.fail("Corruption at byte " + i + " was not detected."); + fail("Corruption at byte " + i + " was not detected."); } catch (SdkClientException e) { // Expected } diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisherTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisherTest.java index 23027a2317fc..2e635974f243 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisherTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumValidatingPublisherTest.java @@ -15,10 +15,10 @@ package software.amazon.awssdk.services.s3.checksums; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,8 +27,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -44,7 +44,7 @@ public class ChecksumValidatingPublisherTest { private static byte[] testData; private static byte[] testDataWithoutChecksum; - @BeforeClass + @BeforeAll public static void populateData() { testData = new byte[TEST_DATA_SIZE + CHECKSUM_SIZE]; for (int i = 0; i < TEST_DATA_SIZE; i++) { diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidatorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidatorTest.java index b2e26e837ffa..25e30bc4e610 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidatorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/checksums/ChecksumsEnabledValidatorTest.java @@ -29,7 +29,7 @@ import static software.amazon.awssdk.services.s3.checksums.ChecksumsEnabledValidator.shouldRecordChecksum; import static software.amazon.awssdk.services.s3.model.ServerSideEncryption.AWS_KMS; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.ClientType; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.http.SdkHttpFullRequest; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/CompleteMultipartUploadFunctionalTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/CompleteMultipartUploadFunctionalTest.java index c9488c9ca634..4df2d1fa8afe 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/CompleteMultipartUploadFunctionalTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/CompleteMultipartUploadFunctionalTest.java @@ -22,16 +22,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.util.concurrent.CompletionException; - -import com.github.tomakehurst.wiremock.junit.WireMockRule; - import org.junit.Rule; -import org.junit.Test; - +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; -import software.amazon.awssdk.auth.credentials.AwsCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3AsyncClient; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java index 89870fab2758..cdc68bd57cb5 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java @@ -32,7 +32,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/GetBucketPolicyFunctionalTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/GetBucketPolicyFunctionalTest.java index 6933e8726648..ec6ef04ac748 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/GetBucketPolicyFunctionalTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/GetBucketPolicyFunctionalTest.java @@ -20,16 +20,11 @@ import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -import java.net.URI; -import java.util.concurrent.CompletionException; import com.github.tomakehurst.wiremock.junit.WireMockRule; - +import java.net.URI; import org.junit.Rule; -import org.junit.Test; - +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -37,9 +32,7 @@ import software.amazon.awssdk.services.s3.S3AsyncClientBuilder; import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.S3ClientBuilder; -import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadResponse; import software.amazon.awssdk.services.s3.model.GetBucketPolicyResponse; -import software.amazon.awssdk.services.s3.model.S3Exception; public class GetBucketPolicyFunctionalTest { private static final URI HTTP_LOCALHOST_URI = URI.create("http://localhost:8080/"); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/MultiRegionAccessPointSigningFunctionalTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/MultiRegionAccessPointSigningFunctionalTest.java index 77f1746ff2b9..08e5be5e094d 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/MultiRegionAccessPointSigningFunctionalTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/MultiRegionAccessPointSigningFunctionalTest.java @@ -22,8 +22,8 @@ import java.io.UnsupportedEncodingException; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.auth.signer.AwsS3V4Signer; @@ -51,7 +51,7 @@ public class MultiRegionAccessPointSigningFunctionalTest { private MockHttpClient mockHttpClient; - @Before + @BeforeEach public void setup() throws UnsupportedEncodingException { mockHttpClient = new MockSyncHttpClient(); mockHttpClient.stubNextResponse(mockListObjectsResponse()); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3AccessPointEndpointResolverTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3AccessPointEndpointResolverTest.java index bf42b27ef60c..549d2cafd514 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3AccessPointEndpointResolverTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3AccessPointEndpointResolverTest.java @@ -15,25 +15,24 @@ package software.amazon.awssdk.services.s3.internal.endpoints; -import org.junit.Before; -import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static software.amazon.awssdk.utils.http.SdkHttpUtils.urlEncode; + +import java.net.URI; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Configuration; import software.amazon.awssdk.services.s3.internal.ConfiguredS3SdkHttpRequest; import software.amazon.awssdk.services.s3.model.PutObjectRequest; import software.amazon.awssdk.services.s3.utils.InterceptorTestUtils; -import java.net.URI; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static software.amazon.awssdk.utils.http.SdkHttpUtils.urlEncode; - public class S3AccessPointEndpointResolverTest { S3AccessPointEndpointResolver endpointResolver; - @Before + @BeforeEach public void setUp() { endpointResolver = S3AccessPointEndpointResolver.create(); } diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3BucketEndpointResolverTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3BucketEndpointResolverTest.java index bde1afceacfb..bf58d2fc3f51 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3BucketEndpointResolverTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3BucketEndpointResolverTest.java @@ -18,19 +18,15 @@ import static org.assertj.core.api.Assertions.assertThat; import java.net.URI; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkRequest; -import software.amazon.awssdk.http.SdkHttpFullRequest; -import software.amazon.awssdk.http.SdkHttpMethod; -import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Configuration; import software.amazon.awssdk.services.s3.internal.ConfiguredS3SdkHttpRequest; import software.amazon.awssdk.services.s3.model.CreateBucketRequest; import software.amazon.awssdk.services.s3.model.DeleteBucketRequest; import software.amazon.awssdk.services.s3.model.ListBucketsRequest; -import software.amazon.awssdk.services.s3.model.ListObjectsV2Request; import software.amazon.awssdk.services.s3.model.PutObjectRequest; import software.amazon.awssdk.services.s3.utils.InterceptorTestUtils; @@ -38,7 +34,7 @@ public class S3BucketEndpointResolverTest { S3BucketEndpointResolver endpointResolver; - @Before + @BeforeEach public void setUp() throws Exception { endpointResolver = S3BucketEndpointResolver.create(); } diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContextTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContextTest.java index 33d145fa6cbb..d344e9b1d070 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContextTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverContextTest.java @@ -16,12 +16,10 @@ package software.amazon.awssdk.services.s3.internal.endpoints; import static org.assertj.core.api.Assertions.assertThat; -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.assertNull; import java.net.URI; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpMethod; import software.amazon.awssdk.regions.Region; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverFactoryTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverFactoryTest.java index fd994df2a822..7ef14deeace3 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverFactoryTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointResolverFactoryTest.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.services.s3.model.S3Request; import software.amazon.awssdk.services.s3.model.WriteGetObjectResponseRequest; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointUtilsTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointUtilsTest.java index 7638d473670b..73158192fb48 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointUtilsTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3EndpointUtilsTest.java @@ -16,11 +16,11 @@ package software.amazon.awssdk.services.s3.internal.endpoints; import static org.assertj.core.api.Assertions.assertThat; -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 java.net.URI; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpFullRequest; import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.services.s3.S3Configuration; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilderTest.java index e90ee736b93d..fe211c8b38c8 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilderTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointBuilderTest.java @@ -2,9 +2,10 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; + import java.net.URI; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; public class S3ObjectLambdaOperationEndpointBuilderTest { diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointResolverTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointResolverTest.java index 16689406db95..89d496bea189 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointResolverTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/S3ObjectLambdaOperationEndpointResolverTest.java @@ -17,14 +17,15 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; + import java.net.URI; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.SdkHttpMethod; import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.regions.Region; @@ -39,7 +40,7 @@ public class S3ObjectLambdaOperationEndpointResolverTest { private S3ObjectLambdaOperationEndpointResolver endpointResolver; - @Before + @BeforeEach public void setUp() { endpointResolver = S3ObjectLambdaOperationEndpointResolver.create(); } @@ -113,7 +114,7 @@ public void writeGetObjectResponse_endpointOverridden_shouldConvertEndpoint() { } @Test - @Ignore // TODO: Taken from the SEP but this test case is suspect. The SEP + @Disabled // TODO: Taken from the SEP but this test case is suspect. The SEP // expects s3-external-1 to be translated to the us-east-1 region for this // operation, which is weird. Currently, we do not do this. 's3-external-1' // doesn't exist in endpoints.json, so we use heuristics to get the @@ -131,7 +132,7 @@ public void writeGetObjectResponse_regionIsS3External_shouldConvertEndpoint() { } @Test - @Ignore // TODO: Taken from the SEP but this test case is suspect. The SEP + @Disabled // TODO: Taken from the SEP but this test case is suspect. The SEP // expects aws-global to be translated to the us-east-1 region for this // operation, which is weird. We do not do this; we lookup the endpoint // from the region metadata which maps aws-global => s3.amazonaws.com, so @@ -149,7 +150,7 @@ public void writeGetObjectResponse_regionIsAwsGlobal_shouldConvertEndpoint() { } @Test - @Ignore // SDK doesn't resolve fips endpoints correctly + @Disabled // SDK doesn't resolve fips endpoints correctly public void writeGetObjectResponse_regionIsFipsInPrefix_shouldConvertEndpoint() { String requestRoute = "route"; String region = "fips-us-gov-east-1"; @@ -163,7 +164,7 @@ public void writeGetObjectResponse_regionIsFipsInPrefix_shouldConvertEndpoint() } @Test - @Ignore // SDK doesn't resolve fips endpoints correctly + @Disabled // SDK doesn't resolve fips endpoints correctly public void writeGetObjectResponse_regionIsFipsInSuffix_shouldConvertEndpoint() { String requestRoute = "route"; String region = "us-gov-east-1-fips"; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptorTest.java index b8376597ca9f..2a7de50d0346 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/AsyncChecksumValidationInterceptorTest.java @@ -32,7 +32,7 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import software.amazon.awssdk.core.async.AsyncRequestBody; import software.amazon.awssdk.core.checksums.Md5Checksum; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptorTest.java index cf9f5014e351..005a6a81cc64 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateBucketInterceptorTest.java @@ -16,11 +16,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.awscore.AwsExecutionAttribute; import software.amazon.awssdk.core.SdkRequest; -import software.amazon.awssdk.core.async.AsyncRequestBody; -import software.amazon.awssdk.core.async.AsyncResponseTransformer; import software.amazon.awssdk.core.interceptor.Context; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.regions.Region; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptorTest.java index 586e62fa11e9..cbd72c123fbf 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CreateMultipartUploadRequestInterceptorTest.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.interceptor.Context; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.core.sync.RequestBody; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptorTest.java index 7f5a32dcae17..61b67af6ede2 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/DecodeUrlEncodedResponseInterceptorTest.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Optional; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.SdkResponse; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptorTest.java index 4f03921cbb69..335d5d364b59 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableChunkedEncodingInterceptorTest.java @@ -21,7 +21,7 @@ import java.net.URI; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.async.AsyncRequestBody; import software.amazon.awssdk.core.interceptor.Context; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptorTest.java index 400e20761b6f..039e8be2569e 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EnableTrailingChecksumInterceptorTest.java @@ -23,7 +23,7 @@ import static software.amazon.awssdk.services.s3.utils.InterceptorTestUtils.modifyHttpRequestContext; import static software.amazon.awssdk.services.s3.utils.InterceptorTestUtils.modifyResponseContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute; import software.amazon.awssdk.core.interceptor.Context; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptorTest.java index 04351a53e8bb..1de504477c36 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/EndpointAddressInterceptorTest.java @@ -24,10 +24,8 @@ import static software.amazon.awssdk.utils.http.SdkHttpUtils.urlEncode; import java.net.URI; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.interceptor.Context; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.http.SdkHttpRequest; @@ -50,7 +48,7 @@ public class EndpointAddressInterceptorTest { private EndpointAddressInterceptor interceptor; - @Before + @BeforeEach public void setUp() throws Exception { interceptor = new EndpointAddressInterceptor(); } diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptorTest.java index b93b6b26851c..4d291b26deaf 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/ExceptionTranslationInterceptorTest.java @@ -17,10 +17,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.awscore.exception.AwsErrorDetails; import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.interceptor.Context; @@ -39,7 +38,7 @@ public class ExceptionTranslationInterceptorTest { private static ExceptionTranslationInterceptor interceptor; - @BeforeClass + @BeforeAll public static void setup() { interceptor = new ExceptionTranslationInterceptor(); } diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptorTest.java index 95ee7178e58f..207b041a9fee 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/GetBucketPolicyInterceptorTest.java @@ -20,7 +20,7 @@ import java.io.InputStream; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.interceptor.Context; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.http.SdkHttpResponse; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectHeaderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectHeaderTest.java index 0203649a477c..15151910e59d 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectHeaderTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectHeaderTest.java @@ -32,9 +32,9 @@ import java.io.File; import java.io.IOException; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.internal.util.Mimetype; @@ -55,7 +55,7 @@ public class PutObjectHeaderTest { private PutObjectRequest putObjectRequest; - @Before + @BeforeEach public void setup() { s3Client = S3Client.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptorTest.java index 13bc671086b1..08dce580bc95 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/PutObjectInterceptorTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static software.amazon.awssdk.services.s3.utils.InterceptorTestUtils.modifyHttpRequestContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.interceptor.ExecutionAttributes; import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.services.s3.model.GetObjectRequest; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SignerOverrideInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SignerOverrideInterceptorTest.java index f258d69b8fc9..c80ecbac40c1 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SignerOverrideInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SignerOverrideInterceptorTest.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.signer.AwsS3V4Signer; import software.amazon.awssdk.authcrt.signer.internal.DefaultAwsCrtS3V4aSigner; import software.amazon.awssdk.core.SdkRequest; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptorTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptorTest.java index 90b779cdfd25..6145b1867863 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptorTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/SyncChecksumValidationInterceptorTest.java @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.checksums.Md5Checksum; import software.amazon.awssdk.core.checksums.SdkChecksum; import software.amazon.awssdk.core.interceptor.Context; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/MultiRegionAccessPointEndpointResolutionTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/MultiRegionAccessPointEndpointResolutionTest.java index 1fd0157e90d6..5e996a34f0c5 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/MultiRegionAccessPointEndpointResolutionTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/MultiRegionAccessPointEndpointResolutionTest.java @@ -20,8 +20,8 @@ import static software.amazon.awssdk.services.s3.S3MockUtils.mockListObjectsResponse; import java.net.URI; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.http.SdkHttpRequest; @@ -43,7 +43,7 @@ public class MultiRegionAccessPointEndpointResolutionTest { URI.create("https://mfzwi23gnjvgw.mrap.accesspoint.s3-global.amazonaws.com"); private MockHttpClient mockHttpClient; - @Before + @BeforeEach public void setup() { mockHttpClient = new MockSyncHttpClient(); } diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/OutpostAccessPointArnEndpointResolutionTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/OutpostAccessPointArnEndpointResolutionTest.java index af1a35e9bc73..c64b3106e7ef 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/OutpostAccessPointArnEndpointResolutionTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/OutpostAccessPointArnEndpointResolutionTest.java @@ -21,8 +21,8 @@ import static software.amazon.awssdk.services.s3.S3MockUtils.mockListObjectsResponse; import java.net.URI; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.signer.Signer; @@ -42,7 +42,7 @@ public class OutpostAccessPointArnEndpointResolutionTest { private MockSyncHttpClient mockHttpClient; private Signer mockSigner; - @Before + @BeforeEach public void setup() { mockHttpClient = new MockSyncHttpClient(); mockSigner = (request, executionAttributes) -> request; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilderTest.java index 5bfdf2ddbd19..f7afc2fdb106 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilderTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3AccessPointBuilderTest.java @@ -21,7 +21,7 @@ import java.net.URI; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; public class S3AccessPointBuilderTest { diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverterTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverterTest.java index e786dd1d527a..13d96cd81691 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverterTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnConverterTest.java @@ -20,11 +20,9 @@ import static org.hamcrest.Matchers.is; import java.util.Optional; - import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; - import software.amazon.awssdk.arns.Arn; public class S3ArnConverterTest { diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnUtilsTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnUtilsTest.java index b5159aa8bd35..416a3459f40c 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnUtilsTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ArnUtilsTest.java @@ -22,7 +22,7 @@ import java.util.Optional; import java.util.UUID; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.arns.Arn; import software.amazon.awssdk.arns.ArnResource; diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectLambdaEndpointResolutionTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectLambdaEndpointResolutionTest.java index d78200c9f128..37a54f879a6f 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectLambdaEndpointResolutionTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectLambdaEndpointResolutionTest.java @@ -21,8 +21,8 @@ import java.io.UnsupportedEncodingException; import java.net.URI; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.http.SdkHttpRequest; @@ -37,7 +37,7 @@ public class S3ObjectLambdaEndpointResolutionTest { private MockSyncHttpClient mockHttpClient; - @Before + @BeforeEach public void setup() throws UnsupportedEncodingException { mockHttpClient = new MockSyncHttpClient(); mockHttpClient.stubNextResponse(mockListObjectsResponse()); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectLambdaResourceTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectLambdaResourceTest.java index 12f972a20bb2..e608da723b7b 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectLambdaResourceTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectLambdaResourceTest.java @@ -16,13 +16,13 @@ package software.amazon.awssdk.services.s3.internal.resource; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; /** diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResourceTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResourceTest.java index 127488e831c7..ed60d71d3b44 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResourceTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/resource/S3ObjectResourceTest.java @@ -15,13 +15,12 @@ package software.amazon.awssdk.services.s3.internal.resource; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.Optional; - import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; public class S3ObjectResourceTest { diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/DisableMultiRegionProviderChainTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/DisableMultiRegionProviderChainTest.java index f4454dd3b2c7..f2cd9efb87ad 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/DisableMultiRegionProviderChainTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/DisableMultiRegionProviderChainTest.java @@ -20,14 +20,14 @@ import static software.amazon.awssdk.services.s3.S3SystemSetting.AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS; import java.util.Optional; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.testutils.EnvironmentVariableHelper; public class DisableMultiRegionProviderChainTest { private final EnvironmentVariableHelper helper = new EnvironmentVariableHelper(); - @After + @AfterEach public void clearSystemProperty() { System.clearProperty(AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS.property()); System.clearProperty(AWS_CONFIG_FILE.property()); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/ProfileDisableMultiRegionProviderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/ProfileDisableMultiRegionProviderTest.java index daa05abe58f8..5169ac9a11e4 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/ProfileDisableMultiRegionProviderTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/ProfileDisableMultiRegionProviderTest.java @@ -22,8 +22,8 @@ import static software.amazon.awssdk.profiles.ProfileFileSystemSetting.AWS_CONFIG_FILE; import java.util.Optional; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; @@ -38,7 +38,7 @@ public class ProfileDisableMultiRegionProviderTest { private ProfileDisableMultiRegionProvider provider = ProfileDisableMultiRegionProvider.create(); - @After + @AfterEach public void clearSystemProperty() { System.clearProperty(AWS_CONFIG_FILE.property()); } diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/ProfileUseArnRegionProviderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/ProfileUseArnRegionProviderTest.java index 85e4c026b1ae..f2b8e98bdc0f 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/ProfileUseArnRegionProviderTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/ProfileUseArnRegionProviderTest.java @@ -23,8 +23,8 @@ import static software.amazon.awssdk.profiles.ProfileFileSystemSetting.AWS_CONFIG_FILE; import java.util.Optional; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; @@ -39,7 +39,7 @@ public class ProfileUseArnRegionProviderTest { private ProfileUseArnRegionProvider provider = ProfileUseArnRegionProvider.create(); - @After + @AfterEach public void clearSystemProperty() { System.clearProperty(AWS_CONFIG_FILE.property()); } diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/SystemSettingsDisableMultiRegionProviderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/SystemSettingsDisableMultiRegionProviderTest.java index b2895388e7f7..da8f39bb1738 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/SystemSettingsDisableMultiRegionProviderTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/SystemSettingsDisableMultiRegionProviderTest.java @@ -22,15 +22,15 @@ import static software.amazon.awssdk.services.s3.S3SystemSetting.AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS; import java.util.Optional; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.testutils.EnvironmentVariableHelper; public class SystemSettingsDisableMultiRegionProviderTest { private final SystemsSettingsDisableMultiRegionProvider provider = SystemsSettingsDisableMultiRegionProvider.create(); private final EnvironmentVariableHelper helper = new EnvironmentVariableHelper(); - @After + @AfterEach public void clearSystemProperty() { System.clearProperty(AWS_S3_DISABLE_MULTIREGION_ACCESS_POINTS.property()); helper.reset(); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/SystemSettingsUseArnRegionProviderTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/SystemSettingsUseArnRegionProviderTest.java index 9639eec9dbda..1c8ffd7e8d91 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/SystemSettingsUseArnRegionProviderTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/SystemSettingsUseArnRegionProviderTest.java @@ -22,15 +22,15 @@ import static software.amazon.awssdk.services.s3.S3SystemSetting.AWS_S3_USE_ARN_REGION; import java.util.Optional; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.testutils.EnvironmentVariableHelper; public class SystemSettingsUseArnRegionProviderTest { private final SystemsSettingsUseArnRegionProvider provider = SystemsSettingsUseArnRegionProvider.create(); private final EnvironmentVariableHelper helper = new EnvironmentVariableHelper(); - @After + @AfterEach public void clearSystemProperty() { System.clearProperty(AWS_S3_USE_ARN_REGION.property()); helper.reset(); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/UseArnRegionProviderChainTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/UseArnRegionProviderChainTest.java index 6e8d72ac17e1..5f1e72b77492 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/UseArnRegionProviderChainTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/settingproviders/UseArnRegionProviderChainTest.java @@ -20,14 +20,14 @@ import static software.amazon.awssdk.services.s3.S3SystemSetting.AWS_S3_USE_ARN_REGION; import java.util.Optional; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.testutils.EnvironmentVariableHelper; public class UseArnRegionProviderChainTest { private final EnvironmentVariableHelper helper = new EnvironmentVariableHelper(); - @After + @AfterEach public void clearSystemProperty() { System.clearProperty(AWS_S3_USE_ARN_REGION.property()); System.clearProperty(AWS_CONFIG_FILE.property()); diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequestTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequestTest.java index 4436e66cd8b7..59265d4e33cb 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequestTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/presigner/model/GetObjectPresignRequestTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.s3.model.GetObjectRequest; public class GetObjectPresignRequestTest { diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/S3ControlArnConverterTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/S3ControlArnConverterTest.java index 9ec15936be18..101f828b87c8 100644 --- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/S3ControlArnConverterTest.java +++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/S3ControlArnConverterTest.java @@ -21,7 +21,7 @@ import java.util.Optional; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.arns.Arn; import software.amazon.awssdk.services.s3.internal.resource.S3AccessPointResource; diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/S3ControlWireMockTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/S3ControlWireMockTest.java index 78aa57674f78..d1196338af8d 100644 --- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/S3ControlWireMockTest.java +++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/S3ControlWireMockTest.java @@ -19,9 +19,9 @@ import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import com.github.tomakehurst.wiremock.junit.WireMockRule; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3control.S3ControlClient; @@ -34,7 +34,7 @@ public class S3ControlWireMockTest { private S3ControlClient client; - @Before + @BeforeEach public void setup() { client = S3ControlClient.builder() .region(Region.US_WEST_2) diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/NonArnOutpostRequestTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/NonArnOutpostRequestTest.java index 12534ca47bbe..fd8cd7a9ccc5 100644 --- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/NonArnOutpostRequestTest.java +++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/NonArnOutpostRequestTest.java @@ -28,8 +28,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3control.S3ControlClient; @@ -38,7 +38,7 @@ public class NonArnOutpostRequestTest extends S3ControlWireMockTestBase { private S3ControlClient s3; private static final String EXPECTED_URL = "/v20180820/bucket"; - @Before + @BeforeEach public void methodSetUp() { s3 = buildClient(); } diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3AccessPointArnTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3AccessPointArnTest.java index feecaf13f5a8..df487a027f19 100644 --- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3AccessPointArnTest.java +++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3AccessPointArnTest.java @@ -15,9 +15,9 @@ package software.amazon.awssdk.services.s3control.internal.functionaltests.arns; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3control.S3ControlClient; @@ -29,7 +29,7 @@ public class S3AccessPointArnTest extends S3ControlWireMockTestBase { @Rule public ExpectedException exception = ExpectedException.none(); - @Before + @BeforeEach public void methodSetUp() { s3Control = buildClient(); } diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3OutpostAccessPointArnTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3OutpostAccessPointArnTest.java index ea4c09162b84..97d1a4cfc1a8 100644 --- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3OutpostAccessPointArnTest.java +++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3OutpostAccessPointArnTest.java @@ -23,9 +23,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3control.S3ControlClient; @@ -38,7 +38,7 @@ public class S3OutpostAccessPointArnTest extends S3ControlWireMockTestBase { @Rule public ExpectedException exception = ExpectedException.none(); - @Before + @BeforeEach public void methodSetUp() { s3 = buildClient(); } diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3OutpostBucketArnTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3OutpostBucketArnTest.java index f41f0d0b3932..6f17653b7707 100644 --- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3OutpostBucketArnTest.java +++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/arns/S3OutpostBucketArnTest.java @@ -28,9 +28,9 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3control.S3ControlClient; @@ -43,7 +43,7 @@ public class S3OutpostBucketArnTest extends S3ControlWireMockTestBase { private static final String EXPECTED_URL = "/v20180820/bucket/mybucket"; private static final String EXPECTED_HOST = "s3-outposts.%s.amazonaws.com"; - @Before + @BeforeEach public void methodSetUp() { s3Control = buildClient(); } diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/signing/UrlEncodingTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/signing/UrlEncodingTest.java index 38531825c08b..9ba8b8dd0b7f 100644 --- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/signing/UrlEncodingTest.java +++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/functionaltests/signing/UrlEncodingTest.java @@ -19,14 +19,13 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; -import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig; import static org.assertj.core.api.Assertions.assertThat; -import java.net.URI; import com.github.tomakehurst.wiremock.junit.WireMockRule; -import org.junit.Before; +import java.net.URI; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute; import software.amazon.awssdk.core.interceptor.Context; @@ -57,7 +56,7 @@ protected S3ControlClient buildClient() { .build(); } - @Before + @BeforeEach public void methodSetUp() { s3Control = buildClient(); } diff --git a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptorTest.java b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptorTest.java index f64cb21f188a..a7acddb6e4ab 100644 --- a/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptorTest.java +++ b/services/s3control/src/test/java/software/amazon/awssdk/services/s3control/internal/interceptors/PayloadSigningInterceptorTest.java @@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.signer.S3SignerExecutionAttribute; import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.core.SdkRequest; @@ -35,7 +35,7 @@ public class PayloadSigningInterceptorTest { private SdkHttpRequest request; - @Before + @BeforeEach public void setup() { request = SdkHttpFullRequest.builder() .protocol(Protocol.HTTPS.toString()) diff --git a/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsSignatureCheckerTest.java b/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsSignatureCheckerTest.java index 73a72d91aef6..7f7cf9a55b08 100644 --- a/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsSignatureCheckerTest.java +++ b/services/sns/src/test/java/software/amazon/awssdk/services/sns/SnsSignatureCheckerTest.java @@ -15,7 +15,7 @@ package software.amazon.awssdk.services.sns; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.URISyntaxException; @@ -23,13 +23,13 @@ import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.testutils.service.AwsTestBase; public class SnsSignatureCheckerTest extends AwsTestBase { @Test - public void validateMessageTest() throws URISyntaxException, IOException, CertificateException { + public void validateMessageTest() throws Exception { final String jsonMessage = getResourceAsString(getClass(), SnsTestResources.SAMPLE_MESSAGE); SignatureChecker checker = new SignatureChecker(); assertTrue(checker.verifyMessageSignature(jsonMessage, getPublicKey())); diff --git a/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/MessageMD5ChecksumInterceptorTest.java b/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/MessageMD5ChecksumInterceptorTest.java index 683ef2975c4c..d7e8a123755e 100644 --- a/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/MessageMD5ChecksumInterceptorTest.java +++ b/services/sqs/src/test/java/software/amazon/awssdk/services/sqs/MessageMD5ChecksumInterceptorTest.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.core.SdkRequest; import software.amazon.awssdk.core.SdkResponse; diff --git a/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoCredentialsProviderTest.java b/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoCredentialsProviderTest.java index 9d15a6cfc7be..98f292ddb790 100644 --- a/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoCredentialsProviderTest.java +++ b/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoCredentialsProviderTest.java @@ -24,11 +24,10 @@ import java.time.Duration; import java.time.Instant; import java.util.function.Supplier; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AwsSessionCredentials; import software.amazon.awssdk.services.sso.SsoClient; -import software.amazon.awssdk.services.sso.auth.SsoCredentialsProvider; import software.amazon.awssdk.services.sso.model.GetRoleCredentialsRequest; import software.amazon.awssdk.services.sso.model.GetRoleCredentialsResponse; import software.amazon.awssdk.services.sso.model.RoleCredentials; diff --git a/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoProfileCredentialsProviderFactoryTest.java b/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoProfileCredentialsProviderFactoryTest.java index bcc47d576ccd..91c22ba3aee8 100644 --- a/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoProfileCredentialsProviderFactoryTest.java +++ b/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoProfileCredentialsProviderFactoryTest.java @@ -27,7 +27,7 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; import software.amazon.awssdk.profiles.Profile; import software.amazon.awssdk.services.sso.internal.SsoAccessTokenProvider; diff --git a/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoProfileTest.java b/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoProfileTest.java index d6fd7565c8f8..b20798940de5 100644 --- a/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoProfileTest.java +++ b/services/sso/src/test/java/software/amazon/awssdk/services/sso/auth/SsoProfileTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.internal.ProfileCredentialsUtils; import software.amazon.awssdk.profiles.ProfileFile; import software.amazon.awssdk.utils.StringInputStream; diff --git a/services/sso/src/test/java/software/amazon/awssdk/services/sso/internal/SsoAccessTokenProviderTest.java b/services/sso/src/test/java/software/amazon/awssdk/services/sso/internal/SsoAccessTokenProviderTest.java index 678bd8f129bb..7aead87d4483 100644 --- a/services/sso/src/test/java/software/amazon/awssdk/services/sso/internal/SsoAccessTokenProviderTest.java +++ b/services/sso/src/test/java/software/amazon/awssdk/services/sso/internal/SsoAccessTokenProviderTest.java @@ -27,7 +27,7 @@ import java.nio.file.FileSystem; import java.nio.file.Files; import java.nio.file.Path; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Check if the behavior of {@link SsoAccessTokenProvider} is correct while consuming different formats of cached token diff --git a/services/sso/src/test/java/software/amazon/awssdk/services/sso/internal/SsoTokenFileUtilsTest.java b/services/sso/src/test/java/software/amazon/awssdk/services/sso/internal/SsoTokenFileUtilsTest.java index 1028fa397759..8f3c0563b959 100644 --- a/services/sso/src/test/java/software/amazon/awssdk/services/sso/internal/SsoTokenFileUtilsTest.java +++ b/services/sso/src/test/java/software/amazon/awssdk/services/sso/internal/SsoTokenFileUtilsTest.java @@ -19,7 +19,7 @@ import static software.amazon.awssdk.services.sso.internal.SsoTokenFileUtils.generateCachedTokenPath; import static software.amazon.awssdk.utils.UserHomeDirectoryUtils.userHomeDirectory; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SsoTokenFileUtilsTest { diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/StsWebIdentityCredentialsProviderFactoryTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/StsWebIdentityCredentialsProviderFactoryTest.java index f55ad2f6b2f3..10014fe33807 100644 --- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/StsWebIdentityCredentialsProviderFactoryTest.java +++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/StsWebIdentityCredentialsProviderFactoryTest.java @@ -15,8 +15,9 @@ package software.amazon.awssdk.services.sts.internal; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.WebIdentityTokenCredentialsProviderFactory; import software.amazon.awssdk.auth.credentials.internal.WebIdentityCredentialsUtils; @@ -26,7 +27,7 @@ public class StsWebIdentityCredentialsProviderFactoryTest { @Test public void stsWebIdentityCredentialsProviderFactory_with_webIdentityCredentialsUtils() { WebIdentityTokenCredentialsProviderFactory factory = WebIdentityCredentialsUtils.factory(); - Assert.assertNotNull(factory); + assertNotNull(factory); } } diff --git a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/WebIdentityTokenCredentialProviderTest.java b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/WebIdentityTokenCredentialProviderTest.java index b3b0a1541674..e20d27cdc01c 100644 --- a/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/WebIdentityTokenCredentialProviderTest.java +++ b/services/sts/src/test/java/software/amazon/awssdk/services/sts/internal/WebIdentityTokenCredentialProviderTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.nio.file.Paths; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.internal.ProfileCredentialsUtils; import software.amazon.awssdk.profiles.ProfileFile; import software.amazon.awssdk.utils.SdkAutoCloseable; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryRequestOverrideConfigTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryRequestOverrideConfigTest.java index d67fe633ac2f..3a3b17b4a013 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryRequestOverrideConfigTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryRequestOverrideConfigTest.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; @@ -48,7 +48,7 @@ public class EndpointDiscoveryRequestOverrideConfigTest { private static final AwsBasicCredentials CLIENT_CREDENTIALS = AwsBasicCredentials.create("ca", "cs"); private static final AwsBasicCredentials REQUEST_CREDENTIALS = AwsBasicCredentials.create("ra", "rs"); - @Before + @BeforeEach public void setupClient() { httpClient = new MockSyncHttpClient(); asyncHttpClient = new MockAsyncHttpClient(); @@ -68,7 +68,7 @@ public void setupClient() { .build(); } - @After + @AfterEach public void cleanup() { httpClient.reset(); asyncHttpClient.reset(); diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryTest.java index 3a78b0e356a9..88b43aaf420e 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointDiscoveryTest.java @@ -27,9 +27,9 @@ import java.net.URI; import java.util.concurrent.ExecutionException; import org.assertj.core.api.AbstractThrowableAssert; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryFailedException; @@ -49,7 +49,7 @@ public class EndpointDiscoveryTest { private EndpointDiscoveryTestAsyncClient asyncClient; - @Before + @BeforeEach public void setupClient() { client = EndpointDiscoveryTestClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointVariantResolutionTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointVariantResolutionTest.java index 38fd76c1bafd..d4750714362f 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointVariantResolutionTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/EndpointVariantResolutionTest.java @@ -16,23 +16,12 @@ package software.amazon.awssdk.services; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.assertj.core.api.Assertions.in; -import java.util.Arrays; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; -import software.amazon.awssdk.core.SdkSystemSetting; -import software.amazon.awssdk.profiles.ProfileFile; -import software.amazon.awssdk.profiles.ProfileProperty; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClient; import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClientBuilder; -import software.amazon.awssdk.testutils.EnvironmentVariableHelper; -import software.amazon.awssdk.utils.StringInputStream; -import software.amazon.awssdk.utils.Validate; public class EndpointVariantResolutionTest { @Test diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ExecutionAttributesTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ExecutionAttributesTest.java index 61165b7f69bf..b48c94405a9b 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ExecutionAttributesTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ExecutionAttributesTest.java @@ -4,15 +4,20 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; + import java.util.concurrent.CompletionException; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption; -import software.amazon.awssdk.core.interceptor.*; +import software.amazon.awssdk.core.interceptor.Context; +import software.amazon.awssdk.core.interceptor.ExecutionAttribute; +import software.amazon.awssdk.core.interceptor.ExecutionAttributes; +import software.amazon.awssdk.core.interceptor.ExecutionInterceptor; +import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient; import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClient; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/HostPrefixTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/HostPrefixTest.java index 0a12dc428fb3..e34df574dccb 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/HostPrefixTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/HostPrefixTest.java @@ -20,8 +20,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.net.URI; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.http.AbortableInputStream; @@ -43,7 +43,7 @@ public class HostPrefixTest { private ProtocolRestJsonAsyncClient asyncClient; - @Before + @BeforeEach public void setupClient() { mockHttpClient = new MockSyncHttpClient(); mockAsyncClient = new MockAsyncHttpClient(); diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/InvalidRegionTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/InvalidRegionTest.java index 623f7cbc0386..b819f5ff240a 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/InvalidRegionTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/InvalidRegionTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.regions.Region; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ModelSerializationTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ModelSerializationTest.java index 5b1b90c415d1..e3c193fe7d94 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ModelSerializationTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ModelSerializationTest.java @@ -29,7 +29,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import java.io.IOException; import java.time.Instant; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.services.protocolrestjson.model.AllTypesRequest; import software.amazon.awssdk.services.protocolrestjson.model.BaseType; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ProfileFileConfigurationTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ProfileFileConfigurationTest.java index a70bb0f2a40f..91985092e83f 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ProfileFileConfigurationTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/ProfileFileConfigurationTest.java @@ -19,7 +19,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AwsCredentials; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customizeduseragent/InternalUserAgentTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customizeduseragent/InternalUserAgentTest.java index 5e6ecce8205b..cdb340a77d22 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customizeduseragent/InternalUserAgentTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customizeduseragent/InternalUserAgentTest.java @@ -26,9 +26,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -49,7 +49,7 @@ public class InternalUserAgentTest { private ProtocolRestJsonClient clientWithoutInternalConfig; private ProtocolRestJsonAsyncClient asyncClientWithoutInternalConfig; - @Before + @BeforeEach public void setupClient() { client = ProtocolRestJsonWithInternalConfigClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customresponsemetadata/CustomResponseMetadataTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customresponsemetadata/CustomResponseMetadataTest.java index e0104a254ff3..10f1556f36d6 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customresponsemetadata/CustomResponseMetadataTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/customresponsemetadata/CustomResponseMetadataTest.java @@ -24,9 +24,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.util.concurrent.CompletableFuture; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.ResponseBytes; @@ -49,7 +49,7 @@ public class CustomResponseMetadataTest { private ProtocolRestJsonAsyncClient asyncClient; - @Before + @BeforeEach public void setupClient() { client = ProtocolRestJsonClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/defaultsmode/ClientDefaultsModeTestSuite.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/defaultsmode/ClientDefaultsModeTestSuite.java index a407de097528..39e0458bb515 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/defaultsmode/ClientDefaultsModeTestSuite.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/defaultsmode/ClientDefaultsModeTestSuite.java @@ -28,7 +28,7 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/documenttype/DocumentTypeTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/documenttype/DocumentTypeTest.java index b2e4a65125fe..a5243a65ab60 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/documenttype/DocumentTypeTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/documenttype/DocumentTypeTest.java @@ -12,9 +12,9 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; @@ -56,7 +56,7 @@ public class DocumentTypeTest { private SdkHttpClient httpClient; - @Before + @BeforeEach public void setup() throws IOException { httpClient = Mockito.mock(SdkHttpClient.class); jsonClient = initializeSync(DocumentTypeJsonClient.builder()).build(); diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/HashCodeEqualsTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/HashCodeEqualsTest.java index 46da01f4cb14..5152cb266433 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/HashCodeEqualsTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/HashCodeEqualsTest.java @@ -21,8 +21,8 @@ import java.time.Duration; import java.util.HashMap; 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.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.awscore.AwsResponseMetadata; import software.amazon.awssdk.awscore.DefaultAwsResponseMetadata; @@ -36,7 +36,7 @@ public class HashCodeEqualsTest { private static AllTypesRequest.Builder requestBuilder; private static AllTypesResponse.Builder responseBuilder; - @BeforeClass + @BeforeAll public static void setUp() { requestBuilder = AllTypesRequest.builder() diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/GetValueForFieldTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/GetValueForFieldTest.java index 33275739d2e2..78412e9e8194 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/GetValueForFieldTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/GetValueForFieldTest.java @@ -15,11 +15,11 @@ package software.amazon.awssdk.services.protocolrestjson.model; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for the generated {@code getValueForField} methods on model objects. diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ListCopierTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ListCopierTest.java index feaf6793d43f..e8ca98010c78 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ListCopierTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ListCopierTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.util.DefaultSdkAutoConstructList; import software.amazon.awssdk.core.util.SdkAutoConstructList; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/MapCopierTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/MapCopierTest.java index 98102618dad9..9fc04566a8bc 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/MapCopierTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/MapCopierTest.java @@ -15,16 +15,14 @@ package software.amazon.awssdk.services.protocolrestjson.model; -import org.assertj.core.api.Assertions; -import org.junit.Test; -import software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap; -import software.amazon.awssdk.core.util.SdkAutoConstructMap; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.HashMap; import java.util.Map; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap; +import software.amazon.awssdk.core.util.SdkAutoConstructMap; /** * Tests for generated map member copiers. @@ -70,7 +68,7 @@ public void unknownEnumKeyNotAddedToCopiedMap() { Map mapOfEnumToEnum = new HashMap<>(); mapOfEnumToEnum.put("foo", "bar"); Map copy = MapOfEnumToEnumCopier.copyStringToEnum(mapOfEnumToEnum); - Assertions.assertThat(copy).isEmpty(); + assertThat(copy).isEmpty(); } @Test @@ -78,6 +76,6 @@ public void knownEnumKeyAddedToCopiedMap() { Map mapOfEnumToEnum = new HashMap<>(); mapOfEnumToEnum.put(EnumType.ENUM_VALUE1.toString(), "bar"); Map copy = MapOfEnumToEnumCopier.copyStringToEnum(mapOfEnumToEnum); - Assertions.assertThat(copy).hasSize(1); + assertThat(copy).hasSize(1); } } diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ModelBuilderListMemberTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ModelBuilderListMemberTest.java index 64281a760651..e1469ee93b1a 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ModelBuilderListMemberTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ModelBuilderListMemberTest.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.Collection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.util.SdkAutoConstructList; /** diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ModelBuilderMapMemberTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ModelBuilderMapMemberTest.java index 7a91e323e39c..18f395fd8afc 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ModelBuilderMapMemberTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/protocolrestjson/model/ModelBuilderMapMemberTest.java @@ -15,12 +15,11 @@ package software.amazon.awssdk.services.protocolrestjson.model; -import org.junit.Test; -import software.amazon.awssdk.core.util.SdkAutoConstructMap; +import static org.assertj.core.api.Assertions.assertThat; import java.util.HashMap; - -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; +import software.amazon.awssdk.core.util.SdkAutoConstructMap; /** * Test for verifying map member behavior for model builders. diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/ClientRetryModeTestSuite.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/ClientRetryModeTestSuite.java index 35d5d70e23f8..6934c8fa06f0 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/ClientRetryModeTestSuite.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/ClientRetryModeTestSuite.java @@ -19,7 +19,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.anyRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; import static com.github.tomakehurst.wiremock.client.WireMock.post; -import static com.github.tomakehurst.wiremock.client.WireMock.proxyAllTo; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.verify; import static org.assertj.core.api.Assertions.assertThat; @@ -31,7 +30,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/RetryHeaderTestSuite.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/RetryHeaderTestSuite.java index 9b683170a5c0..2644227b9e1a 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/RetryHeaderTestSuite.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/RetryHeaderTestSuite.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.stream.Stream; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.HttpExecuteResponse; import software.amazon.awssdk.http.SdkHttpRequest; import software.amazon.awssdk.http.SdkHttpResponse; @@ -36,7 +36,7 @@ protected RetryHeaderTestSuite(T mockHttpClient) { this.mockHttpClient = mockHttpClient; } - @Before + @BeforeEach public void setupClient() { mockHttpClient.reset(); } diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/tostring/SensitiveDataRedactedTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/tostring/SensitiveDataRedactedTest.java index 48b4fc5deba0..7430679f6da0 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/tostring/SensitiveDataRedactedTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/tostring/SensitiveDataRedactedTest.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.tostring.model.InputShape; public class SensitiveDataRedactedTest { diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersAsyncFunctionalTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersAsyncFunctionalTest.java index 847a565c240a..ef4bf293c5cf 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersAsyncFunctionalTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersAsyncFunctionalTest.java @@ -24,11 +24,10 @@ import static org.mockito.Mockito.when; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledExecutorService; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.awscore.exception.AwsErrorDetails; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.core.exception.SdkServiceException; @@ -36,7 +35,6 @@ import software.amazon.awssdk.core.waiters.WaiterOverrideConfiguration; import software.amazon.awssdk.core.waiters.WaiterResponse; import software.amazon.awssdk.http.SdkHttpResponse; -import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.restjsonwithwaiters.RestJsonWithWaitersAsyncClient; import software.amazon.awssdk.services.restjsonwithwaiters.model.AllTypesRequest; import software.amazon.awssdk.services.restjsonwithwaiters.model.AllTypesResponse; @@ -50,7 +48,7 @@ public class WaitersAsyncFunctionalTest { public RestJsonWithWaitersAsyncClient asyncClient; public RestJsonWithWaitersAsyncWaiter asyncWaiter; - @Before + @BeforeEach public void setup() { asyncClient = mock(RestJsonWithWaitersAsyncClient.class); asyncWaiter = RestJsonWithWaitersAsyncWaiter.builder() @@ -62,14 +60,14 @@ public void setup() { .build(); } - @After + @AfterEach public void cleanup() { asyncClient.close(); asyncWaiter.close(); } @Test - public void allTypeOperation_withAsyncWaiter_shouldReturnResponse() throws ExecutionException, InterruptedException { + public void allTypeOperation_withAsyncWaiter_shouldReturnResponse() throws Exception { AllTypesResponse response = (AllTypesResponse) AllTypesResponse.builder() .sdkHttpResponse(SdkHttpResponse.builder() .statusCode(200) @@ -90,7 +88,7 @@ public void allTypeOperation_withAsyncWaiter_shouldReturnResponse() throws Execu } @Test - public void allTypeOperationFailed_withAsyncWaiter_shouldReturnException() throws ExecutionException, InterruptedException { + public void allTypeOperationFailed_withAsyncWaiter_shouldReturnException() throws Exception { CompletableFuture serviceFuture = new CompletableFuture<>(); when(asyncClient.allTypes(any(AllTypesRequest.class))).thenReturn(serviceFuture); @@ -103,7 +101,7 @@ public void allTypeOperationFailed_withAsyncWaiter_shouldReturnException() throw } @Test - public void allTypeOperationRetry_withAsyncWaiter_shouldReturnResponseAfterException() throws ExecutionException, InterruptedException { + public void allTypeOperationRetry_withAsyncWaiter_shouldReturnResponseAfterException() throws Exception { AllTypesResponse response2 = (AllTypesResponse) AllTypesResponse.builder() .sdkHttpResponse(SdkHttpResponse.builder() .statusCode(200) diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeDefaultAcceptorsTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeDefaultAcceptorsTest.java index 36b43a64db09..f4ad1b817608 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeDefaultAcceptorsTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeDefaultAcceptorsTest.java @@ -16,10 +16,8 @@ package software.amazon.awssdk.services.waiters; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import org.junit.Test; -import software.amazon.awssdk.core.exception.SdkException; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.waiters.WaiterState; import software.amazon.awssdk.services.restjsonwithwaiters.waiters.internal.WaitersRuntime; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeResponseStatusAcceptorTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeResponseStatusAcceptorTest.java index 977104a719b7..b4595533030b 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeResponseStatusAcceptorTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeResponseStatusAcceptorTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkField; import software.amazon.awssdk.core.SdkResponse; import software.amazon.awssdk.core.exception.SdkException; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeValueTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeValueTest.java index 47837f343e1f..7f3845b9e8ef 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeValueTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersRuntimeValueTest.java @@ -26,7 +26,7 @@ import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkField; import software.amazon.awssdk.core.SdkPojo; import software.amazon.awssdk.core.protocol.MarshallingType; diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersSyncFunctionalTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersSyncFunctionalTest.java index 3da0198d74f7..695c4489837f 100644 --- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersSyncFunctionalTest.java +++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/waiters/WaitersSyncFunctionalTest.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.awscore.exception.AwsErrorDetails; import software.amazon.awssdk.core.exception.SdkClientException; import software.amazon.awssdk.core.exception.SdkServiceException; @@ -45,7 +45,7 @@ public class WaitersSyncFunctionalTest { private RestJsonWithWaitersClient client; private RestJsonWithWaitersWaiter waiter; - @Before + @BeforeEach public void setup() { client = mock(RestJsonWithWaitersClient.class); waiter = RestJsonWithWaitersWaiter.builder() @@ -57,7 +57,7 @@ public void setup() { .build(); } - @After + @AfterEach public void cleanup() { client.close(); waiter.close(); diff --git a/test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkAsyncHttpClientH1TestSuite.java b/test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkAsyncHttpClientH1TestSuite.java index 2536216658f7..c902550a0f12 100644 --- a/test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkAsyncHttpClientH1TestSuite.java +++ b/test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkAsyncHttpClientH1TestSuite.java @@ -48,9 +48,9 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; /** @@ -65,7 +65,7 @@ public abstract class SdkAsyncHttpClientH1TestSuite { protected abstract SdkAsyncHttpClient setupClient(); - @Before + @BeforeEach public void setup() throws Exception { server = new Server(); server.init(); @@ -73,7 +73,7 @@ public void setup() throws Exception { this.client = setupClient(); } - @After + @AfterEach public void teardown() throws InterruptedException { if (server != null) { server.shutdown(); diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncFaultTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncFaultTest.java index b76bfd1bb0cb..f3c5b91c6a80 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncFaultTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncFaultTest.java @@ -25,9 +25,9 @@ import java.net.URI; import java.nio.ByteBuffer; import java.util.concurrent.CompletableFuture; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; @@ -47,7 +47,7 @@ public class AsyncFaultTest { private ProtocolRestJsonAsyncClient client; - @Before + @BeforeEach public void setup() { client = ProtocolRestJsonAsyncClient.builder() .region(Region.US_WEST_1) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseThreadingTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseThreadingTest.java index da9c40cee1b7..0aa9da524c3c 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseThreadingTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseThreadingTest.java @@ -29,7 +29,7 @@ import java.net.URI; import java.util.concurrent.Executor; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.ResponseBytes; diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseTransformerTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseTransformerTest.java index 4d0846216cc9..6aac3b1c5d10 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseTransformerTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/AsyncResponseTransformerTest.java @@ -19,19 +19,15 @@ import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; -import static org.assertj.core.api.Assertions.fail; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.util.concurrent.CompletableFuture; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentialsProviderChain; import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider; @@ -44,7 +40,6 @@ import software.amazon.awssdk.services.protocolquery.ProtocolQueryAsyncClient; import software.amazon.awssdk.services.protocolquery.model.ProtocolQueryException; import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient; -import software.amazon.awssdk.services.protocolrestjson.model.GetOperationWithBodyResponse; import software.amazon.awssdk.services.protocolrestjson.model.ProtocolRestJsonException; import software.amazon.awssdk.services.protocolrestjson.model.StreamingOutputOperationResponse; import software.amazon.awssdk.utils.builder.SdkBuilder; @@ -56,7 +51,7 @@ public class AsyncResponseTransformerTest { private ProtocolRestJsonAsyncClient jsonClient; private ProtocolQueryAsyncClient xmlClient; - @Before + @BeforeEach public void setupClient() { jsonClient = ProtocolRestJsonAsyncClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/Ec2ProtocolTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/Ec2ProtocolTest.java index 86da7910d88f..3a779fe59b72 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/Ec2ProtocolTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/Ec2ProtocolTest.java @@ -15,8 +15,8 @@ package software.amazon.awssdk.protocol.tests; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.protocol.ProtocolTestSuiteLoader; import software.amazon.awssdk.protocol.runners.ProtocolTestRunner; @@ -25,7 +25,7 @@ public class Ec2ProtocolTest extends ProtocolTestBase { private static final ProtocolTestSuiteLoader testSuiteLoader = new ProtocolTestSuiteLoader(); private static ProtocolTestRunner testRunner; - @BeforeClass + @BeforeAll public static void setupFixture() { testRunner = new ProtocolTestRunner("/models/ec2-2016-03-11-intermediate.json"); } diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EnumTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EnumTest.java index f71809b652ba..6ea358cbbac8 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EnumTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EnumTest.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.services.protocolrestjson.model.AllTypesResponse; import software.amazon.awssdk.services.protocolrestjson.model.EnumType; diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EventTransformTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EventTransformTest.java index 04a30f3b538b..cc7bc36ff4e2 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EventTransformTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/EventTransformTest.java @@ -18,8 +18,8 @@ import static org.assertj.core.api.Assertions.assertThat; import java.net.URI; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.core.SdkPojo; import software.amazon.awssdk.core.client.config.SdkClientConfiguration; @@ -44,7 +44,7 @@ public class EventTransformTest { private static final String HEADER_MEMBER = "foo"; private static AwsJsonProtocolFactory protocolFactory; - @BeforeClass + @BeforeAll public static void setup() { protocolFactory = AwsJsonProtocolFactory.builder() .clientConfiguration( diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java index 7d6a69323dd4..6f576f968a5c 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java @@ -40,9 +40,8 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.Mockito; @@ -104,7 +103,7 @@ public void sync_success_allInterceptorMethodsCalled() { @Test public void async_success_allInterceptorMethodsCalled() - throws ExecutionException, InterruptedException, TimeoutException { + throws Exception { // Given ExecutionInterceptor interceptor = mock(MessageUpdatingInterceptor.class, CALLS_REAL_METHODS); ProtocolRestJsonAsyncClient client = asyncClient(interceptor); @@ -139,7 +138,7 @@ public void sync_streamingInput_success_allInterceptorMethodsCalled() throws IOE @Test public void async_streamingInput_success_allInterceptorMethodsCalled() - throws ExecutionException, InterruptedException, TimeoutException, IOException { + throws Exception { // Given ExecutionInterceptor interceptor = mock(NoOpInterceptor.class, CALLS_REAL_METHODS); ProtocolRestJsonAsyncClient client = asyncClient(interceptor); @@ -185,7 +184,7 @@ public void sync_streamingOutput_success_allInterceptorMethodsCalled() throws IO @Test public void async_streamingOutput_success_allInterceptorMethodsCalled() - throws IOException, InterruptedException, ExecutionException, TimeoutException { + throws Exception { // Given ExecutionInterceptor interceptor = mock(NoOpInterceptor.class, CALLS_REAL_METHODS); ProtocolRestJsonAsyncClient client = asyncClient(interceptor); @@ -215,7 +214,7 @@ public void sync_serviceException_failureInterceptorMethodsCalled() { } @Test - public void async_serviceException_failureInterceptorMethodsCalled() throws ExecutionException, InterruptedException { + public void async_serviceException_failureInterceptorMethodsCalled() throws Exception { // Given ExecutionInterceptor interceptor = mock(MessageUpdatingInterceptor.class, CALLS_REAL_METHODS); ProtocolRestJsonAsyncClient client = asyncClient(interceptor); diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ImmutableModelTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ImmutableModelTest.java index 430f57f8bc02..a831df142c19 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ImmutableModelTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ImmutableModelTest.java @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.services.protocolrestjson.model.AllTypesRequest; import software.amazon.awssdk.services.protocolrestjson.model.SimpleStruct; diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryMetadataTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryMetadataTest.java index 1fe3cc39e3bb..fa340d2af90a 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryMetadataTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryMetadataTest.java @@ -23,9 +23,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -46,7 +46,7 @@ public class QueryMetadataTest extends ProtocolTestBase { private ProtocolQueryAsyncClient asyncClient; - @Before + @BeforeEach public void setupClient() { client = ProtocolQueryClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryRequestTransformTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryRequestTransformTest.java index c9187907a3d8..ab1e550d52b8 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryRequestTransformTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/QueryRequestTransformTest.java @@ -19,7 +19,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; import static com.github.tomakehurst.wiremock.client.WireMock.containing; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; -import static com.github.tomakehurst.wiremock.client.WireMock.getAllServeEvents; import static com.github.tomakehurst.wiremock.client.WireMock.matching; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; @@ -27,10 +26,10 @@ import static com.github.tomakehurst.wiremock.client.WireMock.verify; import com.github.tomakehurst.wiremock.junit.WireMockRule; -import com.github.tomakehurst.wiremock.stubbing.ServeEvent; -import org.junit.Before; +import java.net.URI; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.http.Header; @@ -39,9 +38,6 @@ import software.amazon.awssdk.services.protocolquery.ProtocolQueryClient; import software.amazon.awssdk.services.protocolquery.model.IdempotentOperationRequest; -import java.net.URI; -import java.util.List; - public class QueryRequestTransformTest extends ProtocolTestBase { @Rule @@ -50,7 +46,7 @@ public class QueryRequestTransformTest extends ProtocolTestBase { private ProtocolQueryClient client; private ProtocolQueryAsyncClient asyncClient; - @Before + @BeforeEach public void setupClient() { client = ProtocolQueryClient.builder() .credentialsProvider(StaticCredentialsProvider.create( diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResourceManagementTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResourceManagementTest.java index 72ce1323b8de..7bc21c98f844 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResourceManagementTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResourceManagementTest.java @@ -23,7 +23,7 @@ import static software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR; import java.util.concurrent.ExecutorService; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; import software.amazon.awssdk.http.SdkHttpClient; import software.amazon.awssdk.http.async.SdkAsyncHttpClient; diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResponseTransformerTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResponseTransformerTest.java index ffe38a7a54e4..3dbe564340d7 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResponseTransformerTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ResponseTransformerTest.java @@ -36,7 +36,7 @@ import java.time.Duration; import java.util.UUID; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.ResponseBytes; import software.amazon.awssdk.core.exception.SdkClientException; diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonEventStreamProtocolTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonEventStreamProtocolTest.java index a7a01da2be30..2dd0293683ae 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonEventStreamProtocolTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/RestJsonEventStreamProtocolTest.java @@ -19,7 +19,7 @@ import java.net.URI; import java.nio.charset.StandardCharsets; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.core.client.config.SdkClientConfiguration; import software.amazon.awssdk.core.client.config.SdkClientOption; @@ -31,7 +31,6 @@ import software.amazon.awssdk.services.protocolrestjsoncontenttype.model.HeadersOnlyEvent; import software.amazon.awssdk.services.protocolrestjsoncontenttype.model.ImplicitPayloadAndHeadersEvent; import software.amazon.awssdk.services.protocolrestjsoncontenttype.model.InputEventStream; - import software.amazon.awssdk.services.protocolrestjsoncontenttype.model.ProtocolRestJsonContentTypeException; import software.amazon.awssdk.services.protocolrestjsoncontenttype.transform.BlobAndHeadersEventMarshaller; import software.amazon.awssdk.services.protocolrestjsoncontenttype.transform.HeadersOnlyEventMarshaller; diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/SdkHttpResponseTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/SdkHttpResponseTest.java index 73d4a16667d8..49cf4b6f51f1 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/SdkHttpResponseTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/SdkHttpResponseTest.java @@ -30,9 +30,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.awscore.AwsResponse; import software.amazon.awssdk.awscore.AwsResponseMetadata; @@ -70,7 +70,7 @@ public class SdkHttpResponseTest { put("x-amzn-RequestId", Collections.singletonList(REQUEST_ID)); }}; - @Before + @BeforeEach public void setupClient() { client = ProtocolRestJsonClient.builder() .region(Region.US_WEST_1) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/XmlMetadataTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/XmlMetadataTest.java index 9a978fa71879..6516ad03c47a 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/XmlMetadataTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/XmlMetadataTest.java @@ -23,9 +23,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -46,7 +46,7 @@ public class XmlMetadataTest { private ProtocolRestXmlAsyncClient asyncClient; - @Before + @BeforeEach public void setupClient() { client = ProtocolRestXmlClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/clockskew/ClockSkewAdjustmentTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/clockskew/ClockSkewAdjustmentTest.java index 30858d40d893..5e3508423171 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/clockskew/ClockSkewAdjustmentTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/clockskew/ClockSkewAdjustmentTest.java @@ -37,9 +37,9 @@ import java.util.List; import java.util.concurrent.CompletionException; import java.util.function.Supplier; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.SdkGlobalTime; @@ -61,7 +61,7 @@ public class ClockSkewAdjustmentTest { private ProtocolJsonRpcClient client; private ProtocolJsonRpcAsyncClient asyncClient; - @Before + @BeforeEach public void setupClient() { SdkGlobalTime.setGlobalTimeOffset(0); client = createClient(1); diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/connection/SyncClientConnectionTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/connection/SyncClientConnectionTest.java index f8a8944738f3..b4a53de17025 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/connection/SyncClientConnectionTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/connection/SyncClientConnectionTest.java @@ -20,8 +20,8 @@ import java.io.IOException; import java.io.InputStream; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.ResponseInputStream; @@ -46,7 +46,7 @@ public class SyncClientConnectionTest { private ProtocolRestJsonClient client; private MockHttpClient mockHttpClient; - @Before + @BeforeEach public void setupClient() { mockHttpClient = new MockHttpClient(); client = ProtocolRestJsonClient.builder() diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonAsyncCrc32ChecksumTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonAsyncCrc32ChecksumTests.java index 4f46d4cd7265..62ce3848f556 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonAsyncCrc32ChecksumTests.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/crc32/AwsJsonAsyncCrc32ChecksumTests.java @@ -15,21 +15,21 @@ package software.amazon.awssdk.protocol.tests.crc32; + import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.github.tomakehurst.wiremock.common.SingleRootFileSource; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; -import java.util.concurrent.ExecutionException; -import org.junit.Assert; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.exception.Crc32MismatchException; @@ -62,7 +62,7 @@ public class AwsJsonAsyncCrc32ChecksumTests { private ProtocolJsonRpcCustomizedAsyncClient customizedJsonRpcAsync; private ProtocolJsonRpcAsyncClient jsonRpcAsync; - @Before + @BeforeEach public void setup() { jsonRpcAsync = ProtocolJsonRpcAsyncClient.builder() .credentialsProvider(FAKE_CREDENTIALS_PROVIDER) @@ -79,7 +79,7 @@ public void setup() { } @Test - public void clientCalculatesCrc32FromCompressedData_WhenCrc32IsValid() throws ExecutionException, InterruptedException { + public void clientCalculatesCrc32FromCompressedData_WhenCrc32IsValid() throws Exception { stubFor(post(urlEqualTo("/")).willReturn(aResponse() .withStatus(200) .withHeader("Content-Encoding", "gzip") @@ -87,7 +87,7 @@ public void clientCalculatesCrc32FromCompressedData_WhenCrc32IsValid() throws Ex .withBodyFile(JSON_BODY_GZIP))); SimpleResponse result = customizedJsonRpcAsync.simple(SimpleRequest.builder().build()).get(); - Assert.assertEquals("foo", result.stringMember()); + assertEquals("foo", result.stringMember()); } /** @@ -97,8 +97,7 @@ public void clientCalculatesCrc32FromCompressedData_WhenCrc32IsValid() throws Ex * Crc32 calculated is accurate. */ @Test - public void clientCalculatesCrc32FromCompressedData_ExtraData_WhenCrc32IsValid() throws ExecutionException, - InterruptedException { + public void clientCalculatesCrc32FromCompressedData_ExtraData_WhenCrc32IsValid() throws Exception { stubFor(post(urlEqualTo("/")).willReturn(aResponse() .withStatus(200) .withHeader("Content-Encoding", "gzip") @@ -106,12 +105,11 @@ public void clientCalculatesCrc32FromCompressedData_ExtraData_WhenCrc32IsValid() .withBodyFile(JSON_BODY_EXTRA_DATA_GZIP))); SimpleResponse result = customizedJsonRpcAsync.simple(SimpleRequest.builder().build()).get(); - Assert.assertEquals("foo", result.stringMember()); + assertEquals("foo", result.stringMember()); } @Test - public void clientCalculatesCrc32FromCompressedData_WhenCrc32IsInvalid_ThrowsException() throws ExecutionException, - InterruptedException { + public void clientCalculatesCrc32FromCompressedData_WhenCrc32IsInvalid_ThrowsException() throws Exception { stubFor(post(urlEqualTo("/")).willReturn(aResponse() .withStatus(200) .withHeader("Content-Encoding", "gzip") @@ -123,7 +121,7 @@ public void clientCalculatesCrc32FromCompressedData_WhenCrc32IsInvalid_ThrowsExc } @Test - public void clientCalculatesCrc32FromDecompressedData_WhenCrc32IsValid() throws ExecutionException, InterruptedException { + public void clientCalculatesCrc32FromDecompressedData_WhenCrc32IsValid() throws Exception { stubFor(post(urlEqualTo("/")).willReturn(aResponse() .withStatus(200) .withHeader("Content-Encoding", "gzip") @@ -132,12 +130,11 @@ public void clientCalculatesCrc32FromDecompressedData_WhenCrc32IsValid() throws AllTypesResponse result = jsonRpcAsync.allTypes(AllTypesRequest.builder().build()).get(); - Assert.assertEquals("foo", result.stringMember()); + assertEquals("foo", result.stringMember()); } @Test - public void clientCalculatesCrc32FromDecompressedData_WhenCrc32IsInvalid_ThrowsException() throws ExecutionException, - InterruptedException { + public void clientCalculatesCrc32FromDecompressedData_WhenCrc32IsInvalid_ThrowsException() throws Exception { stubFor(post(urlEqualTo("/")).willReturn(aResponse() .withStatus(200) .withHeader("Content-Encoding", "gzip") @@ -149,7 +146,7 @@ public void clientCalculatesCrc32FromDecompressedData_WhenCrc32IsInvalid_ThrowsE } @Test - public void useGzipFalse_WhenCrc32IsValid() throws ExecutionException, InterruptedException { + public void useGzipFalse_WhenCrc32IsValid() throws Exception { stubFor(post(urlEqualTo("/")).willReturn(aResponse() .withStatus(200) .withHeader("x-amz-crc32", JSON_BODY_Crc32_CHECKSUM) @@ -157,11 +154,11 @@ public void useGzipFalse_WhenCrc32IsValid() throws ExecutionException, Interrupt AllTypesResponse result = jsonRpcAsync.allTypes(AllTypesRequest.builder().build()).get(); - Assert.assertEquals("foo", result.stringMember()); + assertEquals("foo", result.stringMember()); } @Test - public void useGzipFalse_WhenCrc32IsInvalid_ThrowException() throws ExecutionException, InterruptedException { + public void useGzipFalse_WhenCrc32IsInvalid_ThrowException() throws Exception { stubFor(post(urlEqualTo("/")).willReturn(aResponse() .withStatus(200) .withHeader("x-amz-crc32", JSON_BODY_GZIP_Crc32_CHECKSUM) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/customservicemetadata/CustomServiceMetaDataServiceTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/customservicemetadata/CustomServiceMetaDataServiceTest.java index 355ed1ce0f1c..9b27b796e4d7 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/customservicemetadata/CustomServiceMetaDataServiceTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/customservicemetadata/CustomServiceMetaDataServiceTest.java @@ -1,31 +1,28 @@ package software.amazon.awssdk.protocol.tests.customservicemetadata; -import com.github.tomakehurst.wiremock.client.WireMock; -import com.github.tomakehurst.wiremock.common.SingleRootFileSource; -import com.github.tomakehurst.wiremock.core.WireMockConfiguration; -import com.github.tomakehurst.wiremock.junit.WireMockRule; -import org.junit.Rule; -import org.junit.Test; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.containing; import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; -import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static com.github.tomakehurst.wiremock.client.WireMock.containing; - +import com.github.tomakehurst.wiremock.client.WireMock; +import com.github.tomakehurst.wiremock.common.SingleRootFileSource; +import com.github.tomakehurst.wiremock.core.WireMockConfiguration; +import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; - +import org.junit.Rule; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.services.protocoljsonrpc.ProtocolJsonRpcClient; -import software.amazon.awssdk.services.protocoljsonrpccustomized.ProtocolJsonRpcCustomizedClient; import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.protocoljsonrpccustomized.model.SimpleRequest; -import software.amazon.awssdk.services.protocoljsonrpccustomized.model.SimpleResponse; +import software.amazon.awssdk.services.protocoljsonrpc.ProtocolJsonRpcClient; import software.amazon.awssdk.services.protocoljsonrpc.model.AllTypesRequest; import software.amazon.awssdk.services.protocoljsonrpc.model.AllTypesResponse; +import software.amazon.awssdk.services.protocoljsonrpccustomized.ProtocolJsonRpcCustomizedClient; +import software.amazon.awssdk.services.protocoljsonrpccustomized.model.SimpleRequest; public class CustomServiceMetaDataServiceTest { diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/AwsJsonExceptionTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/AwsJsonExceptionTest.java index 7797845a9168..d5fdfd6d4468 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/AwsJsonExceptionTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/AwsJsonExceptionTest.java @@ -27,9 +27,9 @@ import java.net.URI; import java.time.Instant; import java.util.AbstractMap.SimpleEntry; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.awscore.exception.AwsErrorDetails; @@ -51,7 +51,7 @@ public class AwsJsonExceptionTest { private ProtocolJsonRpcClient client; - @Before + @BeforeEach public void setupClient() { client = ProtocolJsonRpcClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/Ec2ExceptionTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/Ec2ExceptionTests.java index 8ecb5e5d38c6..dabc22ef2f2d 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/Ec2ExceptionTests.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/Ec2ExceptionTests.java @@ -20,9 +20,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; @@ -38,7 +38,7 @@ public class Ec2ExceptionTests { private ProtocolEc2Client client; - @Before + @BeforeEach public void setupClient() { client = ProtocolEc2Client.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/QueryExceptionTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/QueryExceptionTests.java index b65247235eda..f71378c0bcb6 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/QueryExceptionTests.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/QueryExceptionTests.java @@ -27,9 +27,9 @@ import java.net.URI; import java.time.Instant; import java.util.AbstractMap.SimpleEntry; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.awscore.exception.AwsErrorDetails; @@ -51,7 +51,7 @@ public class QueryExceptionTests { private ProtocolQueryClient client; - @Before + @BeforeEach public void setupClient() { client = ProtocolQueryClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestJsonExceptionTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestJsonExceptionTests.java index 818bd1c4a8e6..67c98e68b9f1 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestJsonExceptionTests.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestJsonExceptionTests.java @@ -21,16 +21,16 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static software.amazon.awssdk.protocol.tests.util.exception.ExceptionTestUtils.stub404Response; import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.time.Instant; import java.util.AbstractMap.SimpleEntry; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.awscore.exception.AwsErrorDetails; @@ -57,7 +57,7 @@ public class RestJsonExceptionTests { private ProtocolRestJsonClient client; - @Before + @BeforeEach public void setupClient() { client = ProtocolRestJsonClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestXmlExceptionTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestXmlExceptionTests.java index 6630c3a2b773..1ff5ec242bde 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestXmlExceptionTests.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/exception/RestXmlExceptionTests.java @@ -20,16 +20,16 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static software.amazon.awssdk.protocol.tests.util.exception.ExceptionTestUtils.stub404Response; import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.time.Instant; import java.util.AbstractMap.SimpleEntry; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.awscore.exception.AwsErrorDetails; @@ -51,7 +51,7 @@ public class RestXmlExceptionTests { private ProtocolRestXmlClient client; - @Before + @BeforeEach public void setupClient() { client = ProtocolRestXmlClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AsyncAwsJsonRetryTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AsyncAwsJsonRetryTest.java index 53d78e1f15bd..9ee330f9c2ee 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AsyncAwsJsonRetryTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AsyncAwsJsonRetryTest.java @@ -25,9 +25,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import com.github.tomakehurst.wiremock.stubbing.Scenario; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.retry.RetryPolicy; @@ -47,7 +47,7 @@ public class AsyncAwsJsonRetryTest { private ProtocolJsonRpcAsyncClient client; - @Before + @BeforeEach public void setupClient() { client = ProtocolJsonRpcAsyncClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AwsJsonRetryTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AwsJsonRetryTest.java index 6ea489b2c3b8..2b1dfefe09ce 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AwsJsonRetryTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/retry/AwsJsonRetryTest.java @@ -25,9 +25,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import com.github.tomakehurst.wiremock.stubbing.Scenario; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.core.retry.RetryPolicy; @@ -47,7 +47,7 @@ public class AwsJsonRetryTest { private ProtocolJsonRpcClient client; - @Before + @BeforeEach public void setupClient() { client = ProtocolJsonRpcClient.builder() .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid"))) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallAttemptTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallAttemptTimeoutTest.java index 9c1bb3921a0a..ca20044b1c37 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallAttemptTimeoutTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallAttemptTimeoutTest.java @@ -23,7 +23,7 @@ import static software.amazon.awssdk.protocol.wiremock.WireMockUtils.verifyRequestCount; import com.github.tomakehurst.wiremock.stubbing.Scenario; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class BaseApiCallAttemptTimeoutTest extends BaseTimeoutTest { diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallTimeoutTest.java index db6fd019d313..3d69f8de51d8 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallTimeoutTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/BaseApiCallTimeoutTest.java @@ -23,7 +23,7 @@ import static software.amazon.awssdk.protocol.wiremock.WireMockUtils.verifyRequestCount; import com.github.tomakehurst.wiremock.stubbing.Scenario; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Contains common scenarios to test timeout feature. diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallAttemptsTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallAttemptsTimeoutTest.java index 51dc46619793..20c97f84e9df 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallAttemptsTimeoutTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallAttemptsTimeoutTest.java @@ -30,9 +30,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import org.assertj.core.api.ThrowableAssert; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.ResponseBytes; import software.amazon.awssdk.core.async.AsyncResponseTransformer; @@ -60,7 +60,7 @@ public class AsyncApiCallAttemptsTimeoutTest extends BaseApiCallAttemptTimeoutTe private static final int DELAY_BEFORE_API_CALL_ATTEMPT_TIMEOUT = 100; private static final int DELAY_AFTER_API_CALL_ATTEMPT_TIMEOUT = 1000; - @Before + @BeforeEach public void setup() { client = ProtocolRestJsonAsyncClient.builder() .region(Region.US_WEST_1) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallTimeoutTest.java index 7ad0319a2c7b..832347e41892 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallTimeoutTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncApiCallTimeoutTest.java @@ -29,9 +29,9 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; import org.assertj.core.api.ThrowableAssert; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.async.AsyncResponseTransformer; import software.amazon.awssdk.core.exception.ApiCallTimeoutException; @@ -53,7 +53,7 @@ public class AsyncApiCallTimeoutTest extends BaseApiCallTimeoutTest { private ProtocolRestJsonAsyncClient client; private ProtocolRestJsonAsyncClient clientWithRetry; - @Before + @BeforeEach public void setup() { client = ProtocolRestJsonAsyncClient.builder() .region(Region.US_WEST_1) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncTimeoutTest.java index 15108cd8892e..5df0c7109574 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncTimeoutTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/async/AsyncTimeoutTest.java @@ -26,9 +26,9 @@ import java.net.URI; import java.time.Duration; import java.util.concurrent.CompletableFuture; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException; import software.amazon.awssdk.core.retry.RetryPolicy; @@ -51,7 +51,7 @@ public class AsyncTimeoutTest { private static final int DELAY_AFTER_API_CALL_ATTEMPT_TIMEOUT = 1100; private ProtocolRestJsonAsyncClient client; - @Before + @BeforeEach public void setup() { client = ProtocolRestJsonAsyncClient.builder() .region(Region.US_WEST_1) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/BaseSyncStreamingTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/BaseSyncStreamingTimeoutTest.java index 9c710900217b..827289755657 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/BaseSyncStreamingTimeoutTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/BaseSyncStreamingTimeoutTest.java @@ -24,9 +24,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration; import software.amazon.awssdk.protocol.tests.timeout.BaseTimeoutTest; @@ -43,7 +43,7 @@ public abstract class BaseSyncStreamingTimeoutTest { protected static final int TIMEOUT = 1000; protected static final int DELAY_BEFORE_TIMEOUT = 100; - @Before + @BeforeEach public void setup() { client = ProtocolRestJsonClient.builder() .region(Region.US_WEST_1) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallAttemptTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallAttemptTimeoutTest.java index 2e2872339302..33dca69733c0 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallAttemptTimeoutTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallAttemptTimeoutTest.java @@ -23,8 +23,8 @@ import java.util.concurrent.Callable; import java.util.function.Consumer; import org.assertj.core.api.ThrowableAssert; -import org.junit.Before; import org.junit.Rule; +import org.junit.jupiter.api.BeforeEach; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException; import software.amazon.awssdk.core.retry.RetryPolicy; @@ -47,7 +47,7 @@ public class SyncApiCallAttemptTimeoutTest extends BaseApiCallAttemptTimeoutTest private ProtocolRestJsonClient clientWithRetry; private static final int API_CALL_ATTEMPT_TIMEOUT = 800; - @Before + @BeforeEach public void setup() { client = ProtocolRestJsonClient.builder() .region(Region.US_WEST_1) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallTimeoutTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallTimeoutTest.java index c1e6c8168baa..486a4765c925 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallTimeoutTest.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncApiCallTimeoutTest.java @@ -28,9 +28,9 @@ import java.util.concurrent.Callable; import java.util.function.Consumer; import org.assertj.core.api.ThrowableAssert; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.exception.ApiCallTimeoutException; import software.amazon.awssdk.core.retry.RetryPolicy; @@ -53,7 +53,7 @@ public class SyncApiCallTimeoutTest extends BaseApiCallTimeoutTest { private ProtocolRestJsonClient client; private ProtocolRestJsonClient clientWithRetry; - @Before + @BeforeEach public void setup() { client = ProtocolRestJsonClient.builder() .region(Region.US_WEST_1) diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncTimeoutTests.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncTimeoutTests.java index 43d4cd3c3aea..fdeca5c00824 100644 --- a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncTimeoutTests.java +++ b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/timeout/sync/SyncTimeoutTests.java @@ -25,9 +25,9 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import java.net.URI; import java.time.Duration; -import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.core.exception.ApiCallAttemptTimeoutException; import software.amazon.awssdk.core.exception.ApiCallTimeoutException; @@ -51,7 +51,7 @@ public class SyncTimeoutTests { private static final int DELAY_AFTER_API_CALL_ATTEMPT_TIMEOUT = 1100; private ProtocolRestJsonClient client; - @Before + @BeforeEach public void setup() { client = ProtocolRestJsonClient.builder() .region(Region.US_WEST_1) diff --git a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/LogCaptor.java b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/LogCaptor.java index b0f8da0163c3..b035cf33c384 100644 --- a/test/test-utils/src/main/java/software/amazon/awssdk/testutils/LogCaptor.java +++ b/test/test-utils/src/main/java/software/amazon/awssdk/testutils/LogCaptor.java @@ -21,8 +21,8 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.log4j.spi.LoggingEvent; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import software.amazon.awssdk.utils.SdkAutoCloseable; /** @@ -62,13 +62,13 @@ public LogCaptorTestBase() { } @Override - @Before + @BeforeEach public void setupLogging() { super.setupLogging(); } @Override - @After + @AfterEach public void stopLogging() { super.stopLogging(); } diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyReaderTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyReaderTest.java index 85ff8e5882c0..1eaa97a51440 100644 --- a/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyReaderTest.java +++ b/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyReaderTest.java @@ -15,13 +15,13 @@ package software.amazon.awssdk.core.auth.policy; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.LinkedList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.auth.policy.Principal.Service; import software.amazon.awssdk.core.auth.policy.Statement.Effect; import software.amazon.awssdk.core.auth.policy.conditions.ConditionFactory; diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyTest.java index ebf90ab6e0f6..592793f32e64 100644 --- a/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyTest.java +++ b/test/test-utils/src/test/java/software/amazon/awssdk/core/auth/policy/PolicyTest.java @@ -15,16 +15,15 @@ package software.amazon.awssdk.core.auth.policy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -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.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.JsonNode; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.core.auth.policy.Principal.Service; import software.amazon.awssdk.core.auth.policy.Principal.WebIdentityProvider; import software.amazon.awssdk.core.auth.policy.Statement.Effect; @@ -369,14 +368,14 @@ public void testPrincipalAccountId() { String ID_WITH_HYPHEN = "a-b-c-d-e-f-g"; String ID_WITHOUT_HYPHEN = "abcdefg"; - Assert.assertEquals(ID_WITHOUT_HYPHEN, + assertEquals(ID_WITHOUT_HYPHEN, new Principal(ID_WITH_HYPHEN).getId()); - Assert.assertEquals(ID_WITHOUT_HYPHEN, + assertEquals(ID_WITHOUT_HYPHEN, new Principal("AWS", ID_WITH_HYPHEN).getId()); - Assert.assertEquals(ID_WITH_HYPHEN, + assertEquals(ID_WITH_HYPHEN, new Principal("Federated", ID_WITH_HYPHEN).getId()); - Assert.assertEquals(ID_WITH_HYPHEN, + assertEquals(ID_WITH_HYPHEN, new Principal("AWS", ID_WITH_HYPHEN, false).getId()); } } diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/DateUtilsTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/DateUtilsTest.java index 785e2f05292c..7032f6bffbe6 100644 --- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/DateUtilsTest.java +++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/DateUtilsTest.java @@ -15,9 +15,9 @@ package software.amazon.awssdk.testutils; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DateUtilsTest { @Test diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/MemoryTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/MemoryTest.java index f2de039256c6..e271a1eb3bf0 100644 --- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/MemoryTest.java +++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/MemoryTest.java @@ -15,7 +15,7 @@ package software.amazon.awssdk.testutils; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MemoryTest { diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/UnorderedCollectionComparatorTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/UnorderedCollectionComparatorTest.java index b0c73783a769..67f9572ece63 100644 --- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/UnorderedCollectionComparatorTest.java +++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/UnorderedCollectionComparatorTest.java @@ -15,12 +15,12 @@ package software.amazon.awssdk.testutils; -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 java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnorderedCollectionComparatorTest { diff --git a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtilsTest.java b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtilsTest.java index 51696359e240..3727e9dace0d 100644 --- a/test/test-utils/src/test/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtilsTest.java +++ b/test/test-utils/src/test/java/software/amazon/awssdk/testutils/smoketest/ReflectionUtilsTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; -import org.junit.Test; +import org.junit.jupiter.api.Test; @SuppressWarnings("unused") public class ReflectionUtilsTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/Base16CodecTest.java b/utils/src/test/java/software/amazon/awssdk/utils/Base16CodecTest.java index 04d9d55b8d78..f98e1d2002d3 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/Base16CodecTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/Base16CodecTest.java @@ -15,13 +15,13 @@ package software.amazon.awssdk.utils; -import java.io.UnsupportedEncodingException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.Arrays; import java.util.UUID; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.internal.Base16; import software.amazon.awssdk.utils.internal.Base16Lower; @@ -31,26 +31,26 @@ public class Base16CodecTest { @Test public void testVectorsPerRfc4648() - throws NoSuchAlgorithmException, UnsupportedEncodingException { + throws Exception { String[] testVectors = {"", "f", "fo", "foo", "foob", "fooba", "foobar"}; String[] expected = {"", "66", "666F", "666F6F", "666F6F62", "666F6F6261", "666F6F626172"}; for (int i = 0; i < testVectors.length; i++) { String data = testVectors[i]; byte[] source = data.getBytes("UTF-8"); String b16encoded = Base16.encodeAsString(data.getBytes("UTF-8")); - Assert.assertEquals(expected[i], b16encoded); + assertEquals(expected[i], b16encoded); byte[] b16 = b16encoded.getBytes("UTF-8"); byte[] decoded = Base16.decode(b16); - Assert.assertTrue(Arrays.equals(source, decoded)); + assertTrue(Arrays.equals(source, decoded)); decoded = Base16Lower.decode(b16); - Assert.assertTrue(Arrays.equals(source, decoded)); + assertTrue(Arrays.equals(source, decoded)); } } @Test public void testCodecConsistency() - throws NoSuchAlgorithmException, UnsupportedEncodingException { + throws Exception { byte[] decoded = null; for (int h = 0; h < 1000; h++) { @@ -60,15 +60,15 @@ public void testCodecConsistency() String b16Encoded = Base16.encodeAsString(digest); { decoded = Base16.decode(b16Encoded); - Assert.assertTrue(Arrays.equals(decoded, digest)); + assertTrue(Arrays.equals(decoded, digest)); decoded = Base16Lower.decode(b16Encoded); - Assert.assertTrue(Arrays.equals(decoded, digest)); + assertTrue(Arrays.equals(decoded, digest)); } { // test decoding case insensitivity decoded = Base16.decode(b16Encoded.toLowerCase()); - Assert.assertTrue(Arrays.equals(decoded, digest)); + assertTrue(Arrays.equals(decoded, digest)); decoded = Base16Lower.decode(b16Encoded.toLowerCase()); - Assert.assertTrue(Arrays.equals(decoded, digest)); + assertTrue(Arrays.equals(decoded, digest)); } } } diff --git a/utils/src/test/java/software/amazon/awssdk/utils/Base16LowerCodecTest.java b/utils/src/test/java/software/amazon/awssdk/utils/Base16LowerCodecTest.java index 3c0ade83597e..698b5780e41a 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/Base16LowerCodecTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/Base16LowerCodecTest.java @@ -15,13 +15,13 @@ package software.amazon.awssdk.utils; -import java.io.UnsupportedEncodingException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.Arrays; import java.util.UUID; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.internal.Base16; import software.amazon.awssdk.utils.internal.Base16Lower; @@ -31,26 +31,26 @@ public class Base16LowerCodecTest { @Test public void testVectorsPerRfc4648() - throws NoSuchAlgorithmException, UnsupportedEncodingException { + throws Exception { String[] testVectors = {"", "f", "fo", "foo", "foob", "fooba", "foobar"}; String[] expected = {"", "66", "666f", "666f6f", "666f6f62", "666f6f6261", "666f6f626172"}; for (int i = 0; i < testVectors.length; i++) { String data = testVectors[i]; byte[] source = data.getBytes("UTF-8"); String b16encoded = Base16Lower.encodeAsString(data.getBytes("UTF-8")); - Assert.assertEquals(expected[i], b16encoded); + assertEquals(expected[i], b16encoded); byte[] b16 = b16encoded.getBytes("UTF-8"); byte[] decoded = Base16.decode(b16); - Assert.assertTrue(Arrays.equals(source, decoded)); + assertTrue(Arrays.equals(source, decoded)); decoded = Base16Lower.decode(b16); - Assert.assertTrue(Arrays.equals(source, decoded)); + assertTrue(Arrays.equals(source, decoded)); } } @Test public void testCodecConsistency() - throws NoSuchAlgorithmException, UnsupportedEncodingException { + throws Exception { byte[] decoded = null; for (int h = 0; h < 1000; h++) { @@ -60,15 +60,15 @@ public void testCodecConsistency() String b16Encoded = Base16Lower.encodeAsString(digest); { decoded = Base16.decode(b16Encoded); - Assert.assertTrue(Arrays.equals(decoded, digest)); + assertTrue(Arrays.equals(decoded, digest)); decoded = Base16Lower.decode(b16Encoded); - Assert.assertTrue(Arrays.equals(decoded, digest)); + assertTrue(Arrays.equals(decoded, digest)); } { // test decoding case insensitivity decoded = Base16.decode(b16Encoded.toLowerCase()); - Assert.assertTrue(Arrays.equals(decoded, digest)); + assertTrue(Arrays.equals(decoded, digest)); decoded = Base16Lower.decode(b16Encoded.toLowerCase()); - Assert.assertTrue(Arrays.equals(decoded, digest)); + assertTrue(Arrays.equals(decoded, digest)); } } } diff --git a/utils/src/test/java/software/amazon/awssdk/utils/Base64UtilsCodecTest.java b/utils/src/test/java/software/amazon/awssdk/utils/Base64UtilsCodecTest.java index f15bec124719..a0ba8e60c8fe 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/Base64UtilsCodecTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/Base64UtilsCodecTest.java @@ -15,17 +15,17 @@ package software.amazon.awssdk.utils; -import java.io.UnsupportedEncodingException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.Arrays; import java.util.UUID; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class Base64UtilsCodecTest { @Test - public void testVectorsPerRfc4648() throws NoSuchAlgorithmException, UnsupportedEncodingException { + public void testVectorsPerRfc4648() throws Exception { String[] testVectors = {"", "f", "fo", "foo", "foob", "fooba", "foobar"}; String[] expected = {"", "Zg==", "Zm8=", "Zm9v", "Zm9vYg==", "Zm9vYmE=", "Zm9vYmFy"}; @@ -33,23 +33,23 @@ public void testVectorsPerRfc4648() throws NoSuchAlgorithmException, Unsupported String data = testVectors[i]; byte[] source = data.getBytes("UTF-8"); String b64encoded = BinaryUtils.toBase64(data.getBytes("UTF-8")); - Assert.assertEquals(expected[i], b64encoded); + assertEquals(expected[i], b64encoded); byte[] b64 = b64encoded.getBytes("UTF-8"); byte[] decoded = BinaryUtils.fromBase64Bytes(b64); - Assert.assertTrue(Arrays.equals(source, decoded)); + assertTrue(Arrays.equals(source, decoded)); } } @Test - public void testCodecConsistency() throws NoSuchAlgorithmException, UnsupportedEncodingException { + public void testCodecConsistency() throws Exception { byte[] decoded = null; for (int h = 0; h < 1000; h++) { byte[] digest = MessageDigest.getInstance("SHA-1").digest(UUID.randomUUID().toString().getBytes("UTF-8")); String b64Encoded = BinaryUtils.toBase64(digest); decoded = BinaryUtils.fromBase64(b64Encoded); - Assert.assertTrue(Arrays.equals(decoded, digest)); + assertTrue(Arrays.equals(decoded, digest)); } } } diff --git a/utils/src/test/java/software/amazon/awssdk/utils/BinaryUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/BinaryUtilsTest.java index fcacdf221ef5..5f255d347adc 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/BinaryUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/BinaryUtilsTest.java @@ -16,14 +16,14 @@ package software.amazon.awssdk.utils; 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.assertNull; -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.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.nio.ByteBuffer; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.internal.Base16Lower; public class BinaryUtilsTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/CollectionUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/CollectionUtilsTest.java index 29d73efdda85..8e3aa7e3bfa9 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/CollectionUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/CollectionUtilsTest.java @@ -19,8 +19,8 @@ import static java.util.Collections.singletonList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -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 java.util.Arrays; import java.util.Collection; @@ -33,7 +33,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CollectionUtilsTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ComparableUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ComparableUtilsTest.java index bfc5fa003e68..c00d7b0dfe56 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/ComparableUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/ComparableUtilsTest.java @@ -15,12 +15,12 @@ package software.amazon.awssdk.utils; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThan; -import static org.junit.Assert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ComparableUtilsTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/FunctionalUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/FunctionalUtilsTest.java index bc93d70034ad..3be9ded07854 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/FunctionalUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/FunctionalUtilsTest.java @@ -25,7 +25,7 @@ import java.io.UncheckedIOException; import java.util.Optional; import java.util.stream.Stream; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FunctionalUtilsTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/HostnameValidatorTest.java b/utils/src/test/java/software/amazon/awssdk/utils/HostnameValidatorTest.java index 4a5361eaf769..641868607cfd 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/HostnameValidatorTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/HostnameValidatorTest.java @@ -15,7 +15,7 @@ package software.amazon.awssdk.utils; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ExpectedException; public class HostnameValidatorTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ImmutableMapTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ImmutableMapTest.java index 33703971b66b..9fc71e426fd6 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/ImmutableMapTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/ImmutableMapTest.java @@ -15,13 +15,13 @@ package software.amazon.awssdk.utils; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Collections; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Unit tests for the ImmutableMapTest class. diff --git a/utils/src/test/java/software/amazon/awssdk/utils/IoUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/IoUtilsTest.java index b3e5f499d2c1..83fbf84b1aae 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/IoUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/IoUtilsTest.java @@ -15,14 +15,14 @@ package software.amazon.awssdk.utils; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Random; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class IoUtilsTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/Md5UtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/Md5UtilsTest.java index 0df5a8e4c3e7..1cbb6cdc60da 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/Md5UtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/Md5UtilsTest.java @@ -15,14 +15,14 @@ package software.amazon.awssdk.utils; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import org.apache.commons.io.FileUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.internal.Base16; public class Md5UtilsTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/NumericUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/NumericUtilsTest.java index 5f4a54b8f279..20fdaae3e5c2 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/NumericUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/NumericUtilsTest.java @@ -15,15 +15,14 @@ package software.amazon.awssdk.utils; -import java.time.Duration; - -import org.junit.Test; - import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; import static software.amazon.awssdk.utils.NumericUtils.max; import static software.amazon.awssdk.utils.NumericUtils.min; +import java.time.Duration; +import org.junit.jupiter.api.Test; + public class NumericUtilsTest { private final Duration SHORT_DURATION = Duration.ofMillis(10); diff --git a/utils/src/test/java/software/amazon/awssdk/utils/PairTest.java b/utils/src/test/java/software/amazon/awssdk/utils/PairTest.java index 08ce26e62997..4d0f590fe928 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/PairTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/PairTest.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PairTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/SdkHttpUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/SdkHttpUtilsTest.java index e514974efc90..8d7e98916733 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/SdkHttpUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/SdkHttpUtilsTest.java @@ -23,14 +23,13 @@ import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.http.SdkHttpUtils; public class SdkHttpUtilsTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/SystemSettingTest.java b/utils/src/test/java/software/amazon/awssdk/utils/SystemSettingTest.java index 0b3b413c0367..a08719bf3646 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/SystemSettingTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/SystemSettingTest.java @@ -16,7 +16,8 @@ package software.amazon.awssdk.utils; import static org.assertj.core.api.Java6Assertions.assertThat; -import org.junit.Test; + +import org.junit.jupiter.api.Test; public class SystemSettingTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ThreadFactoryBuilderTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ThreadFactoryBuilderTest.java index 679e05fa8401..4a4987305642 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/ThreadFactoryBuilderTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/ThreadFactoryBuilderTest.java @@ -18,12 +18,12 @@ import static org.assertj.core.api.Java6Assertions.assertThat; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class ThreadFactoryBuilderTest { - @Before + @BeforeEach public void setup() { ThreadFactoryBuilder.resetPoolNumber(); } diff --git a/utils/src/test/java/software/amazon/awssdk/utils/ToStringTest.java b/utils/src/test/java/software/amazon/awssdk/utils/ToStringTest.java index 815b1c5c03b2..613d4bceb123 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/ToStringTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/ToStringTest.java @@ -19,7 +19,7 @@ import java.util.Arrays; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Validate the functionality of {@link ToString}. diff --git a/utils/src/test/java/software/amazon/awssdk/utils/UserHomeDirectoryUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/UserHomeDirectoryUtilsTest.java index a77acc529bc0..0165bc5664d0 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/UserHomeDirectoryUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/UserHomeDirectoryUtilsTest.java @@ -22,9 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import software.amazon.awssdk.testutils.EnvironmentVariableHelper; public class UserHomeDirectoryUtilsTest { @@ -42,7 +42,7 @@ public class UserHomeDirectoryUtilsTest { * Save the current state of the environment variables we're messing around with in these tests so that we can restore them * when we are done. */ - @Before + @BeforeEach public void saveEnvironment() throws Exception { // The tests in this file change the os.home for testing windows vs non-windows loading. We need to load the home // directory that should be used for the stored file before changing the os.home so that it doesn't try to load @@ -57,7 +57,7 @@ public void saveEnvironment() throws Exception { /** * Reset the environment variables after each test. */ - @After + @AfterEach public void restoreEnvironment() throws Exception { for (String variable : SAVED_ENVIRONMENT_VARIABLES) { String savedValue = savedEnvironmentVariableValues.get(variable); diff --git a/utils/src/test/java/software/amazon/awssdk/utils/async/FlatteningSubscriberTest.java b/utils/src/test/java/software/amazon/awssdk/utils/async/FlatteningSubscriberTest.java index fc03fdead024..4f8639fd544e 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/async/FlatteningSubscriberTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/async/FlatteningSubscriberTest.java @@ -18,8 +18,8 @@ import static org.mockito.Mockito.times; import java.util.Arrays; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.reactivestreams.Subscriber; @@ -30,7 +30,7 @@ public class FlatteningSubscriberTest { private Subscription mockUpstream; private FlatteningSubscriber flatteningSubscriber; - @Before + @BeforeEach @SuppressWarnings("unchecked") public void setup() { mockDelegate = Mockito.mock(Subscriber.class); diff --git a/utils/src/test/java/software/amazon/awssdk/utils/builder/CopyableBuilderTest.java b/utils/src/test/java/software/amazon/awssdk/utils/builder/CopyableBuilderTest.java index 3583437f33e1..136f0a473ded 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/builder/CopyableBuilderTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/builder/CopyableBuilderTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CopyableBuilderTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/cache/CachedSupplierTest.java b/utils/src/test/java/software/amazon/awssdk/utils/cache/CachedSupplierTest.java index dcd393b5f3c8..b5e9f3cb38c9 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/cache/CachedSupplierTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/cache/CachedSupplierTest.java @@ -15,7 +15,8 @@ package software.amazon.awssdk.utils.cache; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely; import java.io.Closeable; @@ -29,10 +30,9 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Validate the functionality of {@link CachedSupplier}. @@ -53,7 +53,7 @@ public class CachedSupplierTest { /** * Create an executor service for async testing. */ - @Before + @BeforeEach public void setup() { executorService = Executors.newFixedThreadPool(50); allExecutions = new ArrayList<>(); @@ -62,7 +62,7 @@ public void setup() { /** * Shut down the executor service when we're done. */ - @After + @AfterEach public void shutdown() { executorService.shutdown(); } @@ -121,7 +121,7 @@ public RefreshResult get() { * time if the "gets" never actually start. */ public void waitForGetsToHaveStarted(int numExpectedGets) { - Assert.assertTrue(invokeSafely(() -> startedGetPermits.tryAcquire(numExpectedGets, 10, TimeUnit.SECONDS))); + assertTrue(invokeSafely(() -> startedGetPermits.tryAcquire(numExpectedGets, 10, TimeUnit.SECONDS))); } /** @@ -129,7 +129,7 @@ public void waitForGetsToHaveStarted(int numExpectedGets) { * time if the "gets" never finish. */ public void waitForGetsToHaveFinished(int numExpectedGets) { - Assert.assertTrue(invokeSafely(() -> finishedGetPermits.tryAcquire(numExpectedGets, 10, TimeUnit.SECONDS))); + assertTrue(invokeSafely(() -> finishedGetPermits.tryAcquire(numExpectedGets, 10, TimeUnit.SECONDS))); } /** diff --git a/utils/src/test/java/software/amazon/awssdk/utils/internal/ReflectionUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/internal/ReflectionUtilsTest.java index 96ed72b3e8f8..67080090cfed 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/internal/ReflectionUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/internal/ReflectionUtilsTest.java @@ -15,11 +15,11 @@ package software.amazon.awssdk.utils.internal; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ReflectionUtilsTest { diff --git a/utils/src/test/java/software/amazon/awssdk/utils/internal/SystemSettingUtilsTest.java b/utils/src/test/java/software/amazon/awssdk/utils/internal/SystemSettingUtilsTest.java index 435b3ee157aa..4565342717cf 100644 --- a/utils/src/test/java/software/amazon/awssdk/utils/internal/SystemSettingUtilsTest.java +++ b/utils/src/test/java/software/amazon/awssdk/utils/internal/SystemSettingUtilsTest.java @@ -16,7 +16,8 @@ package software.amazon.awssdk.utils.internal; import static org.assertj.core.api.Java6Assertions.assertThat; -import org.junit.Test; + +import org.junit.jupiter.api.Test; import software.amazon.awssdk.utils.SystemSetting; public class SystemSettingUtilsTest {