Skip to content

Migrate most tests to JUnit 5 #2931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 23, 2021
Merged

Migrate most tests to JUnit 5 #2931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d503895
Migrate most tests to JUnit 5
Dec 17, 2021
7849f1c
Revert "Migrate most tests to JUnit 5"
Dec 17, 2021
1541852
Replace JUnit4 Assert w/ JUnit5 Assertions
Dec 20, 2021
31fb403
Revert ProtocolTestBase
Dec 20, 2021
4f4e11e
Revert AbstractTestCase
Dec 21, 2021
8cef902
Merge branch 'master' into junit5-migration-step2c
Bennett-Lynch Dec 21, 2021
0573fd3
Merge branch 'master' into junit5-migration-step2c
Bennett-Lynch Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions ...est/java/software/amazon/awssdk/codegen/lite/defaultsmode/DefaultsModeGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions ...-lite/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions ...e/src/test/java/software/amazon/awssdk/codegen/lite/regions/RegionValidationUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
8 changes: 4 additions & 4 deletions codegen/src/test/java/software/amazon/awssdk/codegen/IntermediateModelBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions .../awssdk/codegen/customization/processors/UseLegacyEventGenerationSchemeProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/test/java/software/amazon/awssdk/codegen/emitters/CodeTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion codegen/src/test/java/software/amazon/awssdk/codegen/emitters/UnusedImportRemoverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
16 changes: 9 additions & 7 deletions codegen/src/test/java/software/amazon/awssdk/codegen/internal/DocumentationUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,36 @@
*/
package software.amazon.awssdk.codegen.internal;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Test;


public class DocumentationUtilsTest {

@Test
public void strip_html_tags_null_or_empty_input_returns_empty_string() {

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

}

@Test
public void html_tags_at_start_of_string_are_removed() {
Assert.assertEquals("foo", DocumentationUtils.stripHtmlTags
assertEquals("foo", DocumentationUtils.stripHtmlTags
("<bar>foo</bar>"));
}

@Test
public void empty_html_tags_at_start_are_removed() {
Assert.assertThat(DocumentationUtils.stripHtmlTags("<p></p>"), Matchers
assertThat(DocumentationUtils.stripHtmlTags("<p></p>"), Matchers
.isEmptyString());
Assert.assertThat(DocumentationUtils.stripHtmlTags("<p/>"), Matchers
assertThat(DocumentationUtils.stripHtmlTags("<p/>"), Matchers
.isEmptyString());
}
}
2 changes: 1 addition & 1 deletion codegen/src/test/java/software/amazon/awssdk/codegen/internal/UtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;

public class UtilsTest {
final Map<String,String> capitalizedToUncapitalized = new HashMap<String,String>() {{
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/test/java/software/amazon/awssdk/codegen/jmespath/JmesPathParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/software/amazon/awssdk/codegen/model/intermediate/DocumentationBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...n/src/test/java/software/amazon/awssdk/codegen/model/service/PaginatorDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion codegen/src/test/java/software/amazon/awssdk/codegen/poet/PoetCollectorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/test/java/software/amazon/awssdk/codegen/poet/builder/BuilderClassTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion codegen/src/test/java/software/amazon/awssdk/codegen/poet/common/EnumClassTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...azon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/software/amazon/awssdk/codegen/poet/eventstream/EventStreamFunctionalTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...rc/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseRequestSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...c/test/java/software/amazon/awssdk/codegen/poet/model/AwsServiceBaseResponseSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...n/src/test/java/software/amazon/awssdk/codegen/poet/model/BaseExceptionClassSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...gen/src/test/java/software/amazon/awssdk/codegen/poet/model/ResponseMetadataSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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());
Expand Down
6 changes: 3 additions & 3 deletions ...t/java/software/amazon/awssdk/codegen/poet/paginators/PaginatedResponseClassSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -42,7 +42,7 @@ public class PaginatedResponseClassSpecTest {
private static Paginators paginators;
private static Map<String, String> paginationCustomization;

@BeforeClass
@BeforeAll
public static void setUp() throws IOException {
File serviceModelFile = new File(PaginatedResponseClassSpecTest.class.getResource("service-2.json").getFile());
File customizationConfigFile = new File(PaginatedResponseClassSpecTest.class.getResource("customization.config")
Expand Down
18 changes: 1 addition & 17 deletions codegen/src/test/java/software/amazon/awssdk/codegen/poet/waiters/WaitersClassSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion core/arns/src/test/java/software/amazon/awssdk/arns/ArnResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
3 changes: 1 addition & 2 deletions core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Loading