[testtoolkit] 优化Testcontainers相关测试

-  增强TestcontainersVerificationTest测试覆盖
-  完善TestcontainersPropertiesIntegrationTest集成测试
-  改进TestcontainersPropertiesTest单元测试

Author: TrueNine

testtoolkit/src/test/kotlin/io/github/truenine/composeserver/testtoolkit/TestcontainersVerificationTest.kt

@@ -14,6 +14,7 @@ import kotlinx.coroutines.selects.select
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertTimeout
 import org.testcontainers.containers.GenericContainer
+import org.testcontainers.containers.MySQLContainer
 import org.testcontainers.containers.PostgreSQLContainer
 import org.testcontainers.containers.output.Slf4jLogConsumer
 import org.testcontainers.utility.MountableFile
@@ -23,7 +24,7 @@ class TestcontainersVerificationTest {
   fun `启动 Alpine 容器 输出日志并校验运行状态`() {
     log.info("开始测试 Testcontainers")
 
-    GenericContainer("alpine:latest")
+    GenericContainer("alpine:3.21")
       .apply {
         // 增加容器运行时间，确保有足够时间进行日志检查
         // 使用 flush 确保输出立即写入，避免缓冲延迟
@@ -153,6 +154,37 @@ class TestcontainersVerificationTest {
       }
   }
 
+  @Test
+  fun `启动 MySQL 容器 获取连接信息并校验运行状态`() {
+    log.info("开始测试 MySQL 容器")
+
+    MySQLContainer<Nothing>("mysql:8.0")
+      .apply {
+        withDatabaseName("testdb")
+        withUsername("testuser")
+        withPassword("testpass")
+        withEnv("MYSQL_ROOT_PASSWORD", "rootpass")
+        withExposedPorts(3306)
+        withLogConsumer(Slf4jLogConsumer(log))
+        withStartupTimeout(Duration.ofSeconds(120)) // 增加启动超时时间
+      }
+      .use { mysql ->
+        log.info("正在启动 MySQL 容器...")
+        mysql.start()
+
+        // 使用重试机制等待容器完全就绪
+        TestRetryUtils.waitUntil(timeout = Duration.ofSeconds(30), pollInterval = Duration.ofSeconds(1)) { mysql.isRunning && mysql.jdbcUrl.isNotEmpty() }
+
+        assertTrue(mysql.isRunning, "MySQL 容器应该处于运行状态")
+        log.info("MySQL 连接 URL: ${mysql.jdbcUrl}")
+        log.info("MySQL 用户名: ${mysql.username}")
+        log.info("MySQL 密码: ${mysql.password}")
+
+        val expectedJdbcUrlPrefix = "jdbc:mysql://"
+        assertTrue(mysql.jdbcUrl.startsWith(expectedJdbcUrlPrefix), "JDBC URL 应该以 $expectedJdbcUrlPrefix 开头")
+      }
+  }
+
   @Test
   fun `并发测试多个网址 任一完成即结束`() {
     assertTimeout(Duration.ofSeconds(20), "可能由于docker 网络原因导致测试失败，考虑检查 docker 网络配置") {
@@ -161,7 +193,7 @@ class TestcontainersVerificationTest {
 
         val urls = listOf("https://www.aliyun.com", "https://www.tencent.com", "https://www.baidu.com", "https://www.qq.com")
 
-        GenericContainer("alpine/curl:latest")
+        GenericContainer("curlimages/curl:8.1.0")
           .apply {
             withCommand("sleep", "30") // 增加容器运行时间
           }

testtoolkit/src/test/kotlin/io/github/truenine/composeserver/testtoolkit/autoconfig/TestcontainersPropertiesIntegrationTest.kt

@@ -36,9 +36,10 @@ class TestcontainersPropertiesIntegrationTest {
     @Test
     fun should_inject_properties_with_defaults() {
       assertNotNull(testcontainersProperties)
-      assertEquals("postgres:17.4-alpine", testcontainersProperties.postgres.image)
-      assertEquals("redis:7.4.2-alpine3.21", testcontainersProperties.redis.image)
-      assertEquals("minio/minio:RELEASE.2025-04-22T22-12-26Z", testcontainersProperties.minio.image)
+      assertEquals("postgres:17-alpine", testcontainersProperties.postgres.image)
+      assertEquals("mysql:8.0", testcontainersProperties.mysql.image)
+      assertEquals("redis:7-alpine", testcontainersProperties.redis.image)
+      assertEquals("minio/minio:RELEASE.2025-07-23T15-54-02Z", testcontainersProperties.minio.image)
     }
   }
 
@@ -56,6 +57,8 @@ class TestcontainersPropertiesIntegrationTest {
       [
         "compose.testtoolkit.testcontainers.postgres.image=postgres:16-alpine",
         "compose.testtoolkit.testcontainers.postgres.database-name=customdb",
+        "compose.testtoolkit.testcontainers.mysql.image=mysql:8.1",
+        "compose.testtoolkit.testcontainers.mysql.database-name=mysqlcustomdb",
         "compose.testtoolkit.testcontainers.redis.image=redis:7.2-alpine",
         "compose.testtoolkit.testcontainers.minio.image=minio/minio:RELEASE.2024-01-01T00-00-00Z",
         "compose.testtoolkit.testcontainers.minio.access-key=customkey",
@@ -74,6 +77,13 @@ class TestcontainersPropertiesIntegrationTest {
       assertEquals("customdb", testcontainersProperties.postgres.databaseName)
       assertEquals("test", testcontainersProperties.postgres.username) // 保持默认值
 
+      // 验证自定义 MySQL 配置
+      assertEquals("mysql:8.1", testcontainersProperties.mysql.image)
+      assertEquals("mysqlcustomdb", testcontainersProperties.mysql.databaseName)
+      assertEquals("test", testcontainersProperties.mysql.username) // 保持默认值
+      assertEquals("test", testcontainersProperties.mysql.password) // 保持默认值
+      assertEquals("roottest", testcontainersProperties.mysql.rootPassword) // 保持默认值
+
       // 验证自定义 Redis 配置
       assertEquals("redis:7.2-alpine", testcontainersProperties.redis.image)
 

testtoolkit/src/test/kotlin/io/github/truenine/composeserver/testtoolkit/autoconfig/TestcontainersPropertiesTest.kt

@@ -1,6 +1,7 @@
 package io.github.truenine.composeserver.testtoolkit.autoconfig
 
 import io.github.truenine.composeserver.testtoolkit.properties.MinioConfig
+import io.github.truenine.composeserver.testtoolkit.properties.MysqlConfig
 import io.github.truenine.composeserver.testtoolkit.properties.PostgresConfig
 import io.github.truenine.composeserver.testtoolkit.properties.RedisConfig
 import io.github.truenine.composeserver.testtoolkit.properties.TestcontainersProperties
@@ -18,24 +19,35 @@ class TestcontainersPropertiesTest {
     fun should_have_correct_default_postgres_config() {
       val properties = TestcontainersProperties()
 
-      assertEquals("postgres:17.4-alpine", properties.postgres.image)
+      assertEquals("postgres:17-alpine", properties.postgres.image)
       assertEquals("testdb", properties.postgres.databaseName)
       assertEquals("test", properties.postgres.username)
       assertEquals("test", properties.postgres.password)
     }
 
+    @Test
+    fun should_have_correct_default_mysql_config() {
+      val properties = TestcontainersProperties()
+
+      assertEquals("mysql:8.0", properties.mysql.image)
+      assertEquals("testdb", properties.mysql.databaseName)
+      assertEquals("test", properties.mysql.username)
+      assertEquals("test", properties.mysql.password)
+      assertEquals("roottest", properties.mysql.rootPassword)
+    }
+
     @Test
     fun should_have_correct_default_redis_config() {
       val properties = TestcontainersProperties()
 
-      assertEquals("redis:7.4.2-alpine3.21", properties.redis.image)
+      assertEquals("redis:7-alpine", properties.redis.image)
     }
 
     @Test
     fun should_have_correct_default_minio_config() {
       val properties = TestcontainersProperties()
 
-      assertEquals("minio/minio:RELEASE.2025-04-22T22-12-26Z", properties.minio.image)
+      assertEquals("minio/minio:RELEASE.2025-07-23T15-54-02Z", properties.minio.image)
       assertEquals("minioadmin", properties.minio.accessKey)
       assertEquals("minioadmin", properties.minio.secretKey)
     }
@@ -55,6 +67,19 @@ class TestcontainersPropertiesTest {
       assertEquals("custompass", properties.postgres.password)
     }
 
+    @Test
+    fun should_accept_custom_mysql_config() {
+      val customMysql =
+        MysqlConfig(image = "mysql:8.1", databaseName = "customdb", username = "customuser", password = "custompass", rootPassword = "customroot")
+      val properties = TestcontainersProperties(mysql = customMysql)
+
+      assertEquals("mysql:8.1", properties.mysql.image)
+      assertEquals("customdb", properties.mysql.databaseName)
+      assertEquals("customuser", properties.mysql.username)
+      assertEquals("custompass", properties.mysql.password)
+      assertEquals("customroot", properties.mysql.rootPassword)
+    }
+
     @Test
     fun should_accept_custom_redis_config() {
       val customRedis = RedisConfig(image = "redis:7.2-alpine")