Ported TestDateTimeUtils and TestDateTimes_implementation to scalatest

Author: cquiroz

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

@@ -31,8 +31,7 @@
  */
 package org.threeten.bp
 
-import org.testng.Assert.assertEquals
-import org.testng.annotations.Test
+import org.scalatest.FunSuite
 
 import java.util.Calendar
 import java.util.Date
@@ -48,26 +47,26 @@ object TestDateTimeUtils {
   private val PARIS_TZ: TimeZone = TimeZone.getTimeZone("Europe/Paris")
 }
 
-@Test class TestDateTimeUtils {
-  def test_toInstant_Date(): Unit = {
+class TestDateTimeUtils extends FunSuite with AssertionsHelper {
+  test("test_toInstant_Date") {
     val date: Date = new Date(123456)
     assertEquals(DateTimeUtils.toInstant(date), Instant.ofEpochMilli(123456))
   }
 
-  def test_toDate_Instant(): Unit = {
+  test("test_toDate_Instant") {
     val instant: Instant = Instant.ofEpochMilli(123456)
     assertEquals(DateTimeUtils.toDate(instant), new Date(123456))
   }
 
   /*
-  def test_toInstant_Calendar(): Unit = {
+  test("test_toInstant_Calendar") {
     val calendar: Calendar = Calendar.getInstance
     calendar.setTimeInMillis(123456)
     assertEquals(DateTimeUtils.toInstant(calendar), Instant.ofEpochMilli(123456))
   }
   */
 
-  def test_toZDT_Calendar(): Unit = {
+  test("test_toZDT_Calendar") {
     val zdt: ZonedDateTime = ZonedDateTime.of(2012, 6, 30, 11, 30, 40, 0, TestDateTimeUtils.PARIS)
     val calendar: Calendar = Calendar.getInstance(TestDateTimeUtils.PARIS_TZ)
     calendar.setFirstDayOfWeek(Calendar.MONDAY)
@@ -77,7 +76,7 @@ object TestDateTimeUtils {
     assertEquals(DateTimeUtils.toZonedDateTime(calendar), zdt)
   }
 
-  def test_toCalendar_ZDT(): Unit = {
+  test("test_toCalendar_ZDT") {
     val zdt: ZonedDateTime = ZonedDateTime.of(2012, 6, 30, 11, 30, 40, 0, TestDateTimeUtils.PARIS)
     val calendar: GregorianCalendar = new GregorianCalendar(TestDateTimeUtils.PARIS_TZ)
     calendar.setFirstDayOfWeek(Calendar.MONDAY)
@@ -90,58 +89,58 @@ object TestDateTimeUtils {
     assertEquals(test, calendar)
   }
 
-  def test_toZoneId_TimeZone(): Unit = {
+  test("test_toZoneId_TimeZone") {
     assertEquals(DateTimeUtils.toZoneId(TestDateTimeUtils.PARIS_TZ), TestDateTimeUtils.PARIS)
   }
 
-  def test_toTimeZone_ZoneId(): Unit = {
+  test("test_toTimeZone_ZoneId") {
     assertEquals(DateTimeUtils.toTimeZone(TestDateTimeUtils.PARIS), TestDateTimeUtils.PARIS_TZ)
   }
 
   /*
-  def test_toLocalDate_SqlDate(): Unit = {
+  test("test_toLocalDate_SqlDate") {
     @SuppressWarnings(Array("deprecation")) val sqlDate: Date = new Date(2012 - 1900, 6 - 1, 30)
     val localDate: LocalDate = LocalDate.of(2012, 6, 30)
     assertEquals(DateTimeUtils.toLocalDate(sqlDate), localDate)
   }
   */
 
-  def test_toSqlDate_LocalDate(): Unit = {
+  test("test_toSqlDate_LocalDate") {
     @SuppressWarnings(Array("deprecation")) val sqlDate: Date = new Date(2012 - 1900, 6 - 1, 30)
     val localDate: LocalDate = LocalDate.of(2012, 6, 30)
     assertEquals(DateTimeUtils.toSqlDate(localDate), sqlDate)
   }
 
-  def test_toLocalTime_SqlTime(): Unit = {
+  test("test_toLocalTime_SqlTime") {
     @SuppressWarnings(Array("deprecation")) val sqlTime: Time = new Time(11, 30, 40)
     val localTime: LocalTime = LocalTime.of(11, 30, 40)
     assertEquals(DateTimeUtils.toLocalTime(sqlTime), localTime)
   }
 
-  def test_toSqlTime_LocalTime(): Unit = {
+  test("test_toSqlTime_LocalTime") {
     @SuppressWarnings(Array("deprecation")) val sqlTime: Time = new Time(11, 30, 40)
     val localTime: LocalTime = LocalTime.of(11, 30, 40)
     assertEquals(DateTimeUtils.toSqlTime(localTime), sqlTime)
   }
 
-  def test_toLocalDateTime_SqlTimestamp(): Unit = {
+  test("test_toLocalDateTime_SqlTimestamp") {
     @SuppressWarnings(Array("deprecation")) val sqlDateTime: Timestamp = new Timestamp(2012 - 1900, 6 - 1, 30, 11, 30, 40, 0)
     val localDateTime: LocalDateTime = LocalDateTime.of(2012, 6, 30, 11, 30, 40, 0)
     assertEquals(DateTimeUtils.toLocalDateTime(sqlDateTime), localDateTime)
   }
 
-  def test_toSqlTimestamp_LocalDateTime(): Unit = {
+  test("test_toSqlTimestamp_LocalDateTime") {
     @SuppressWarnings(Array("deprecation")) val sqlDateTime: Timestamp = new Timestamp(2012 - 1900, 6 - 1, 30, 11, 30, 40, 0)
     val localDateTime: LocalDateTime = LocalDateTime.of(2012, 6, 30, 11, 30, 40, 0)
     assertEquals(DateTimeUtils.toSqlTimestamp(localDateTime), sqlDateTime)
   }
 
-  def test_toInstant_SqlTimestamp(): Unit = {
+  test("test_toInstant_SqlTimestamp") {
     @SuppressWarnings(Array("deprecation")) val sqlDateTime: Timestamp = new Timestamp(2012 - 1900, 6 - 1, 30, 11, 30, 40, 0)
     assertEquals(DateTimeUtils.toInstant(sqlDateTime), Instant.ofEpochMilli(sqlDateTime.getTime))
   }
 
-  def test_toSqlTimestamp_Instant(): Unit = {
+  test("test_toSqlTimestamp_Instant") {
     val instant: Instant = Instant.ofEpochMilli(123456)
     val sqlDateTime: Timestamp = new Timestamp(instant.toEpochMilli)
     assertEquals(DateTimeUtils.toSqlTimestamp(instant), sqlDateTime)