diff options
| author | Aleksandr <ognelisar@gmail.com> | 2018-04-10 11:02:30 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-10 11:02:30 +0700 |
| commit | 1f49149ba768ac86263d11cb18e7a365b0bb0210 (patch) | |
| tree | c89d6032616f2be3aa278f24492f8908afa8a43c | |
| parent | 57ee8fa785c3815e45e473e5625d6e3cb1cd9402 (diff) | |
| parent | cd4d77b563c7da5600111f7220dd69c732dc495c (diff) | |
| download | driver-core-1f49149ba768ac86263d11cb18e7a365b0bb0210.tar.gz driver-core-1f49149ba768ac86263d11cb18e7a365b0bb0210.tar.bz2 driver-core-1f49149ba768ac86263d11cb18e7a365b0bb0210.zip | |
Merge pull request #149 from drivergroup/FIX-TIME-COMPARISSONv1.8.16
Fixed toCalendar method of TimeOfDay class
| -rw-r--r-- | src/main/scala/xyz/driver/core/time.scala | 1 | ||||
| -rw-r--r-- | src/test/scala/xyz/driver/core/TimeTest.scala | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/main/scala/xyz/driver/core/time.scala b/src/main/scala/xyz/driver/core/time.scala index bab304d..6dbd173 100644 --- a/src/main/scala/xyz/driver/core/time.scala +++ b/src/main/scala/xyz/driver/core/time.scala @@ -92,6 +92,7 @@ object time { private def toCalendar(day: Int, month: Int, year: Int): Calendar = { val cal = Calendar.getInstance(timeZone) cal.set(year, month, day, localTime.getHour, localTime.getMinute, localTime.getSecond) + cal.clear(Calendar.MILLISECOND) cal } } diff --git a/src/test/scala/xyz/driver/core/TimeTest.scala b/src/test/scala/xyz/driver/core/TimeTest.scala index b72fde8..5552a7d 100644 --- a/src/test/scala/xyz/driver/core/TimeTest.scala +++ b/src/test/scala/xyz/driver/core/TimeTest.scala @@ -74,6 +74,9 @@ class TimeTest extends FlatSpec with Matchers with Checkers { } it should "have correct textual representations" in { + import java.util.Locale + import java.util.Locale._ + Locale.setDefault(US) textualDate(TimeZone.getTimeZone("EDT"))(Time(1468937089834L)) should be("July 19, 2016") textualTime(TimeZone.getTimeZone("PDT"))(Time(1468937089834L)) should be("Jul 19, 2016 02:04:49 PM") |