🚑️ Remove accidental StackOverflow on beforeSpec (#98)

kotest · Jun 27, 2023 · cf08e8d · cf08e8d
1 parent 6ef6af8
commit cf08e8d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/kotlin/io/kotest/extensions/testcontainers/ContainerExtension.kt b/src/main/kotlin/io/kotest/extensions/testcontainers/ContainerExtension.kt
@@ -53,7 +53,7 @@ import org.testcontainers.containers.GenericContainer
  * @param afterShutdown a callback that is invoked only once, just after the container is stopped.
  * If the container is never started, this callback will not be invoked.
  */
-class ContainerExtension<T : GenericContainer<T>>(
+class ContainerExtension<T : GenericContainer<*>>(
    private val container: T,
    private val mode: ContainerLifecycleMode = ContainerLifecycleMode.Project,
    private val beforeStart: () -> Unit = {},
@@ -86,19 +86,19 @@ class ContainerExtension<T : GenericContainer<T>>(
    }
 
    override suspend fun beforeTest(testCase: TestCase) {
-      beforeTest(testCase)
+      beforeTest.invoke(testCase)
    }
 
    override suspend fun afterTest(testCase: TestCase, result: TestResult) {
       afterTest(testCase)
    }
 
    override suspend fun beforeSpec(spec: Spec) {
-      beforeSpec(spec)
+      beforeSpec.invoke(spec)
    }
 
    override suspend fun afterSpec(spec: Spec) {
-      afterSpec(spec)
+      afterSpec.invoke(spec)
       if (mode == ContainerLifecycleMode.Spec && container.isRunning) close()
    }
 

diff --git a/src/test/kotlin/io/kotest/extensions/testcontainers/SharedTestContainerExtensionTest.kt b/src/test/kotlin/io/kotest/extensions/testcontainers/SharedTestContainerExtensionTest.kt
@@ -11,14 +11,14 @@ private val container = GenericContainer("redis:5.0.3-alpine").apply {
    withExposedPorts(6379)
 }
 
-private val ext = SharedTestContainerExtension(container) {
-   JedisPool(container.host, container.firstMappedPort)
-}
+private val ext = ContainerExtension(container)
 
 class SharedTestContainerExtensionTest1 : FunSpec() {
    init {
 
-      val jedis = install(ext)
+      val installed = install(ext)
+      val jedis = JedisPool(installed.host, installed.firstMappedPort)
+
 
       test("should be initialized in the spec") {
          jedis.resource.set("foo", "bar")
@@ -34,7 +34,8 @@ class SharedTestContainerExtensionTest1 : FunSpec() {
 class SharedTestContainerExtensionTest2 : FunSpec() {
    init {
 
-      val jedis = install(ext)
+      val installed = install(ext)
+      val jedis = JedisPool(installed.host, installed.firstMappedPort)
 
       test("this spec should share the container") {
          jedis.resource.get("foo") shouldBe "bar"