diff --git a/http4k-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt b/http4k-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt index 6108f60..0b2c55a 100644 --- a/http4k-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt +++ b/http4k-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt @@ -13,7 +13,7 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.rogervinas.GreetingApplication.Companion.SERVER_PORT import org.rogervinas.GreetingApplication.Companion.greetingApplication -import org.testcontainers.containers.DockerComposeContainer +import org.testcontainers.containers.ComposeContainer import org.testcontainers.containers.wait.strategy.Wait.forLogMessage import org.testcontainers.junit.jupiter.Container import org.testcontainers.junit.jupiter.Testcontainers @@ -25,7 +25,7 @@ class GreetingApplicationTest { companion object { @Container private val container = - DockerComposeContainer(File("../docker-compose.yaml")) + ComposeContainer(File("../docker-compose.yaml")) .withServices("db", "vault", "vault-cli") .withLocalCompose(true) .waitingFor("db", forLogMessage(".*database system is ready to accept connections.*", 1)) diff --git a/ktor-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt b/ktor-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt index a0634f6..dbac847 100644 --- a/ktor-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt +++ b/ktor-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt @@ -5,7 +5,7 @@ import io.ktor.client.statement.bodyAsText import io.ktor.http.HttpStatusCode.Companion.OK import io.ktor.server.testing.testApplication import org.assertj.core.api.Assertions.assertThat -import org.testcontainers.containers.DockerComposeContainer +import org.testcontainers.containers.ComposeContainer import org.testcontainers.containers.wait.strategy.Wait.forLogMessage import org.testcontainers.junit.jupiter.Container import org.testcontainers.junit.jupiter.Testcontainers @@ -17,7 +17,7 @@ class GreetingApplicationTest { companion object { @Container private val container = - DockerComposeContainer(File("../docker-compose.yaml")) + ComposeContainer(File("../docker-compose.yaml")) .withServices("db", "vault", "vault-cli") .withLocalCompose(true) .waitingFor("db", forLogMessage(".*database system is ready to accept connections.*", 1)) diff --git a/springboot-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt b/springboot-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt index 98a1dcc..e2e2039 100644 --- a/springboot-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt +++ b/springboot-app/src/test/kotlin/org/rogervinas/GreetingApplicationTest.kt @@ -7,7 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT import org.springframework.test.web.reactive.server.WebTestClient import org.springframework.test.web.reactive.server.expectBody -import org.testcontainers.containers.DockerComposeContainer +import org.testcontainers.containers.ComposeContainer import org.testcontainers.containers.wait.strategy.Wait.forLogMessage import org.testcontainers.junit.jupiter.Container import org.testcontainers.junit.jupiter.Testcontainers @@ -19,7 +19,7 @@ class GreetingApplicationTest { companion object { @Container private val container = - DockerComposeContainer(File("../docker-compose.yaml")) + ComposeContainer(File("../docker-compose.yaml")) .withServices("db", "vault", "vault-cli") .withLocalCompose(true) .waitingFor("db", forLogMessage(".*database system is ready to accept connections.*", 1))