fix tests

laserdisc-io · May 15, 2024 · c9238ea · c9238ea
1 parent f9d38f7
commit c9238ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/...og-stream-models/src/test/scala/io/laserdisc/mysql/binlog/models/SchemaMetadataTest.scala b/...og-stream-models/src/test/scala/io/laserdisc/mysql/binlog/models/SchemaMetadataTest.scala
@@ -1,29 +1,25 @@
 package io.laserdisc.mysql.binlog.models
 
 import cats.effect.IO
-import com.dimafeng.testcontainers.{Container, ForAllTestContainer}
+import cats.effect.unsafe.implicits.global
+import com.dimafeng.testcontainers.ForAllTestContainer
 import db.MySqlContainerTest
 import doobie.util.transactor.Transactor
 import doobie.util.transactor.Transactor.Aux
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import cats.effect.unsafe.implicits.global
 
 class SchemaMetadataTest extends AnyWordSpec with ForAllTestContainer with MySqlContainerTest with Matchers {
 
   "Schema Metadata" should {
 
     "restore schema state from DB" in {
 
-      val props = new java.util.Properties()
-      props.put("user", container.username)
-      props.put("password", container.username)
-
       implicit val testTransactor: Aux[IO, Unit] =
         Transactor.fromDriverManager[IO](
           mySQLContainer.driverClassName,
           s"${mySQLContainer.jdbcUrl}?useSSL=false",
-          props,
+          mysqlDBCreds,
           None
         )
       val schemaState =

diff --git a/mysql-binlog-stream-shared/src/test/scala/db/MySqlContainerTest.scala b/mysql-binlog-stream-shared/src/test/scala/db/MySqlContainerTest.scala
@@ -43,6 +43,12 @@ trait MySqlContainerTest extends TestContainersForAll with BeforeAndAfterEach {
     this.container.withInitScript("init.sql")
 
   }
+  protected lazy val mysqlDBCreds = {
+    val props = new java.util.Properties()
+    props.put("user", container.username)
+    props.put("password", container.password)
+    props
+  }
 
   implicit val ec: ExecutionContext = Implicits.global
 
@@ -52,11 +58,11 @@ trait MySqlContainerTest extends TestContainersForAll with BeforeAndAfterEach {
     val uri      = URI.create(cleanURI)
 
     BinLogConfig(
-      uri.getHost,
-      uri.getPort,
-      mySQLContainer.username,
-      mySQLContainer.password,
-      mySQLContainer.databaseName,
+      host = uri.getHost,
+      port = uri.getPort,
+      user = mySQLContainer.username,
+      password = mySQLContainer.password,
+      schema = mySQLContainer.databaseName,
       useSSL = false,
       poolSize = 3,
       serverId = Some(1234)