Merge pull request #71 from xuwei-k/testcontainers

use testcontainers

Author: seratch

.travis.yml

@@ -9,14 +9,6 @@ sudo: false
 script:
 - sbt "++ ${TRAVIS_SCALA_VERSION}!" test
 - git diff --exit-code # check scalariform
-addons:
-  postgresql: '9.3'
 before_script:
 - rm project/pgp.sbt && rm project/sbt-updates.sbt && rm project/sonatype.sbt
 - git add . --all
-- psql -c "CREATE ROLE sa WITH SUPERUSER LOGIN PASSWORD 'sa';" -U postgres
-- psql -c "CREATE DATABASE scalikejdbc;" -U postgres
-- psql -c "CREATE DATABASE scalikejdbc2;" -U postgres
-- mysql -e 'GRANT ALL ON *.* TO sa@"localhost"IDENTIFIED BY "sa";FLUSH PRIVILEGES;'
-  -uroot
-- mysql -e "CREATE DATABASE scalikejdbc;" -usa -psa

build.sbt

@@ -2,6 +2,7 @@ lazy val _version = "0.11.1-SNAPSHOT"
 lazy val scalikejdbcVersion = "3.3.5"
 lazy val mauricioVersion = "0.2.21" // provided
 lazy val postgresqlVersion = "42.2.2"
+lazy val testContainer = "1.11.3"
 val Scala211 = "2.11.12"
 val Scala212 = "2.12.8"
 
@@ -24,6 +25,9 @@ lazy val core = (project in file("core")).settings(
        "org.scalikejdbc"     %% "scalikejdbc-joda-time"             % scalikejdbcVersion % "test",
        "com.github.mauricio" %% "postgresql-async"                  % mauricioVersion    % "provided",
        "com.github.mauricio" %% "mysql-async"                       % mauricioVersion    % "provided",
+       "com.dimafeng"        %% "testcontainers-scala"              % "0.27.0"           % "test",
+       "org.testcontainers"  %  "mysql"                             % testContainer      % "test",
+       "org.testcontainers"  %  "postgresql"                        % testContainer      % "test",
        "org.postgresql"      %  "postgresql"                        % postgresqlVersion  % "test",
        "mysql"               %  "mysql-connector-java"              % "5.1.+"            % "test",
        "org.scalatest"       %% "scalatest"                         % "3.0.+"            % "test",

core/src/test/scala/programmerlist/ExampleSpec.scala

@@ -64,10 +64,11 @@ class ExampleSpec extends FlatSpec with Matchers with DBSettings with Logging {
   it should "work for more than pool size items" in {
 
     val MaxPoolSize = 2
-    AsyncConnectionPool.add('test, "jdbc:postgresql://localhost:5432/scalikejdbc", "sa", "sa",
+    val name = Symbol("test")
+    AsyncConnectionPool.add(name, postgres.jdbcUrl, postgres.username, postgres.password,
       AsyncConnectionPoolSettings(maxPoolSize = MaxPoolSize))
 
-    implicit val session = NamedAsyncDB('test).sharedSession
+    implicit val session = NamedAsyncDB(name).sharedSession
 
     val futureProgrammers = Future.sequence((1 to MaxPoolSize * 2) map { i => Programmer.create(s"p$i", Some(1)) })
     val programmers = Await.result(futureProgrammers, 5.seconds)

core/src/test/scala/unit/DBSettings.scala

@@ -1,36 +1,34 @@
 package unit
 
-import scalikejdbc._, async._
-
-trait DBSettings {
-  DBSettings.initialize()
-}
-
-object DBSettings {
-
-  private var isInitialized = false
-
-  def initialize(): Unit = this.synchronized {
-    if (isInitialized) return
+import scalikejdbc._
+import async._
+import com.dimafeng.testcontainers.{ ForAllTestContainer, MultipleContainers, MySQLContainer, PostgreSQLContainer }
+import org.scalatest.Suite
+
+trait DBSettings extends ForAllTestContainer { self: Suite =>
+  // TODO update mysql version
+  protected[this] final val mysql = MySQLContainer(mysqlImageVersion = "mysql:5.6.44")
+  protected[this] final val postgres = PostgreSQLContainer("postgres:11.4")
+  override val container = MultipleContainers(mysql, postgres)
+
+  override def afterStart(): Unit = {
     GlobalSettings.loggingSQLErrors = false
 
     // default: PostgreSQL
-    ConnectionPool.singleton("jdbc:postgresql://localhost:5432/scalikejdbc", "sa", "sa")
-    AsyncConnectionPool.singleton("jdbc:postgresql://localhost:5432/scalikejdbc", "sa", "sa")
+    ConnectionPool.singleton(url = postgres.jdbcUrl, user = postgres.username, password = postgres.password)
+    AsyncConnectionPool.singleton(url = postgres.jdbcUrl, user = postgres.username, password = postgres.password)
 
     SampleDBInitializer.initPostgreSQL()
     PgListDBInitializer.initPostgreSQL()
 
     // MySQL
-    ConnectionPool.add('mysql, "jdbc:mysql://localhost:3306/scalikejdbc", "sa", "sa")
-    AsyncConnectionPool.add('mysql, "jdbc:mysql://localhost:3306/scalikejdbc", "sa", "sa")
+    ConnectionPool.add(Symbol("mysql"), url = mysql.jdbcUrl, user = mysql.username, password = mysql.password)
+    AsyncConnectionPool.add(Symbol("mysql"), url = mysql.jdbcUrl, user = mysql.username, password = mysql.password)
 
     SampleDBInitializer.initMySQL()
     PgListDBInitializer.initMySQL()
     PersonDBInitializer.initMySQL()
     AccountDBInitializer.initMySQL()
-
-    isInitialized = true
   }
 
 }