diff options
| author | vlad <vlad@driver.xyz> | 2017-08-07 14:34:07 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-08-07 14:34:07 -0700 |
| commit | 2283b61115fc94029f4772e2fbd05eaabb2ad5a8 (patch) | |
| tree | ad2c4bf5bc1295d1318baea92ac34443803009a8 /src/test/scala/xyz/driver/core/MessagesTest.scala | |
| parent | a1e2e7b9ed43a8a0757a4c678ea855d97f1a16c8 (diff) | |
| parent | 886415aa5f86e758d9a9aafa8f60128e3473311a (diff) | |
| download | driver-core-2283b61115fc94029f4772e2fbd05eaabb2ad5a8.tar.gz driver-core-2283b61115fc94029f4772e2fbd05eaabb2ad5a8.tar.bz2 driver-core-2283b61115fc94029f4772e2fbd05eaabb2ad5a8.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/test/scala/xyz/driver/core/MessagesTest.scala')
| -rw-r--r-- | src/test/scala/xyz/driver/core/MessagesTest.scala | 12 |
1 files changed, 6 insertions, 6 deletions
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) |