From f1328134ada77d1c21374f7cca953a376a9b27f9 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Tue, 27 Jun 2017 15:49:21 -0700 Subject: Library upgrades and code tweaks to support Scala 2.12 --- src/test/scala/xyz/driver/core/MessagesTest.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test/scala/xyz/driver/core/MessagesTest.scala') 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) -- cgit v1.2.3