Skip to content

Commit 5c7dab6

Browse files
committed
tests: change implementation to use enum
Signed-off-by: Maximillian Arruda <[email protected]>
1 parent 17f098a commit 5c7dab6

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/communication/DynamoDBKeyValueEntityManagerTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939

4040
@EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
4141
public class DynamoDBKeyValueEntityManagerTest {
42-
43-
private BucketManager keyValueEntityManager;
42+
43+
private BucketManager keyValueEntityManager;
4444

4545
private BucketManagerFactory keyValueEntityManagerFactory;
46-
46+
4747
private DynamoDBKeyValueConfiguration configuration;
4848

4949
private User userOtavio = new User("otavio");
@@ -54,7 +54,7 @@ public class DynamoDBKeyValueEntityManagerTest {
5454

5555
@BeforeEach
5656
public void init() {
57-
keyValueEntityManagerFactory = DynamoDBTestUtils.get();
57+
keyValueEntityManagerFactory = DynamoDBTestUtils.INSTANCE.get();
5858
keyValueEntityManager = keyValueEntityManagerFactory.apply("users-entity");
5959
}
6060

@@ -115,10 +115,10 @@ public void shouldRemoveMultiKey() {
115115
Iterable<Value> users = values;
116116
assertEquals(0L, StreamSupport.stream(keyValueEntityManager.get(keys).spliterator(), false).count());
117117
}
118-
118+
119119
@AfterAll
120120
public static void shutDown() {
121-
DynamoDBTestUtils.shutDown();
121+
DynamoDBTestUtils.INSTANCE.shutDown();
122122
}
123123

124124
}

jnosql-dynamodb/src/test/java/org/eclipse/jnosql/databases/dynamodb/communication/DynamoDBTestUtils.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@
1717
import org.eclipse.jnosql.communication.Settings;
1818
import org.eclipse.jnosql.communication.keyvalue.BucketManagerFactory;
1919
import org.testcontainers.containers.GenericContainer;
20+
import org.testcontainers.containers.wait.strategy.Wait;
21+
import org.testcontainers.containers.wait.strategy.WaitStrategy;
2022

21-
public class DynamoDBTestUtils {
23+
import java.util.function.Supplier;
2224

23-
private static GenericContainer dynamodb =
24-
new GenericContainer("amazon/dynamodb-local:latest")
25-
.withExposedPorts(8000)
26-
.withEnv("AWS_ACCESS_KEY_ID", "aws --profile default configure get aws_access_key_id")
27-
.withEnv("AWS_SECRET_ACCESS_KEY", "aws --profile default configure get aws_secret_access_key");
28-
//.withCommand("--rm");
25+
public enum DynamoDBTestUtils implements Supplier<BucketManagerFactory> {
2926

30-
// .waitingFor(Wait.forHttp("/")
31-
// .forStatusCode(200));
27+
INSTANCE;
3228

29+
private final GenericContainer dynamodb =
30+
new GenericContainer("amazon/dynamodb-local:latest")
31+
.withExposedPorts(8000)
32+
.waitingFor(Wait.defaultWaitStrategy());
3333

34-
public static BucketManagerFactory get() {
34+
public BucketManagerFactory get() {
3535
dynamodb.start();
3636
DynamoDBKeyValueConfiguration configuration = new DynamoDBKeyValueConfiguration();
3737
String endpoint = "http://" + dynamodb.getHost() + ":" + dynamodb.getFirstMappedPort();
3838
return configuration.apply(Settings.builder()
3939
.put(DynamoDBConfigurations.ENDPOINT, endpoint).build());
4040
}
4141

42-
public static void shutDown() {
42+
public void shutDown() {
4343
dynamodb.close();
4444
}
4545
}

0 commit comments

Comments
 (0)