Skip to content

Commit d503895

Browse files
author
Bennett Lynch
committed
Migrate most tests to JUnit 5
1 parent ee9ea08 commit d503895

File tree

356 files changed

+1556
-1550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

356 files changed

+1556
-1550
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import java.io.File;
2121
import java.nio.file.Paths;
22-
import org.junit.Before;
23-
import org.junit.Test;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.Test;
2424
import software.amazon.awssdk.codegen.lite.regions.model.Partition;
2525
import software.amazon.awssdk.codegen.lite.regions.model.Partitions;
2626

@@ -35,7 +35,7 @@ public class RegionGenerationTest {
3535
private File endpoints;
3636
private Partitions partitions;
3737

38-
@Before
38+
@BeforeEach
3939
public void before() throws Exception {
4040
this.endpoints = Paths.get(getClass().getResource(ENDPOINTS).toURI()).toFile();
4141
this.partitions = RegionMetadataLoader.build(endpoints);

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
import static org.junit.Assert.assertFalse;
1818
import static org.junit.Assert.assertTrue;
1919

20-
import org.junit.Test;
20+
import org.junit.jupiter.api.Assertions;
21+
import org.junit.jupiter.api.Test;
2122

2223
public class RegionValidationUtilTest {
2324

@@ -27,86 +28,86 @@ public class RegionValidationUtilTest {
2728

2829
@Test
2930
public void usEast1_AwsPartition_IsValidRegion() {
30-
assertTrue(RegionValidationUtil.validRegion("us-east-1", AWS_PARTITION_REGEX));
31+
Assertions.assertTrue(RegionValidationUtil.validRegion("us-east-1", AWS_PARTITION_REGEX));
3132
}
3233

3334
@Test
3435
public void usWest2Fips_AwsPartition_IsValidRegion() {
35-
assertTrue(RegionValidationUtil.validRegion("us-west-2-fips", AWS_PARTITION_REGEX));
36+
Assertions.assertTrue(RegionValidationUtil.validRegion("us-west-2-fips", AWS_PARTITION_REGEX));
3637
}
3738

3839
@Test
3940
public void fipsUsWest2_AwsPartition_IsNotValidRegion() {
40-
assertTrue(RegionValidationUtil.validRegion("fips-us-west-2", AWS_PARTITION_REGEX));
41+
Assertions.assertTrue(RegionValidationUtil.validRegion("fips-us-west-2", AWS_PARTITION_REGEX));
4142
}
4243

4344
@Test
4445
public void fips_AwsPartition_IsNotValidRegion() {
45-
assertFalse(RegionValidationUtil.validRegion("fips", AWS_PARTITION_REGEX));
46+
Assertions.assertFalse(RegionValidationUtil.validRegion("fips", AWS_PARTITION_REGEX));
4647
}
4748

4849
@Test
4950
public void prodFips_AwsPartition_IsNotValidRegion() {
50-
assertFalse(RegionValidationUtil.validRegion("ProdFips", AWS_PARTITION_REGEX));
51+
Assertions.assertFalse(RegionValidationUtil.validRegion("ProdFips", AWS_PARTITION_REGEX));
5152
}
5253

5354
@Test
5455
public void cnNorth1_AwsCnPartition_IsNotValidRegion() {
55-
assertFalse(RegionValidationUtil.validRegion("cn-north-1", AWS_PARTITION_REGEX));
56+
Assertions.assertFalse(RegionValidationUtil.validRegion("cn-north-1", AWS_PARTITION_REGEX));
5657
}
5758

5859
@Test
5960
public void cnNorth1_AwsCnPartition_IsValidRegion() {
60-
assertTrue(RegionValidationUtil.validRegion("cn-north-1", AWS_CN_PARTITION_REGEX));
61+
Assertions.assertTrue(RegionValidationUtil.validRegion("cn-north-1", AWS_CN_PARTITION_REGEX));
6162
}
6263

6364
@Test
6465
public void usEast1_AwsCnPartition_IsNotValidRegion() {
65-
assertFalse(RegionValidationUtil.validRegion("us-east-1", AWS_CN_PARTITION_REGEX));
66+
Assertions.assertFalse(RegionValidationUtil.validRegion("us-east-1", AWS_CN_PARTITION_REGEX));
6667
}
6768

6869
@Test
6970
public void usGovWest1_AwsGovPartition_IsValidRegion() {
70-
assertTrue(RegionValidationUtil.validRegion("us-gov-west-1", AWS_GOV_PARTITION_REGEX));
71+
Assertions.assertTrue(RegionValidationUtil.validRegion("us-gov-west-1", AWS_GOV_PARTITION_REGEX));
7172
}
7273

7374
@Test
7475
public void usGovWest1Fips_AwsGovPartition_IsValidRegion() {
75-
assertTrue(RegionValidationUtil.validRegion("us-gov-west-1-fips", AWS_GOV_PARTITION_REGEX));
76+
Assertions.assertTrue(RegionValidationUtil.validRegion("us-gov-west-1-fips", AWS_GOV_PARTITION_REGEX));
7677
}
7778

7879
@Test
7980
public void fipsUsGovWest1_AwsGovPartition_IsNotValidRegion() {
80-
assertTrue(RegionValidationUtil.validRegion("fips-us-gov-west-1", AWS_GOV_PARTITION_REGEX));
81+
Assertions.assertTrue(RegionValidationUtil.validRegion("fips-us-gov-west-1", AWS_GOV_PARTITION_REGEX));
8182
}
8283

8384
@Test
8485
public void fips_AwsGovPartition_IsNotValidRegion() {
85-
assertFalse(RegionValidationUtil.validRegion("fips", AWS_GOV_PARTITION_REGEX));
86+
Assertions.assertFalse(RegionValidationUtil.validRegion("fips", AWS_GOV_PARTITION_REGEX));
8687
}
8788

8889
@Test
8990
public void prodFips_AwsGovPartition_IsNotValidRegion() {
90-
assertFalse(RegionValidationUtil.validRegion("ProdFips", AWS_GOV_PARTITION_REGEX));
91+
Assertions.assertFalse(RegionValidationUtil.validRegion("ProdFips", AWS_GOV_PARTITION_REGEX));
9192
}
9293

9394
@Test
9495
public void cnNorth1_AwsGovPartition_IsNotValidRegion() {
95-
assertFalse(RegionValidationUtil.validRegion("cn-north-1", AWS_GOV_PARTITION_REGEX));
96+
Assertions.assertFalse(RegionValidationUtil.validRegion("cn-north-1", AWS_GOV_PARTITION_REGEX));
9697
}
9798

9899
@Test
99100
public void awsGlobal_AwsPartition_IsValidRegion() {
100-
assertTrue(RegionValidationUtil.validRegion("aws-global", AWS_PARTITION_REGEX));
101+
Assertions.assertTrue(RegionValidationUtil.validRegion("aws-global", AWS_PARTITION_REGEX));
101102
}
102103

103104
@Test
104105
public void awsGovGlobal_AwsGovPartition_IsValidRegion() {
105-
assertTrue(RegionValidationUtil.validRegion("aws-us-gov-global", AWS_GOV_PARTITION_REGEX));
106+
Assertions.assertTrue(RegionValidationUtil.validRegion("aws-us-gov-global", AWS_GOV_PARTITION_REGEX));
106107
}
107108

108109
@Test
109110
public void awsCnGlobal_AwsCnPartition_IsValidRegion() {
110-
assertTrue(RegionValidationUtil.validRegion("aws-cn-global", AWS_CN_PARTITION_REGEX));
111+
Assertions.assertTrue(RegionValidationUtil.validRegion("aws-cn-global", AWS_CN_PARTITION_REGEX));
111112
}
112113
}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import static org.junit.Assert.assertTrue;
2222

2323
import java.io.File;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Assertions;
25+
import org.junit.jupiter.api.Test;
2526
import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
2627
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
2728
import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
@@ -57,8 +58,8 @@ public void sharedOutputShapesLinkCorrectlyToOperationOutputs() {
5758
.build())
5859
.build();
5960

60-
assertEquals("PingResponse", testModel.getOperation("Ping").getOutputShape().getShapeName());
61-
assertEquals("SecurePingResponse", testModel.getOperation("SecurePing").getOutputShape().getShapeName());
61+
Assertions.assertEquals("PingResponse", testModel.getOperation("Ping").getOutputShape().getShapeName());
62+
Assertions.assertEquals("SecurePingResponse", testModel.getOperation("SecurePing").getOutputShape().getShapeName());
6263
}
6364

6465
@Test
@@ -72,7 +73,7 @@ public void defaultEndpointDiscovery_true() {
7273
.build())
7374
.build();
7475

75-
assertTrue(testModel.getEndpointOperation().get().isEndpointCacheRequired());
76+
Assertions.assertTrue(testModel.getEndpointOperation().get().isEndpointCacheRequired());
7677
}
7778

7879
@Test
@@ -86,7 +87,7 @@ public void defaultEndpointDiscovery_false() {
8687
.build())
8788
.build();
8889

89-
assertFalse(testModel.getEndpointOperation().get().isEndpointCacheRequired());
90+
Assertions.assertFalse(testModel.getEndpointOperation().get().isEndpointCacheRequired());
9091
}
9192

9293
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.mockito.Mockito.mock;
2121
import static org.mockito.Mockito.when;
2222

23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424

2525
public class CodeTransformerTest {
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import java.nio.file.Files;
2323
import java.nio.file.Paths;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525

2626
public class UnusedImportRemoverTest {
2727

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,35 @@
1414
*/
1515
package software.amazon.awssdk.codegen.internal;
1616

17+
import org.hamcrest.MatcherAssert;
1718
import org.hamcrest.Matchers;
18-
import org.junit.Assert;
19-
import org.junit.Test;
19+
import org.junit.jupiter.api.Assertions;
20+
import org.junit.jupiter.api.Test;
2021

2122

2223
public class DocumentationUtilsTest {
2324

2425
@Test
2526
public void strip_html_tags_null_or_empty_input_returns_empty_string() {
2627

27-
Assert.assertThat(DocumentationUtils.stripHtmlTags(null), Matchers
28+
MatcherAssert.assertThat(DocumentationUtils.stripHtmlTags(null), Matchers
2829
.isEmptyString());
29-
Assert.assertThat(DocumentationUtils.stripHtmlTags(""), Matchers
30+
MatcherAssert.assertThat(DocumentationUtils.stripHtmlTags(""), Matchers
3031
.isEmptyString());
3132

3233
}
3334

3435
@Test
3536
public void html_tags_at_start_of_string_are_removed() {
36-
Assert.assertEquals("foo", DocumentationUtils.stripHtmlTags
37+
Assertions.assertEquals("foo", DocumentationUtils.stripHtmlTags
3738
("<bar>foo</bar>"));
3839
}
3940

4041
@Test
4142
public void empty_html_tags_at_start_are_removed() {
42-
Assert.assertThat(DocumentationUtils.stripHtmlTags("<p></p>"), Matchers
43+
MatcherAssert.assertThat(DocumentationUtils.stripHtmlTags("<p></p>"), Matchers
4344
.isEmptyString());
44-
Assert.assertThat(DocumentationUtils.stripHtmlTags("<p/>"), Matchers
45+
MatcherAssert.assertThat(DocumentationUtils.stripHtmlTags("<p/>"), Matchers
4546
.isEmptyString());
4647
}
4748
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import java.util.HashMap;
2323
import java.util.Map;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Test;
2525

2626
public class UtilsTest {
2727
final Map<String,String> capitalizedToUncapitalized = new HashMap<String,String>() {{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
1919

20-
import org.junit.Test;
20+
import org.junit.jupiter.api.Test;
2121
import software.amazon.awssdk.codegen.jmespath.component.Comparator;
2222
import software.amazon.awssdk.codegen.jmespath.component.Expression;
2323
import software.amazon.awssdk.codegen.jmespath.parser.JmesPathParser;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static software.amazon.awssdk.codegen.TestStringUtils.toPlatformLfs;
2121

22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323
import software.amazon.awssdk.codegen.docs.DocumentationBuilder;
2424

2525
public class DocumentationBuilderTest {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import java.io.File;
2121
import java.util.Collections;
22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323
import software.amazon.awssdk.codegen.C2jModels;
2424
import software.amazon.awssdk.codegen.IntermediateModelBuilder;
2525
import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,39 @@
2121

2222
import java.util.Arrays;
2323
import java.util.Collections;
24-
import org.junit.Test;
24+
import org.junit.jupiter.api.Assertions;
25+
import org.junit.jupiter.api.Test;
2526

2627
public class PaginatorDefinitionTest {
2728

2829
@Test
2930
public void isValid_ReturnsFalse_WhenInputToken_IsNullOrEmpty() {
3031
PaginatorDefinition paginatorDefinition = new PaginatorDefinition();
3132

32-
assertNull(paginatorDefinition.getInputToken());
33-
assertFalse(paginatorDefinition.isValid());
33+
Assertions.assertNull(paginatorDefinition.getInputToken());
34+
Assertions.assertFalse(paginatorDefinition.isValid());
3435

3536
paginatorDefinition.setInputToken(Collections.emptyList());
36-
assertFalse(paginatorDefinition.isValid());
37+
Assertions.assertFalse(paginatorDefinition.isValid());
3738
}
3839

3940
@Test
4041
public void isValid_ReturnsFalse_WhenOutputToken_IsNullOrEmpty() {
4142
PaginatorDefinition paginatorDefinition = new PaginatorDefinition();
4243

43-
assertNull(paginatorDefinition.getOutputToken());
44-
assertFalse(paginatorDefinition.isValid());
44+
Assertions.assertNull(paginatorDefinition.getOutputToken());
45+
Assertions.assertFalse(paginatorDefinition.isValid());
4546

4647
paginatorDefinition.setOutputToken(Collections.emptyList());
47-
assertFalse(paginatorDefinition.isValid());
48+
Assertions.assertFalse(paginatorDefinition.isValid());
4849
}
4950

5051
@Test
5152
public void isValid_ReturnsFalse_WhenInputTokenIsPresent_AndOutputTokenIsMissing() {
5253
PaginatorDefinition paginatorDefinition = new PaginatorDefinition();
5354
paginatorDefinition.setInputToken(Arrays.asList("inputToken"));
5455

55-
assertFalse(paginatorDefinition.isValid());
56+
Assertions.assertFalse(paginatorDefinition.isValid());
5657
}
5758

5859
@Test
@@ -61,7 +62,7 @@ public void isValid_ReturnsTrue_WhenBothInputTokenAndOutputToken_ArePresent() {
6162
paginatorDefinition.setInputToken(Arrays.asList("inputToken"));
6263
paginatorDefinition.setOutputToken(Arrays.asList("foo", "bar"));
6364

64-
assertTrue(paginatorDefinition.isValid());
65+
Assertions.assertTrue(paginatorDefinition.isValid());
6566
}
6667

6768
@Test
@@ -70,8 +71,8 @@ public void isValid_ReturnsTrue_WhenResultKey_IsNull() {
7071
paginatorDefinition.setInputToken(Arrays.asList("inputToken"));
7172
paginatorDefinition.setOutputToken(Arrays.asList("foo", "bar"));
7273

73-
assertNull(paginatorDefinition.getResultKey());
74-
assertTrue(paginatorDefinition.isValid());
74+
Assertions.assertNull(paginatorDefinition.getResultKey());
75+
Assertions.assertTrue(paginatorDefinition.isValid());
7576
}
7677

7778
@Test
@@ -80,7 +81,7 @@ public void isValid_ReturnsTrue_WhenOutputTokenList_ContainsValidString() {
8081
paginatorDefinition.setOutputToken(Arrays.asList("Foo", "Foo.Bar"));
8182
paginatorDefinition.setInputToken(Arrays.asList("token"));
8283

83-
assertTrue(paginatorDefinition.isValid());
84+
Assertions.assertTrue(paginatorDefinition.isValid());
8485
}
8586

8687
@Test
@@ -89,7 +90,7 @@ public void isValid_ReturnsFalse_WhenOutputTokenList_ContainsAListMember() {
8990
paginatorDefinition.setOutputToken(Arrays.asList("Contents[-1]"));
9091
paginatorDefinition.setInputToken(Arrays.asList("token"));
9192

92-
assertFalse(paginatorDefinition.isValid());
93+
Assertions.assertFalse(paginatorDefinition.isValid());
9394
}
9495

9596
@Test
@@ -98,6 +99,6 @@ public void isValid_ReturnsTrue_WhenOutputTokenList_ContainsOrCharacter() {
9899
paginatorDefinition.setOutputToken(Arrays.asList("NextMarker || Contents"));
99100
paginatorDefinition.setInputToken(Arrays.asList("token"));
100101

101-
assertFalse(paginatorDefinition.isValid());
102+
Assertions.assertFalse(paginatorDefinition.isValid());
102103
}
103104
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import com.squareup.javapoet.CodeBlock;
2121
import java.util.stream.Stream;
22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323

2424
/**
2525
* Validate functionality of the {@link PoetCollectors}.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
2020

2121
import java.util.function.Function;
22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
2424
import software.amazon.awssdk.codegen.poet.ClassSpec;
2525
import software.amazon.awssdk.codegen.poet.ClientTestModels;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
2121

2222
import java.io.IOException;
23-
import org.junit.Test;
23+
import org.junit.jupiter.api.Test;
2424
import software.amazon.awssdk.codegen.model.intermediate.EnumModel;
2525
import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
2626
import software.amazon.awssdk.codegen.model.intermediate.ShapeType;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import static org.hamcrest.MatcherAssert.assertThat;
1818
import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
1919

20-
import org.junit.Test;
20+
import org.junit.jupiter.api.Test;
2121
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
2222
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
2323
import software.amazon.awssdk.codegen.poet.ClientTestModels;

0 commit comments

Comments
 (0)