Skip to content

Scala 2.12.2 and 2.11.11 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 11, 2017
Merged

Scala 2.12.2 and 2.11.11 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
411e0b8
Update to scala 2.12.2 and scala 2.11.11
cquiroz May 11, 2017
e8a1867
Ported commented test
cquiroz May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
9 changes: 9 additions & 0 deletions changes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
33 changes: 21 additions & 12 deletions shared/src/test/scala/org/threeten/bp/temporal/TestMonthDay.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand All @@ -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")
Expand Down