Merge remote-tracking branch 'origin/master'

5 files changed, 12 insertions, 12 deletions

diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala
index 9abc7e0..69dbd9e 100644
--- a/src/test/scala/xyz/driver/core/AuthTest.scala
+++ b/src/test/scala/xyz/driver/core/AuthTest.scala
@@ -5,7 +5,7 @@ import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsReject
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
 import pdi.jwt.{Jwt, JwtAlgorithm}
 import xyz.driver.core.auth._
diff --git a/src/test/scala/xyz/driver/core/CoreTest.scala b/src/test/scala/xyz/driver/core/CoreTest.scala
index 0518652..d280d73 100644
--- a/src/test/scala/xyz/driver/core/CoreTest.scala
+++ b/src/test/scala/xyz/driver/core/CoreTest.scala
@@ -3,7 +3,7 @@ package xyz.driver.core
 import java.io.ByteArrayOutputStream
 
 import org.mockito.Mockito._
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
 
 class CoreTest extends FlatSpec with Matchers with MockitoSugar {
diff --git a/src/test/scala/xyz/driver/core/FileTest.scala b/src/test/scala/xyz/driver/core/FileTest.scala
index 717233e..ace0b07 100644
--- a/src/test/scala/xyz/driver/core/FileTest.scala
+++ b/src/test/scala/xyz/driver/core/FileTest.scala
@@ -5,7 +5,7 @@ import java.nio.file.Paths
 
 import org.mockito.Matchers._
 import org.mockito.Mockito._
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
 import xyz.driver.core.file.{FileSystemStorage, GcsStorage, S3Storage}
 
diff --git a/src/test/scala/xyz/driver/core/JsonTest.scala b/src/test/scala/xyz/driver/core/JsonTest.scala
index 760559c..bcf0ecf 100644
--- a/src/test/scala/xyz/driver/core/JsonTest.scala
+++ b/src/test/scala/xyz/driver/core/JsonTest.scala
@@ -144,9 +144,9 @@ class JsonTest extends FlatSpec with Matchers {
     implicit val case3Format = jsonFormat1(GadtCase3)
 
     val format = GadtJsonFormat.create[CustomGADT]("gadtTypeField") {
-      case t1: CustomGADT.GadtCase1 => "case1"
-      case t2: CustomGADT.GadtCase2 => "case2"
-      case t3: CustomGADT.GadtCase3 => "case3"
+      case _: CustomGADT.GadtCase1 => "case1"
+      case _: CustomGADT.GadtCase2 => "case2"
+      case _: CustomGADT.GadtCase3 => "case3"
     } {
       case "case1" => case1Format
       case "case2" => case2Format
diff --git a/src/test/scala/xyz/driver/core/MessagesTest.scala b/src/test/scala/xyz/driver/core/MessagesTest.scala
index abc4035..09558bc 100644
--- a/src/test/scala/xyz/driver/core/MessagesTest.scala
+++ b/src/test/scala/xyz/driver/core/MessagesTest.scala
@@ -3,12 +3,12 @@ package xyz.driver.core
 import java.util.Locale
 
 import com.typesafe.config.{ConfigException, ConfigFactory}
-import org.scalatest.mock.MockitoSugar
+import org.scalatest.mockito.MockitoSugar
 import org.scalatest.{FlatSpec, Matchers}
 import xyz.driver.core.messages.Messages
 import xyz.driver.core.logging.NoLogger
 
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
 
 class MessagesTest extends FlatSpec with Matchers with MockitoSugar {
 
@@ -17,7 +17,7 @@ class MessagesTest extends FlatSpec with Matchers with MockitoSugar {
 
   "Messages" should "read messages from config and format with parameters" in {
 
-    val messagesConfig = ConfigFactory.parseMap(englishLocaleMessages)
+    val messagesConfig = ConfigFactory.parseMap(englishLocaleMessages.asJava)
 
     val messages = Messages.messages(messagesConfig, NoLogger, Locale.US)
 
@@ -28,12 +28,12 @@ class MessagesTest extends FlatSpec with Matchers with MockitoSugar {
 
   it should "be able to read messages for different locales" in {
 
-    val messagesConfig = ConfigFactory.parseMap(
+    val messagesConfig = ConfigFactory.parseMap((
       englishLocaleMessages ++ Map(
         "zh.hello"            -> "你好，世界!",
         "zh.greeting"         -> "你好，{0}!",
         "zh.greetingFullName" -> "你好，{0} {1} {2}!"
-      ))
+      )).asJava)
 
     val englishMessages    = Messages.messages(messagesConfig, NoLogger, Locale.US)
     val englishMessagesToo = Messages.messages(messagesConfig, NoLogger, Locale.ENGLISH)
@@ -55,7 +55,7 @@ class MessagesTest extends FlatSpec with Matchers with MockitoSugar {
 
   it should "raise exception when locale is not available" in {
 
-    val messagesConfig = ConfigFactory.parseMap(englishLocaleMessages)
+    val messagesConfig = ConfigFactory.parseMap(englishLocaleMessages.asJava)
 
     an[ConfigException.Missing] should be thrownBy
       Messages.messages(messagesConfig, NoLogger, Locale.GERMAN)