Merge pull request #193 from xuwei-k/update-specs2

mauricio · web-flow · commit c597318d4284 · 2016-09-29T08:55:36.000-04:00
update specs2 3.8.5
diff --git a/db-async-common/src/test/scala/com/github/mauricio/async/db/pool/AbstractAsyncObjectPoolSpec.scala b/db-async-common/src/test/scala/com/github/mauricio/async/db/pool/AbstractAsyncObjectPoolSpec.scala
@@ -10,7 +10,8 @@ import scala.util.Failure
 
 import scala.reflect.runtime.universe.TypeTag
 import scala.util.Try
-import scala.concurrent.duration.{Duration, SECONDS}
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.duration._
 
 /**
   * This spec is designed abstract to allow testing of any implementation of AsyncObjectPool, against the common
diff --git a/db-async-common/src/test/scala/com/github/mauricio/async/db/pool/TimeoutSchedulerSpec.scala b/db-async-common/src/test/scala/com/github/mauricio/async/db/pool/TimeoutSchedulerSpec.scala
@@ -18,6 +18,7 @@ package com.github.mauricio.async.db.pool
 import java.util.concurrent.{ScheduledFuture, TimeoutException}
 import com.github.mauricio.async.db.util.{ByteBufferUtils, ExecutorServiceUtils}
 import org.specs2.mutable.SpecificationWithJUnit
+import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 import scala.concurrent.{Future, Promise}
 
diff --git a/mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/StoredProceduresSpec.scala b/mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/StoredProceduresSpec.scala
@@ -19,6 +19,7 @@ package com.github.mauricio.async.db.mysql
 import com.github.mauricio.async.db.ResultSet
 import com.github.mauricio.async.db.util.FutureUtils._
 import org.specs2.mutable.Specification
+import scala.concurrent.ExecutionContext.Implicits.global
 
 class StoredProceduresSpec extends Specification with ConnectionHelper {
 
@@ -129,4 +130,4 @@ class StoredProceduresSpec extends Specification with ConnectionHelper {
       }
     }
   }
-}
+}
diff --git a/mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/TransactionSpec.scala b/mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/TransactionSpec.scala
@@ -10,6 +10,7 @@ import com.github.mauricio.async.db.Connection
 
 import scala.concurrent.duration.Duration
 import scala.concurrent.{Await, Future}
+import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.{Success, Failure}
 
 object TransactionSpec {
diff --git a/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/PostgreSQLConnectionSpec.scala b/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/PostgreSQLConnectionSpec.scala
@@ -30,6 +30,7 @@ import org.specs2.mutable.Specification
 
 import scala.concurrent.duration._
 import scala.concurrent.{Await, Future}
+import scala.concurrent.ExecutionContext.Implicits.global
 
 object PostgreSQLConnectionSpec {
   val log = Log.get[PostgreSQLConnectionSpec]
@@ -154,7 +155,7 @@ class PostgreSQLConnectionSpec extends Specification with DatabaseTestHelper {
           row(10) === DateEncoderDecoder.decode("1984-08-06")
           row(11) === TimeEncoderDecoder.Instance.decode("22:13:45.888888")
           row(12) === true
-          row(13) must beAnInstanceOf[java.lang.Long]
+          row(13).asInstanceOf[AnyRef] must beAnInstanceOf[java.lang.Long]
           row(13).asInstanceOf[Long] must beGreaterThan(0L)
 
 
diff --git a/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/pool/ConnectionPoolSpec.scala b/postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/pool/ConnectionPoolSpec.scala
@@ -22,6 +22,7 @@ import com.github.mauricio.async.db.pool.{ConnectionPool, PoolConfiguration}
 import com.github.mauricio.async.db.postgresql.exceptions.GenericDatabaseException
 import com.github.mauricio.async.db.postgresql.{PostgreSQLConnection, DatabaseTestHelper}
 import org.specs2.mutable.Specification
+import scala.concurrent.ExecutionContext.Implicits.global
 
 object ConnectionPoolSpec {
   val Insert = "insert into transaction_test (id) values (?)"
diff --git a/project/Build.scala b/project/Build.scala
@@ -51,7 +51,7 @@ object Configuration {
 
   val commonVersion = "0.2.21-SNAPSHOT"
   val projectScalaVersion = "2.11.7"
-  val specs2Version = "2.5"
+  val specs2Version = "3.8.5"
 
   val specs2Dependency = "org.specs2" %% "specs2-core" % specs2Version % "test"
   val specs2JunitDependency = "org.specs2" %% "specs2-junit" % specs2Version % "test"
@@ -82,6 +82,7 @@ object Configuration {
         :+ Opts.compile.unchecked
         :+ "-feature"
     ,
+    testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "sequential"),
     scalacOptions in doc := Seq("-doc-external-doc:scala=http://www.scala-lang.org/archives/downloads/distrib/files/nightly/docs/library/"),
     crossScalaVersions := Seq(projectScalaVersion, "2.10.6"),
     javacOptions := Seq("-source", "1.6", "-target", "1.6", "-encoding", "UTF8"),

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ package com.github.mauricio.async.db.mysql`
`19`	`19`	`import com.github.mauricio.async.db.ResultSet`
`20`	`20`	`import com.github.mauricio.async.db.util.FutureUtils._`
`21`	`21`	`import org.specs2.mutable.Specification`
	`22`	`+import scala.concurrent.ExecutionContext.Implicits.global`
`22`	`23`
`23`	`24`	`class StoredProceduresSpec extends Specification with ConnectionHelper {`
`24`	`25`
`@@ -129,4 +130,4 @@ class StoredProceduresSpec extends Specification with ConnectionHelper {`
`129`	`130`	`}`
`130`	`131`	`}`
`131`	`132`	`}`
`132`		`-}`
	`133`	`+}`