Merge pull request #8 from cquiroz/scalatest

Scalatest

Author: cquiroz

.travis.yml

@@ -4,6 +4,8 @@
 #
 # For more information, see https://travis-ci.org
 
+sudo: true
+
 language: scala
 
 jdk:
@@ -33,7 +35,8 @@ env:
   - COURSIER_NO_TERM=1
 
 script:
-  - sbt scalajavatimeJVM/test scalajavatimeJS/test
+  - sbt ++$TRAVIS_SCALA_VERSION clean scalajavatimeJVM/test
+  - sbt ++$TRAVIS_SCALA_VERSION clean scalajavatimeJS/test
   - sbt docs/makeMicrosite
   #- sbt clean coverage test &&
   #  sbt coverageAggregate

build.sbt

@@ -28,7 +28,10 @@ lazy val commonSettings = Seq(
       Some("releases"  at nexus + "service/local/staging/deploy/maven2")
     },
   pomExtra := pomData,
-  pomIncludeRepository := { _ => false }
+  pomIncludeRepository := { _ => false },
+  libraryDependencies ++= Seq(
+    "org.scalatest" %%% "scalatest" % "3.0.1" % "test"
+  )
 )
 
 lazy val root = project.in(file("."))
@@ -91,14 +94,15 @@ lazy val scalajavatime = crossProject.crossType(CrossType.Full).in(file("."))
     baseDirectory in Test := baseDirectory.value.getParentFile,
     // Use CLDR provider for locales
     // https://docs.oracle.com/javase/8/docs/technotes/guides/intl/enhancements.8.html#cldr
-    javaOptions in Test ++= Seq("-Djava.locale.providers=CLDR"),
+    javaOptions in Test ++= Seq("-Duser.language=en", "-Duser.country=US", "-Djava.locale.providers=CLDR"),
     TestNGPlugin.testNGSuites := Seq(((resourceDirectory in Test).value / "testng.xml").absolutePath)
   ).jsSettings(
     sourceGenerators in Compile += Def.task {
         val srcDirs = (sourceDirectories in Compile).value
         val destinationDir = (sourceManaged in Compile).value
         copyAndReplace(srcDirs, destinationDir)
       }.taskValue,
+    parallelExecution in Test := false,
     libraryDependencies ++= Seq(
       "io.github.cquiroz" %%% "scala-java-locales" % "0.5.0-cldr30"
     )
@@ -153,10 +157,6 @@ lazy val pomData =
    </developer>
   </developers>
   <contributors>
-    <contributor>
-      <name>Carlos Quiroz</name>
-      <url>https://github.com/cquiroz/</url>
-    </contributor>
     <contributor>
       <name>Javier Fernandez-Ivern</name>
       <url>https://github.com/ivern</url>

js/src/test/scala/org/threeten/bp/Platform.scala

@@ -0,0 +1,20 @@
+package org.threeten.bp
+
+object Platform {
+  type NPE = scala.scalajs.js.JavaScriptException
+
+  /** Returns `true` if and only if the code is executing on a JVM.
+   *  Note: Returns `false` when executing on any JS VM.
+   */
+  final val executingInJVM = true
+
+  def setupLocales(): Unit = {
+    if (Platform.executingInJVM) {
+      import locales.LocaleRegistry
+      import locales.cldr.data.pt_BR
+
+      LocaleRegistry.installLocale(pt_BR)
+    }
+  }
+
+}

jvm/src/test/scala/org/threeten/bp/Platform.scala

@@ -0,0 +1,12 @@
+package org.threeten.bp
+
+object Platform {
+  type NPE = NullPointerException
+
+  /** Returns `true` if and only if the code is executing on a JVM.
+   *  Note: Returns `false` when executing on any JS VM.
+   */
+  final val executingInJVM = false
+
+  def setupLocales(): Unit = ()
+}