#430: Split runTest to runTimeZoneTests and runAllTests

Author: DmitryNekrasov

core/jvm/test/testcontainers/TimeZoneConfigurationTest.kt

@@ -8,18 +8,40 @@ package testcontainers
 import org.junit.jupiter.api.BeforeAll
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.MethodSource
+import org.junit.jupiter.api.Test
 import org.slf4j.LoggerFactory
+import org.testcontainers.containers.Container.ExecResult
 
 @Testcontainers
 class TimeZoneConfigurationTest {
 
-    @ParameterizedTest
-    @MethodSource("containers")
-    fun test(container: TimezoneTestContainer) {
-        val execResult = container.runTest()
+    @Container
+    private val defaultTimeZoneContainer = createTimezoneTestContainer("default")
 
+    @Container
+    private val customTimeZoneContainer = createTimezoneTestContainer("custom")
+
+    @Test
+    fun testDefaultContainerTimeZoneTests() {
+        logExecResult(defaultTimeZoneContainer.runTimeZoneTests())
+    }
+
+    @Test
+    fun testCustomContainerTimeZoneTests() {
+        logExecResult(customTimeZoneContainer.runTimeZoneTests())
+    }
+
+    @Test
+    fun testDefaultContainerAllTests() {
+        logExecResult(defaultTimeZoneContainer.runAllTests())
+    }
+
+    @Test
+    fun testCustomContainerAllTests() {
+        logExecResult(customTimeZoneContainer.runAllTests())
+    }
+
+    private fun logExecResult(execResult: ExecResult) {
         logger.info("Container stdout:\n${execResult.stdout}")
         logger.info("Container stderr:\n${execResult.stderr}")
         logger.info("Container exit code: ${execResult.exitCode}")
@@ -28,19 +50,6 @@ class TimeZoneConfigurationTest {
     companion object {
         private val logger = LoggerFactory.getLogger(TimeZoneConfigurationTest::class.java)
 
-        @JvmStatic
-        @Container
-        val originalContainer = createTimezoneTestContainer("original")
-
-        @JvmStatic
-        @Container
-        val modifiedContainer = createTimezoneTestContainer("modified")
-
-        @JvmStatic
-        fun containers(): List<TimezoneTestContainer> {
-            return listOf(originalContainer, modifiedContainer)
-        }
-
         @JvmStatic
         @BeforeAll
         fun buildTestBinary() {

core/jvm/test/testcontainers/TimezoneTestContainer.kt

@@ -20,19 +20,31 @@ class TimezoneTestContainer(dockerfilePath: Path, binaryDir: String, imageName:
         withFileSystemBind(binaryDir, "/app", BindMode.READ_WRITE)
     }
 
-    fun runTest(): ExecResult {
-        return execInContainer(
-            "bash",
-            "-c",
-            "chmod +x /app/test.kexe && /app/test.kexe --ktest_filter=kotlinx.datetime.test.TimeZoneLinuxNativeTest.*"
-        )
+    fun runTimeZoneTests(): ExecResult {
+        return executeTest("--ktest_filter=kotlinx.datetime.test.TimeZoneLinuxNativeTest.*")
+    }
+
+    fun runAllTests(): ExecResult {
+        return executeTest()
+    }
+
+    private fun executeTest(testFilter: String? = null): ExecResult {
+        val command = buildString {
+            append("chmod +x /app/test.kexe && /app/test.kexe")
+            testFilter?.also {
+                append(" ")
+                append(it)
+            }
+        }
+
+        return execInContainer("bash", "-c", command)
     }
 }
 
-fun createTimezoneTestContainer(typeName: String): TimezoneTestContainer {
+fun createTimezoneTestContainer(configType: String): TimezoneTestContainer {
     return TimezoneTestContainer(
-        Paths.get("./jvm/test/testcontainers/$typeName/Dockerfile"),
+        Paths.get("./jvm/test/testcontainers/$configType/Dockerfile"),
         "./build/bin/linuxArm64/debugTest/",
-        "ubuntu-arctic-longyearbyen-$typeName"
+        "ubuntu-arctic-longyearbyen-$configType"
     )
 }