Skip to content

Commit f5c7a09

Browse files
committed
Migrate junit4 to junit5
1 parent 9d57662 commit f5c7a09

File tree

3 files changed

+16
-27
lines changed

3 files changed

+16
-27
lines changed

SpringBootDynamo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ repositories {
2727
dependencies {
2828
compile('com.amazonaws:aws-java-sdk-dynamodb:1.11.515')
2929
compile('org.springframework.boot:spring-boot-starter-web')
30-
testCompile('org.testcontainers:testcontainers:1.12.0')
3130
testCompile('org.springframework.boot:spring-boot-starter-test')
31+
testCompile('org.testcontainers:junit-jupiter:1.12.3')
3232
}
Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,25 @@
11
package com.example;
22

3-
import org.junit.ClassRule;
4-
import org.junit.runner.RunWith;
53
import org.springframework.boot.test.context.SpringBootTest;
6-
import org.springframework.boot.test.util.TestPropertyValues;
7-
import org.springframework.context.ApplicationContextInitializer;
8-
import org.springframework.context.ConfigurableApplicationContext;
9-
import org.springframework.test.context.ContextConfiguration;
10-
import org.springframework.test.context.junit4.SpringRunner;
114
import org.testcontainers.containers.GenericContainer;
5+
import org.testcontainers.junit.jupiter.Testcontainers;
126

13-
@RunWith(SpringRunner.class)
147
@SpringBootTest
15-
@ContextConfiguration(initializers = AbstractIntegrationTest.Initializer.class)
8+
@Testcontainers(disabledWithoutDocker = true)
169
public abstract class AbstractIntegrationTest {
1710

1811
private static final String DOCKER_IMAGE = "amazon/dynamodb-local";
1912
private static final String DOCKER_TAG = "latest";
2013
private static final int EXPOSED_PORT = 8000;
2114

22-
@ClassRule
23-
public static GenericContainer dynamodb =
24-
new GenericContainer(String.format("%s:%s", DOCKER_IMAGE, DOCKER_TAG)).withExposedPorts(EXPOSED_PORT);
15+
static {
16+
GenericContainer dynamodb =
17+
new GenericContainer(String.format("%s:%s", DOCKER_IMAGE, DOCKER_TAG)).withExposedPorts(EXPOSED_PORT);
18+
dynamodb.start();
2519

26-
public static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
27-
@Override
28-
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
29-
String endpoint = String.format("aws.dynamo.endpoint=http://%s:%s",
30-
dynamodb.getContainerIpAddress(),
31-
dynamodb.getMappedPort(EXPOSED_PORT));
32-
33-
TestPropertyValues.of(endpoint).applyTo(configurableApplicationContext);
34-
}
20+
final String endpoint = String.format("http://%s:%s",
21+
dynamodb.getContainerIpAddress(),
22+
dynamodb.getMappedPort(EXPOSED_PORT));
23+
System.setProperty("aws.dynamo.endpoint", endpoint);
3524
}
3625
}

SpringBootDynamo/src/test/java/com/example/SpringBootDynamoApplicationTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
44
import com.amazonaws.services.dynamodbv2.model.*;
5-
import org.junit.After;
6-
import org.junit.Before;
7-
import org.junit.Test;
5+
import org.junit.jupiter.api.AfterEach;
6+
import org.junit.jupiter.api.BeforeEach;
7+
import org.junit.jupiter.api.Test;
88
import org.springframework.beans.factory.annotation.Autowired;
99

1010
import java.util.Arrays;
@@ -20,7 +20,7 @@ public class SpringBootDynamoApplicationTests extends AbstractIntegrationTest {
2020
@Autowired
2121
private AmazonDynamoDB dynamoDB;
2222

23-
@Before
23+
@BeforeEach
2424
public void setup() {
2525
dynamoDB.createTable(new CreateTableRequest()
2626
.withTableName(TABLE_NAME)
@@ -141,7 +141,7 @@ public void setup() {
141141
}
142142

143143

144-
@After
144+
@AfterEach
145145
public void clear() {
146146
dynamoDB.deleteTable("test");
147147
}

0 commit comments

Comments
 (0)