@@ -22,26 +22,25 @@ import busymachines.pureharm.db.flyway.FlywayConfig
2222import busymachines .pureharm .effects ._
2323import busymachines .pureharm .effects .implicits ._
2424import busymachines .pureharm .testkit ._
25- import busymachines .pureharm .testkit .util .{MDCKeys , PureharmTestRuntime }
26- import org .scalatest .TestData
25+ import busymachines .pureharm .testkit .util ._
2726
2827/** @author Lorand Szakacs, https://github.com/lorandszakacs
2928 * @since 25 Jun 2020
3029 */
31- trait DBTestSetup [DBTransactor ] {
30+ trait DBTestSetup [DBTransactor ] extends PureharmTestRuntimeLazyConversions {
3231 final type RT = PureharmTestRuntime
3332
3433 implicit class TestSetupClassName (config : DBConnectionConfig ) {
3534
3635 /** @see schemaName
3736 */
38- def withSchemaFromClassAndTest (meta : TestData ): DBConnectionConfig =
39- config.copy(schema = Option (schemaName(meta )))
37+ def withSchemaFromClassAndTest (testOptions : TestOptions ): DBConnectionConfig =
38+ config.copy(schema = Option (schemaName(testOptions )))
4039
4140 /** @see schemaName
4241 */
43- def withSchemaFromClassAndTest (prefix : String , meta : TestData ): DBConnectionConfig =
44- config.copy(schema = Option (schemaName(prefix, meta )))
42+ def withSchemaFromClassAndTest (prefix : String , testOptions : TestOptions ): DBConnectionConfig =
43+ config.copy(schema = Option (schemaName(prefix, testOptions )))
4544 }
4645
4746 /** Should be overridden to create a connection config appropriate for the test
@@ -50,31 +49,37 @@ trait DBTestSetup[DBTransactor] {
5049 * TestSetupClassName.withSchemaFromClassAndTest
5150 * or the explicit variants schemaName
5251 */
53- def dbConfig (meta : TestData )(implicit logger : TestLogger ): DBConnectionConfig
52+ def dbConfig (testOptions : TestOptions )(implicit logger : TestLogger ): DBConnectionConfig
5453
55- // hack to remove unused param error
56- def flywayConfig ( meta : TestData ) : Option [ FlywayConfig ] = Option (meta) >> Option .empty
54+ def flywayConfig ( testOptions : TestOptions )( implicit logger : TestLogger ) : Option [ FlywayConfig ] =
55+ dbConfig(testOptions).schema.map(dbSchema => FlywayConfig .defaultConfig.copy(schemas = List (dbSchema)))
5756
58- protected def dbTransactorInstance (meta : TestData )(implicit rt : RT , logger : TestLogger ): Resource [IO , DBTransactor ]
57+ protected def dbTransactorInstance (
58+ testOptions : TestOptions
59+ )(implicit rt : RT , logger : TestLogger ): Resource [IO , DBTransactor ]
5960
60- def transactor (meta : TestData )(implicit rt : RT , logger : TestLogger ): Resource [IO , DBTransactor ] =
61+ def transactor (testOptions : TestOptions )(implicit rt : RT , logger : TestLogger ): Resource [IO , DBTransactor ] =
6162 for {
62- _ <- logger.info(MDCKeys (meta ))(" SETUP — init" Resource [IO , * ]]
63- schema = dbConfig(meta ).schema.getOrElse(" public"
63+ _ <- logger.info(MDCKeys .testSetup(testOptions ))(" SETUP — init" Resource [IO , * ]]
64+ schema = dbConfig(testOptions ).schema.getOrElse(" public"
6465 _ <-
6566 logger
66- .info(MDCKeys (meta ) ++ Map (" schema" -> schema))(s " SETUP — schema name for test: $schema" )
67+ .info(MDCKeys .testSetup(testOptions ) ++ Map (" schema" -> schema))(s " SETUP — schema name for test: $schema" )
6768 .to[Resource [IO , * ]]
68- _ <- _cleanDB(meta )
69- _ <- _initDB(meta )
70- fixture <- dbTransactorInstance(meta )
69+ _ <- _cleanDB(testOptions )
70+ _ <- _initDB(testOptions )
71+ fixture <- dbTransactorInstance(testOptions )
7172 } yield fixture
7273
73- @ scala.annotation.nowarn
74- protected def _initDB (meta : TestData )(implicit rt : RT , logger : TestLogger ): Resource [IO , Unit ] =
74+ protected def _initDB (testOptions : TestOptions )(implicit rt : RT , logger : TestLogger ): Resource [IO , Unit ] =
7575 for {
76- _ <- logger.info(MDCKeys (meta))(" SETUP — preparing DB" Resource [IO , * ]]
77- migs <- flyway.Flyway .migrate[IO ](dbConfig = dbConfig(meta), flywayConfig(meta)).to[Resource [IO , * ]]
76+ _ <- logger.info(MDCKeys .testSetup(testOptions))(" SETUP — preparing DB" Resource [IO , * ]]
77+ att <- flyway.Flyway
78+ .migrate[IO ](dbConfig = dbConfig(testOptions), flywayConfig(testOptions))
79+ .timedAttempt()
80+ .to[Resource [IO , * ]]
81+ (duration, migsAtt) = att
82+ migs <- migsAtt.liftTo[Resource [IO , * ]]
7883 _ <- (migs <= 0 ).ifTrueRaise[Resource [IO , * ]](
7984 InconsistentStateCatastrophe (
8085 """
@@ -91,44 +96,35 @@ trait DBTestSetup[DBTransactor] {
9196 )
9297 )
9398
94- _ <- logger.info(MDCKeys (meta ))(" SETUP — done preparing DB" Resource [IO , * ]]
99+ _ <- logger.info(MDCKeys .testSetup(testOptions, duration ))(" SETUP — done preparing DB" Resource [IO , * ]]
95100 } yield ()
96101
97- @ scala.annotation.nowarn
98- protected def _cleanDB (meta : TestData )(implicit rt : RT , logger : TestLogger ): Resource [IO , Unit ] =
102+ protected def _cleanDB (meta : TestOptions )(implicit rt : RT , logger : TestLogger ): Resource [IO , Unit ] =
99103 for {
100- _ <- logger.info(MDCKeys (meta))(" SETUP — cleaning DB for a clean slate" Resource [IO , * ]]
104+ _ <- logger.info(MDCKeys .testSetup (meta))(" SETUP — cleaning DB for a clean slate" Resource [IO , * ]]
101105 _ <- flyway.Flyway .clean[IO ](dbConfig(meta)).to[Resource [IO , * ]]
102- _ <- logger.info(MDCKeys (meta))(" SETUP — done cleaning DB" Resource [IO , * ]]
106+ _ <- logger.info(MDCKeys .testSetup (meta))(" SETUP — done cleaning DB" Resource [IO , * ]]
103107 } yield ()
104108
105109 /** @return
106110 * The schema name in the format of:
107- * {getClass.SimpleName()_{testLineNumber Fallback to testName hash if line number not available }}
111+ * $$ {getClass.SimpleName()_$$ {testLineNumber}}
108112 */
109- def schemaName (meta : TestData ): SchemaName =
110- truncateSchemaName(SchemaName (s " ${schemaNameFromClassAndLineNumber(meta )}" ))
113+ def schemaName (testOptions : TestOptions ): SchemaName =
114+ truncateSchemaName(SchemaName (s " ${schemaNameFromClassAndLineNumber(testOptions )}" ))
111115
112116 /** @return
113117 * The schema name in the format of:
114- * prefix_{getClass.SimpleName()_{testLineNumber Fallback to testName hash if line number not available }}
118+ * prefix_{getClass.SimpleName()_{testLineNumber}}
115119 */
116- def schemaName (prefix : String , meta : TestData ): SchemaName =
117- truncateSchemaName(SchemaName (s " ${prefix}_ ${schemaNameFromClassAndLineNumber(meta )}" ))
120+ def schemaName (prefix : String , testOptions : TestOptions ): SchemaName =
121+ truncateSchemaName(SchemaName (s " ${prefix}_ ${schemaNameFromClassAndLineNumber(testOptions )}" ))
118122
119123 protected def truncateSchemaName (s : SchemaName ): SchemaName = SchemaName (s.takeRight(63 ))
120124
121- protected def schemaNameFromClassAndLineNumber (meta : TestData ): SchemaName =
122- SchemaName (s " ${schemaNameFromClass}_ ${lineNumberOrTestNameHash( meta) }" )
125+ protected def schemaNameFromClassAndLineNumber (meta : TestOptions ): SchemaName =
126+ SchemaName (s " ${schemaNameFromClass}_ ${meta.location.line.toString }" )
123127
124128 protected def schemaNameFromClass : String =
125129 getClass.getSimpleName.replace(" $" " "
126-
127- /** When creating a schema we discriminate using the line number when defined,
128- * otherwise using the hash of the test name, we print it out to the console,
129- * so no worries, you can still identify the test easily.
130- * @return
131- */
132- protected def lineNumberOrTestNameHash (meta : TestData ): String =
133- meta.pos.map(_.lineNumber.toString).getOrElse(s " ${meta.name.hashCode.toString}" )
134130}
0 commit comments