Merge pull request #53 from cquiroz/scala_2.12

cquiroz · web-flow · commit 72dad0272fb2 · 2017-05-11T14:38:49.000-03:00
Scala 2.12.2 and 2.11.11
diff --git a/build.sbt b/build.sbt
@@ -3,8 +3,8 @@ import TZDBTasks._
 
 enablePlugins(MicrositesPlugin)
 
-val scalaVer = "2.11.8"
-val crossScalaVer = Seq(scalaVer, "2.10.6", "2.12.0")
+val scalaVer = "2.11.11"
+val crossScalaVer = Seq(scalaVer, "2.10.6", "2.12.2")
 
 lazy val downloadFromZip: TaskKey[Unit] =
   taskKey[Unit]("Download the tzdb tarball and extract it")
diff --git a/changes.xml b/changes.xml
@@ -10,6 +10,15 @@
   <body>
     <!-- types are add, fix, remove, update -->
     <release version="2.0.0-M11" date="2017-04-16" description="v2.0.0-M11">
+      <action dev="cquiroz" type="update" >
+        Support Hijrah chronology on scala.js
+      </action>
+      <action dev="cquiroz" type="update" >
+        Update to scala 2.12.2
+      </action>
+      <action dev="cquiroz" type="update" >
+        Update to scala 2.11.8
+      </action>
       <action dev="cquiroz" type="update" >
         Port all tests to scalatest
       </action>
diff --git a/shared/src/test/scala/org/threeten/bp/temporal/TestMonthDay.scala b/shared/src/test/scala/org/threeten/bp/temporal/TestMonthDay.scala
@@ -584,11 +584,14 @@ class TestMonthDay extends GenDateTimeTest with BeforeAndAfter {
     assertEquals(TEST_07_15 == null, false)
   }
 
-  /*@Test(dataProvider = "sampleDates") def test_hashCode(m: Int, d: Int): Unit = {
-    val a: MonthDay = MonthDay.of(m, d)
-    assertEquals(a.hashCode, a.hashCode)
-    val b: MonthDay = MonthDay.of(m, d)
-    assertEquals(a.hashCode, b.hashCode)
+  test("test_hashCode") {
+    provider_sampleDates.foreach {
+      case (m, d) =>
+        val a: MonthDay = MonthDay.of(m, d)
+        assertEquals(a.hashCode, a.hashCode)
+        val b: MonthDay = MonthDay.of(m, d)
+        assertEquals(a.hashCode, b.hashCode)
+    }
   }
 
   test("test_hashCode_unique") {
@@ -607,15 +610,21 @@ class TestMonthDay extends GenDateTimeTest with BeforeAndAfter {
     }
   }
 
-  @DataProvider(name = "sampleToString") private[temporal] def provider_sampleToString: Array[Array[Any]] = {
-    Array[Array[Any]](Array(7, 5, "--07-05"), Array(12, 31, "--12-31"), Array(1, 2, "--01-02"))
+  val provider_sampleToString: List[(Int, Int, String)] = {
+    List(
+      (7, 5, "--07-05"),
+      (12, 31, "--12-31"),
+      (1, 2, "--01-02"))
   }
 
-  @Test(dataProvider = "sampleToString") def test_toString(m: Int, d: Int, expected: String): Unit = {
-    val test: MonthDay = MonthDay.of(m, d)
-    val str: String = test.toString
-    assertEquals(str, expected)
-  }*/
+  test("test_toString") {
+    provider_sampleToString.foreach {
+      case (m, d, expected) =>
+        val test: MonthDay = MonthDay.of(m, d)
+        val str: String = test.toString
+        assertEquals(str, expected)
+    }
+  }
 
   test("test_format_formatter") {
     val f: DateTimeFormatter = DateTimeFormatter.ofPattern("M d")
