Skip to content

TimeZone.of("z") should work the same as calling from capital "Z" #530

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
DmitryNekrasov merged 1 commit into from
May 26, 2025
Merged

TimeZone.of("z") should work the same as calling from capital "Z" #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions core/common/test/TimeZoneTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class TimeZoneTest {
Pair("Europe/Paris", "Europe/Paris"),
Pair("Europe/Berlin", "Europe/Berlin"),
Pair("Z", "Z"),
Pair("z", "Z"),
Pair("UTC", "UTC"),
Pair("UTC+01:00", "UTC+01:00"),
Pair("GMT+01:00", "GMT+01:00"),
Expand Down
6 changes: 1 addition & 5 deletions core/common/test/format/DateTimeComponentsFormatTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,7 @@ class DateTimeComponentsFormatTest {

@Test
fun testZuluTimeZone() {
// Replace it to:
// listOf("z", "Z").forEach(::assertParseableAsTimeZone)
// when TimeZone.of("z") works correctly
assertParseableAsTimeZone("Z")
assertIncorrectlyParseableAsTimeZone("z")
listOf("z", "Z").forEach(::assertParseableAsTimeZone)
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion core/commonKotlin/src/TimeZone.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public actual open class TimeZone internal constructor() {
if (zoneId == "UTC") {
return UTC
}
if (zoneId == "Z") {
if (zoneId == "Z" || zoneId == "z") {
return UtcOffset.ZERO.asTimeZone()
}
if (zoneId == "SYSTEM") {
Expand Down
2 changes: 1 addition & 1 deletion core/jvm/src/TimeZoneJvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public actual open class TimeZone internal constructor(internal val zoneId: Zone
FixedOffsetTimeZone(UtcOffset.ZERO, ZoneId.of("UTC"))

public actual fun of(zoneId: String): TimeZone = try {
ofZone(ZoneId.of(zoneId))
ofZone(ZoneId.of(if (zoneId == "z") "Z" else zoneId))
} catch (e: Exception) {
if (e is DateTimeException) throw IllegalTimeZoneException(e)
throw e
Expand Down