Skip to content

Commit c504270

Browse files
committed
Update testcontainers
1 parent 780b6da commit c504270

File tree

2 files changed

+22
-15
lines changed

2 files changed

+22
-15
lines changed

build.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ crossScalaVersions := List("2.12.20", "2.13.17", "3.3.7")
88

99
libraryDependencies ++= Seq(
1010
"com.typesafe.slick" %% "slick" % "3.6.1",
11-
"com.dimafeng" %% "testcontainers-scala" % "0.43.0" % "test",
12-
"org.testcontainers" % "mysql" % "1.21.3" % "test",
11+
"org.testcontainers" % "testcontainers-mysql" % "2.0.1" % "test",
1312
"com.mysql" % "mysql-connector-j" % "9.4.0" % "test",
1413
"org.scalatest" %% "scalatest-funsuite" % "3.2.19" % "test",
1514
"com.h2database" % "h2" % "1.4.192" % "test",

src/test/scala/com/github/takezoe/slick/blocking/SlickBlockingAPISpec.scala

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package com.github.takezoe.slick.blocking
22

3-
import com.dimafeng.testcontainers.Container
4-
import com.dimafeng.testcontainers.ForAllTestContainer
5-
import com.dimafeng.testcontainers.JdbcDatabaseContainer
6-
import com.dimafeng.testcontainers.MySQLContainer
3+
import org.scalatest.BeforeAndAfterAll
74
import org.scalatest.funsuite.AnyFunSuite
5+
import org.testcontainers.containers.JdbcDatabaseContainer
6+
import org.testcontainers.mysql.MySQLContainer
87
import org.testcontainers.utility.DockerImageName
9-
import slick.jdbc.JdbcBackend
108
import slick.jdbc.meta.MTable
119
import scala.concurrent.Await
1210
import scala.concurrent.ExecutionContext
@@ -24,21 +22,31 @@ class SlickBlockingAPISpecMySQL56 extends SlickBlockingAPISpecMySQL("5.6")
2422

2523
abstract class SlickBlockingAPISpecMySQL(mysqlVersion: String)
2624
extends SlickBlockingAPISpecTestContainer(
27-
MySQLContainer(mysqlImageVersion = DockerImageName.parse("mysql:" + mysqlVersion)),
25+
new MySQLContainer(DockerImageName.parse("mysql:" + mysqlVersion)),
2826
BlockingMySQLDriver
2927
)
3028

3129
abstract class SlickBlockingAPISpecTestContainer(
32-
override val container: JdbcDatabaseContainer & Container,
30+
container: JdbcDatabaseContainer[?],
3331
profile: BlockingJdbcProfile
3432
) extends SlickBlockingAPISpec(profile)
35-
with ForAllTestContainer {
33+
with BeforeAndAfterAll {
3634

37-
override lazy val db = Tables.profile.blockingApi.Database.forURL(
38-
url = container.jdbcUrl,
39-
user = container.username,
40-
password = container.password,
41-
driver = container.driverClassName
35+
override def beforeAll(): Unit = {
36+
super.beforeAll()
37+
container.start()
38+
}
39+
40+
override def afterAll(): Unit = {
41+
super.afterAll()
42+
container.stop()
43+
}
44+
45+
lazy val db = Tables.profile.blockingApi.Database.forURL(
46+
url = container.getJdbcUrl,
47+
user = container.getUsername,
48+
password = container.getPassword,
49+
driver = container.getDriverClassName
4250
)
4351

4452
}

0 commit comments

Comments
 (0)