Match UTC timezone logic in JVM code

pull/1120/head
sgallese 4 years ago
parent deda7c637f
commit 82f3c0ef51

@ -25,6 +25,7 @@ import kotlinx.datetime.Instant
import kotlinx.datetime.LocalDateTime import kotlinx.datetime.LocalDateTime
import kotlinx.datetime.Month import kotlinx.datetime.Month
import kotlinx.datetime.TimeZone import kotlinx.datetime.TimeZone
import kotlinx.datetime.TimeZone.Companion.UTC
import kotlinx.datetime.offsetAt import kotlinx.datetime.offsetAt
import kotlinx.datetime.toInstant import kotlinx.datetime.toInstant
import kotlinx.datetime.toLocalDateTime import kotlinx.datetime.toLocalDateTime
@ -265,7 +266,7 @@ data class LocalDate(val daysSince2000: Int) {
minute = minute, minute = minute,
second = 0 second = 0
).toInstant( ).toInstant(
getTimeZone() UTC
).toEpochMilliseconds() ).toEpochMilliseconds()
if (getLocalTime() > time) { if (getLocalTime() > time) {

@ -420,7 +420,7 @@ class DatesTest : BaseUnitTest() {
fun testGetUpcomingTimeInMillis_withTimeZone() { fun testGetUpcomingTimeInMillis_withTimeZone() {
LocalDate.fixedLocalTime = FIXED_LOCAL_TIME LocalDate.fixedLocalTime = FIXED_LOCAL_TIME
LocalDate.fixedTimeZone = TimeZone.of("GMT-$HOUR_OFFSET") LocalDate.fixedTimeZone = TimeZone.of("GMT-$HOUR_OFFSET")
val expected = unixTime(2015, Month.JANUARY, 25, 10, 1) val expected = unixTime(2015, Month.JANUARY, 25, 13, 1)
val upcomingTimeMillis = getUpcomingTimeInMillis(10, 1) val upcomingTimeMillis = getUpcomingTimeInMillis(10, 1)
assertEquals(expected, upcomingTimeMillis) assertEquals(expected, upcomingTimeMillis)
} }

Loading…
Cancel
Save