Skip to content

Commit 62e38c4

Browse files
author
Guilherme Biff Zarelli
committed
fix: flyway in accept test
1 parent 82db071 commit 62e38c4

File tree

2 files changed

+12
-63
lines changed

2 files changed

+12
-63
lines changed

acceptance-test/Dockerfile

Lines changed: 0 additions & 52 deletions
This file was deleted.

acceptance-test/src/test/java/br/com/helpdev/atdd/AbstractContainerBaseTest.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
package br.com.helpdev.atdd;
22

33
import io.restassured.RestAssured;
4+
import org.slf4j.LoggerFactory;
45
import org.testcontainers.containers.GenericContainer;
56
import org.testcontainers.containers.MySQLContainer;
67
import org.testcontainers.containers.Network;
8+
import org.testcontainers.containers.output.Slf4jLogConsumer;
79
import org.testcontainers.containers.wait.strategy.Wait;
810
import org.testcontainers.utility.MountableFile;
911

1012
abstract class AbstractContainerBaseTest {
1113

1214
private static final GenericContainer<?> APP;
1315
private static final GenericContainer<?> FLYWAY;
14-
private static final MySQLContainer<?> MY_SQL_CONTAINER;
16+
private static final GenericContainer<?> MY_SQL_CONTAINER;
1517

1618
static {
1719
final var network = Network.newNetwork();
1820

19-
MY_SQL_CONTAINER = (MySQLContainer) new MySQLContainer("mysql:5.7.22")
21+
MY_SQL_CONTAINER = new MySQLContainer<>("mysql:5.7.22")
2022
.withNetwork(network)
2123
.withNetworkAliases("testdb");
2224

23-
FLYWAY = new GenericContainer("flyway/flyway")
25+
FLYWAY = new GenericContainer<>("flyway/flyway")
2426
.dependsOn(MY_SQL_CONTAINER)
2527
.withNetwork(network)
26-
.withCopyFileToContainer(MountableFile.forHostPath("../resources/flyway/db/"), "/flyway/sql")
27-
.withCommand("-url=jdbc:mysql://testdb -schemas=test -user=test -password=test -connectRetries=60 migrate")
28-
.waitingFor(
29-
Wait.forLogMessage("(?s).*No migration necessary(?s).*|(?s).*Successfully applied(?s).*", 1)
30-
);
28+
.withCopyFileToContainer(MountableFile.forHostPath("../resources/flyway/db"), "/flyway/sql")
29+
.withCommand("-url=jdbc:mysql://testdb?useSSL=false -schemas=test -user=test -password=test -connectRetries=60 migrate")
30+
.waitingFor(Wait.forLogMessage("(?s).*No migration necessary(?s).*|(?s).*Successfully applied(?s).*", 1))
31+
.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("FLYWAY")));
3132

32-
APP = new GenericContainer("app-test:integration")
33+
APP = new GenericContainer<>("app-test:integration")
3334
.dependsOn(MY_SQL_CONTAINER, FLYWAY)
3435
.withNetwork(network)
3536
.withEnv("MYSQL_USER", "test")
3637
.withEnv("MYSQL_PASSWORD", "test")
3738
.withEnv("MYSQL_URL", "jdbc:mysql://testdb:" + MySQLContainer.MYSQL_PORT + "/test?autoReconnect=true&useSSL=false")
3839
.withExposedPorts(8080)
39-
.waitingFor(Wait.forHttp("/health/ready")
40-
.forStatusCode(200));
40+
.waitingFor(Wait.forHttp("/health/ready").forStatusCode(200))
41+
.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("APP_CONTAINER")));
4142

4243
MY_SQL_CONTAINER.start();
4344
FLYWAY.start();

0 commit comments

Comments
 (0)