centralise scala test configutation

underscoreio · Jan 1, 2018 · becf5ab · becf5ab
1 parent 3f94e02
commit becf5ab
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/src/test/scala/slickless/GenShapeSpec.scala b/src/test/scala/slickless/GenShapeSpec.scala
@@ -1,15 +1,11 @@
 package slickless
 
-import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.time.{Millis, Seconds, Span}
-import org.scalatest.{FreeSpec, Matchers}
 import shapeless.{HNil, Generic}
 import slick.jdbc.H2Profile.api._
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
-class GenShapeSpec extends FreeSpec with Matchers with ScalaFutures {
-  implicit val patience = PatienceConfig(timeout = Span(90, Seconds), interval = Span(250, Millis))
+class GenShapeSpec extends Spec {
 
   case class Address(id: Long, house: Int, street: String)
 

diff --git a/src/test/scala/slickless/HListShapeSpec.scala b/src/test/scala/slickless/HListShapeSpec.scala
@@ -1,15 +1,11 @@
 package slickless
 
-import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.time.{Millis, Seconds, Span}
-import org.scalatest.{FreeSpec, Matchers}
 import shapeless.{::, HNil}
 import slick.jdbc.H2Profile.api._
 
 import scala.concurrent.ExecutionContext.Implicits.global
 
-class HListShapeSpec extends FreeSpec with Matchers with ScalaFutures {
-  implicit val patience = PatienceConfig(timeout = Span(90, Seconds), interval = Span(250, Millis))
+class HListShapeSpec extends Spec {
 
   class Users(tag: Tag) extends Table[Long :: String :: HNil](tag, "users") {
     def id    = column[Long]( "id", O.PrimaryKey, O.AutoInc )

diff --git a/src/test/scala/slickless/Spec.scala b/src/test/scala/slickless/Spec.scala
@@ -0,0 +1,12 @@
+package slickless
+
+import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.time.{Millis, Seconds, Span}
+import org.scalatest.{FreeSpec, Matchers}
+
+abstract class Spec extends FreeSpec with Matchers with ScalaFutures {
+  implicit val patience = PatienceConfig(timeout = Span(30, Seconds), interval = Span(250, Millis))
+}
+
+
+
diff --git a/src/test/scala/userapp/LargeSpec.scala b/src/test/scala/userapp/LargeSpec.scala
@@ -55,14 +55,9 @@ class LargeTable(tag: Tag) extends Table[Large](tag, "large") {
   ).mappedWith(Generic[Large])
 }
 
-import org.scalatest.{Tag => _, _}
-import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.time.{Millis, Seconds, Span}
-import org.scalatest.{FreeSpec, Matchers}
 import scala.concurrent.ExecutionContext.Implicits.global
 
-class LargeSpec extends FreeSpec with Matchers with ScalaFutures {
-  implicit val patience = PatienceConfig(timeout = Span(90, Seconds), interval = Span(250, Millis))
+class LargeSpec extends slickless.Spec {
 
   "slick tables with >22 column mappings" - {
     "should support inserts and selects" in {