Skip to content

Commit 8cd4ab7

Browse files
committed
Soften assertion in zoneOffsetToNSTimeZone conversion test
Roundtripping zone names when converting FixedOffsetTimeZone to NSTimeZone and back is not guaranteed. Instead ensure that the returned time zone is a FixedOffsetTimeZone and has the same offset.
1 parent 53f0224 commit 8cd4ab7

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

core/darwin/test/ConvertersTest.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class ConvertersTest {
6767
(abs(hours) + 100).toString().substring(1) + ":" +
6868
(abs(minutes) + 100).toString().substring(1) + ":" +
6969
"00"
70-
val test = TimeZone.of(str)
70+
val test = TimeZone.of(str) as FixedOffsetTimeZone
7171
zoneOffsetCheck(test, hours, minutes)
7272
}
7373
}
@@ -93,9 +93,11 @@ class ConvertersTest {
9393
assertEquals(str + "Z", dateFormatter.stringFromDate(nsDate))
9494
}
9595

96-
private fun zoneOffsetCheck(timeZone: TimeZone, hours: Int, minutes: Int) {
96+
private fun zoneOffsetCheck(timeZone: FixedOffsetTimeZone, hours: Int, minutes: Int) {
9797
val nsTimeZone = timeZone.toNSTimeZone()
98+
val kotlinTimeZone = nsTimeZone.toKotlinTimeZone()
9899
assertEquals(hours * 3600 + minutes * 60, nsTimeZone.secondsFromGMT.convert())
99-
assertEquals(timeZone, nsTimeZone.toKotlinTimeZone())
100+
assertIs<FixedOffsetTimeZone>(kotlinTimeZone)
101+
assertEquals(timeZone.utcOffset, kotlinTimeZone.utcOffset)
100102
}
101103
}

0 commit comments

Comments
 (0)