Use jdbcRunnableSpec

apolloisggg · Jan 8, 2021 · 9653d3a · 9653d3a
1 parent 3e6e4d8
commit 9653d3a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/jdbc/src/main/scala/zio/sql/JdbcRunnableSpec.scala b/jdbc/src/main/scala/zio/sql/JdbcRunnableSpec.scala
@@ -1,25 +1,14 @@
 package zio.sql
 
-import zio.{ ZEnv, ZLayer }
-import zio.duration._
-import zio.test._
 import zio.test.environment.TestEnvironment
+import zio.test.DefaultRunnableSpec
 
-trait JdbcRunnableSpec extends AbstractRunnableSpec with Jdbc {
+trait JdbcRunnableSpec extends DefaultRunnableSpec with Jdbc {
 
- override type Environment = TestEnvironment
+ type JdbcEnvironment = TestEnvironment
  with ReadExecutor
  with UpdateExecutor
  with DeleteExecutor
  with TransactionExecutor
- override type Failure = Any
-
- override def aspects: List[TestAspect[Nothing, TestEnvironment, Nothing, Any]] =
- List(TestAspect.timeoutWarning(60.seconds))
-
- def jdbcTestEnvironment: ZLayer[ZEnv, Nothing, Environment]
-
- override def runner: TestRunner[Environment, Any] =
- TestRunner(TestExecutor.default(ZEnv.live >>> jdbcTestEnvironment))
 
 }
diff --git a/mysql/src/test/scala/zio/sql/mysql/MysqlRunnableSpec.scala b/mysql/src/test/scala/zio/sql/mysql/MysqlRunnableSpec.scala
@@ -8,7 +8,7 @@ import zio.sql._
 import zio.test.environment.TestEnvironment
 import zio.test._
 
-trait MysqlRunnableSpec extends DefaultRunnableSpec with Jdbc with MysqlModule {
+trait MysqlRunnableSpec extends JdbcRunnableSpec with MysqlModule {
 
  private def connProperties(user: String, password: String): Properties = {
  val props = new Properties
@@ -33,6 +33,6 @@ trait MysqlRunnableSpec extends DefaultRunnableSpec with Jdbc with MysqlModule {
 
  override def spec: Spec[TestEnvironment, TestFailure[Any], TestSuccess] = specLayered.provideCustomLayerShared(layer)
 
- def specLayered: Spec[TestEnvironment with TransactionExecutor with ReadExecutor, TestFailure[Object], TestSuccess]
+ def specLayered: Spec[JdbcEnvironment, TestFailure[Object], TestSuccess]
 
 }
diff --git a/postgres/src/test/scala/zio/sql/postgresql/PostgresRunnableSpec.scala b/postgres/src/test/scala/zio/sql/postgresql/PostgresRunnableSpec.scala
@@ -7,9 +7,9 @@ import zio.sql.TestContainer
 import zio.Has
 import zio.ZLayer
 import zio.blocking.Blocking
-import zio.sql.Jdbc
+import zio.sql.JdbcRunnableSpec
 
-trait PostgresRunnableSpec extends DefaultRunnableSpec with Jdbc with PostgresModule {
+trait PostgresRunnableSpec extends JdbcRunnableSpec with PostgresModule {
 
  private def connProperties(user: String, password: String): Properties = {
  val props = new Properties
@@ -34,7 +34,6 @@ trait PostgresRunnableSpec extends DefaultRunnableSpec with Jdbc with PostgresMo
 
  override def spec: Spec[TestEnvironment, TestFailure[Any], TestSuccess] = specLayered.provideCustomLayerShared(layer)
 
- //TODO use object Environment from jdbcrunnable
- def specLayered: Spec[TestEnvironment with TransactionExecutor with ReadExecutor, TestFailure[Object], TestSuccess]
+ def specLayered: Spec[JdbcEnvironment, TestFailure[Object], TestSuccess]
 
 }