test fixes for scalatest 3.1 release

open-horizon · Mar 9, 2020 · ea2c0f2 · ea2c0f2
1 parent 738032b
commit ea2c0f2
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 36 deletions.
diff --git a/build.sbt b/build.sbt
@@ -71,6 +71,7 @@ lazy val root = (project in file(".")).
       "com.typesafe.akka" %% "akka-stream-testkit"  % akkaVersion     % Test,
 
       "org.scalatest" %% "scalatest" % "latest.release" % "test",
+      "org.scalatestplus" %% "junit-4-12" % "latest.release" % "test",
       "org.scalacheck" %% "scalacheck" % "latest.release" % "test",
       "junit" % "junit" % "latest.release" % "test"
     ),

diff --git a/src/test/scala/exchangeapi/AdminSuite.scala b/src/test/scala/exchangeapi/AdminSuite.scala
@@ -1,9 +1,9 @@
 package exchangeapi
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 import scalaj.http._
 import org.json4s._
 //import org.json4s.JsonDSL._
@@ -22,7 +22,7 @@ import com.horizon.exchangeapi._
  * clear and detailed tutorial of FunSuite: http://doc.scalatest.org/1.9.1/index.html#org.scalatest.FunSuite
  */
 @RunWith(classOf[JUnitRunner])
-class AdminSuite extends FunSuite {
+class AdminSuite extends AnyFunSuite {
 
   val urlRoot = sys.env.getOrElse("EXCHANGE_URL_ROOT", "http://localhost:8080")
   val URL = urlRoot+"/v1"

diff --git a/src/test/scala/exchangeapi/AgbotsSuite.scala b/src/test/scala/exchangeapi/AgbotsSuite.scala
@@ -1,9 +1,9 @@
 package exchangeapi
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 import scalaj.http._
 import org.json4s._
 //import org.json4s.JsonDSL._
@@ -24,7 +24,7 @@ import java.time._
  * clear and detailed tutorial of FunSuite: http://doc.scalatest.org/1.9.1/index.html#org.scalatest.FunSuite
  */
 @RunWith(classOf[JUnitRunner])
-class AgbotsSuite extends FunSuite {
+class AgbotsSuite extends AnyFunSuite {
 
   val localUrlRoot = "http://localhost:8080"
   val urlRoot = sys.env.getOrElse("EXCHANGE_URL_ROOT", localUrlRoot)

diff --git a/src/test/scala/exchangeapi/BusinessSuite.scala b/src/test/scala/exchangeapi/BusinessSuite.scala
@@ -8,8 +8,8 @@ import org.json4s._
 import org.json4s.jackson.JsonMethods._
 import org.json4s.native.Serialization.write
 import org.junit.runner.RunWith
-import org.scalatest.FunSuite
-import org.scalatest.junit.JUnitRunner
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatestplus.junit.JUnitRunner
 import scalaj.http._
 
 import scala.collection.immutable._
@@ -23,7 +23,7 @@ import scala.collection.immutable._
  * clear and detailed tutorial of FunSuite: http://doc.scalatest.org/1.9.1/index.html#org.scalatest.FunSuite
  */
 @RunWith(classOf[JUnitRunner])
-class BusinessSuite extends FunSuite {
+class BusinessSuite extends AnyFunSuite {
 
   val localUrlRoot = "http://localhost:8080"
   val urlRoot = sys.env.getOrElse("EXCHANGE_URL_ROOT", localUrlRoot)

diff --git a/src/test/scala/exchangeapi/CatalogSuite.scala b/src/test/scala/exchangeapi/CatalogSuite.scala
@@ -6,16 +6,16 @@ import org.json4s._
 import org.json4s.jackson.JsonMethods._
 import org.json4s.native.Serialization.write
 import org.junit.runner.RunWith
-import org.scalatest.FunSuite
-import org.scalatest.junit.JUnitRunner
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection.immutable._
 import scalaj.http._
 
 // Tests the catalog APIs
 
 @RunWith(classOf[JUnitRunner])
-class CatalogSuite extends FunSuite {
+class CatalogSuite extends AnyFunSuite {
 
   implicit val formats = DefaultFormats // Brings in default date formats etc.
 

diff --git a/src/test/scala/exchangeapi/ExchConfigSuite.scala b/src/test/scala/exchangeapi/ExchConfigSuite.scala
@@ -1,16 +1,16 @@
 package exchangeapi
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 import com.horizon.exchangeapi._
 
 /**
  * Tests for the Version and VersionRange case classes
  */
 @RunWith(classOf[JUnitRunner])
-class ExchConfigSuite extends FunSuite {
+class ExchConfigSuite extends AnyFunSuite {
   test("ExchConfig tests") {
     ExchConfig.load()
     // Note: this test needs to work with the default version of config.json that is in src/main/resources (so that 'make test' in travis works)

diff --git a/src/test/scala/exchangeapi/NodesSuite.scala b/src/test/scala/exchangeapi/NodesSuite.scala
@@ -9,8 +9,8 @@ import org.json4s._
 import org.json4s.jackson.JsonMethods._
 import org.json4s.native.Serialization.write
 import org.junit.runner.RunWith
-import org.scalatest.FunSuite
-import org.scalatest.junit.JUnitRunner
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection.immutable._
 import scalaj.http._
@@ -24,7 +24,7 @@ import scalaj.http._
  * clear and detailed tutorial of FunSuite: http://doc.scalatest.org/1.9.1/index.html#org.scalatest.FunSuite
  */
 @RunWith(classOf[JUnitRunner])
-class NodesSuite extends FunSuite {
+class NodesSuite extends AnyFunSuite {
 
   val localUrlRoot = "http://localhost:8080"
   val urlRoot = sys.env.getOrElse("EXCHANGE_URL_ROOT", localUrlRoot)

diff --git a/src/test/scala/exchangeapi/PatternsSuite.scala b/src/test/scala/exchangeapi/PatternsSuite.scala
@@ -9,8 +9,8 @@ import org.json4s._
 import org.json4s.jackson.JsonMethods._
 import org.json4s.native.Serialization.write
 import org.junit.runner.RunWith
-import org.scalatest.FunSuite
-import org.scalatest.junit.JUnitRunner
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection.immutable._
 import scalaj.http._
@@ -24,7 +24,7 @@ import scalaj.http._
  * clear and detailed tutorial of FunSuite: http://doc.scalatest.org/1.9.1/index.html#org.scalatest.FunSuite
  */
 @RunWith(classOf[JUnitRunner])
-class PatternsSuite extends FunSuite {
+class PatternsSuite extends AnyFunSuite {
 
   val localUrlRoot = "http://localhost:8080"
   val urlRoot = sys.env.getOrElse("EXCHANGE_URL_ROOT", localUrlRoot)

diff --git a/src/test/scala/exchangeapi/PerfSuite.scala b/src/test/scala/exchangeapi/PerfSuite.scala
@@ -2,8 +2,8 @@ package exchangeapi
 
 import org.json4s._
 import org.junit.runner.RunWith
-import org.scalatest.FunSuite
-import org.scalatest.junit.JUnitRunner
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatestplus.junit.JUnitRunner
 
 import scalaj.http._
 import com.horizon.exchangeapi._
@@ -13,7 +13,7 @@ import org.json4s.native.Serialization.write
 
 /** Run some performance tests on the exchange. */
 @RunWith(classOf[JUnitRunner])
-class PerfSuite extends FunSuite {
+class PerfSuite extends AnyFunSuite {
 
   val urlRoot = sys.env.getOrElse("EXCHANGE_URL_ROOT", "http://localhost:8080")
   val URL = urlRoot+"/v1"

diff --git a/src/test/scala/exchangeapi/ServicesSuite.scala b/src/test/scala/exchangeapi/ServicesSuite.scala
@@ -8,8 +8,8 @@ import org.json4s._
 import org.json4s.jackson.JsonMethods._
 import org.json4s.native.Serialization.write
 import org.junit.runner.RunWith
-import org.scalatest.FunSuite
-import org.scalatest.junit.JUnitRunner
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection.immutable._
 import scalaj.http._
@@ -23,7 +23,7 @@ import scalaj.http._
  * clear and detailed tutorial of FunSuite: http://doc.scalatest.org/1.9.1/index.html#org.scalatest.FunSuite
  */
 @RunWith(classOf[JUnitRunner])
-class ServicesSuite extends FunSuite {
+class ServicesSuite extends AnyFunSuite {
 
   val localUrlRoot = "http://localhost:8080"
   val urlRoot = sys.env.getOrElse("EXCHANGE_URL_ROOT", localUrlRoot)

diff --git a/src/test/scala/exchangeapi/SlickSuite.scala b/src/test/scala/exchangeapi/SlickSuite.scala
@@ -1,8 +1,8 @@
 package exchangeapi
 
 import org.junit.runner.RunWith
-import org.scalatest.FunSuite
-import org.scalatest.junit.JUnitRunner
+import org.scalatest.funsuite.AnyFunSuite
+import org.scalatestplus.junit.JUnitRunner
 
 //someday: use : http://blog.abhinav.ca/blog/2014/09/08/unit-testing-futures-with-scalatest/ to add slick unit tests
 
@@ -12,7 +12,7 @@ import org.scalatest.junit.JUnitRunner
  * clear and detailed tutorial of FunSuite: http://doc.scalatest.org/1.9.1/index.html#org.scalatest.FunSuite
  */
 @RunWith(classOf[JUnitRunner])
-class SlickSuite extends FunSuite {
+class SlickSuite extends AnyFunSuite {
 
   ignore("listUsers") {
     // val cpds = new ComboPooledDataSource

diff --git a/src/test/scala/exchangeapi/UsersSuite.scala b/src/test/scala/exchangeapi/UsersSuite.scala
@@ -1,8 +1,8 @@
 package exchangeapi
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 import scalaj.http._
 import org.json4s._
 import org.json4s.jackson.JsonMethods._
@@ -21,7 +21,7 @@ import scala.collection.immutable._
  * clear and detailed tutorial of FunSuite: http://doc.scalatest.org/1.9.1/index.html#org.scalatest.FunSuite
  */
 @RunWith(classOf[JUnitRunner])
-class UsersSuite extends FunSuite {
+class UsersSuite extends AnyFunSuite {
 
   val urlRoot = sys.env.getOrElse("EXCHANGE_URL_ROOT", "http://localhost:8080")
   val ACCEPT = ("Accept", "application/json")

diff --git a/src/test/scala/exchangeapi/VersionSuite.scala b/src/test/scala/exchangeapi/VersionSuite.scala
@@ -1,16 +1,16 @@
 package exchangeapi
 
-import org.scalatest.FunSuite
+import org.scalatest.funsuite.AnyFunSuite
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 import com.horizon.exchangeapi._
 
 /**
  * Tests for the Version and VersionRange case classes
  */
 @RunWith(classOf[JUnitRunner])
-class VersionSuite extends FunSuite {
+class VersionSuite extends AnyFunSuite {
   test("Version tests") {
     assert(Version("1.2.3").isValid)
     assert(Version("infinity").isValid)