azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid using 'D' component in ISO duration string representation

Browse Source 
Days in ISO have nominal duration, they are not always equal to 24H
This commit is contained in:
Ilya Gorbunov
2019-06-03 19:18:36 +03:00
parent 6dbc2eeb90
commit 3b989cc815
2 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/time/Duration.kt
+21 -28
View File
@@ -156,36 +156,29 @@ public inline class Duration internal constructor(internal val value: Double) :
fun toIsoString(): String = buildString { fun toIsoString(): String = buildString {
if (isNegative()) append('-') if (isNegative()) append('-')
append('P') append("PT")
absoluteValue.toComponents { days, hours, minutes, seconds, nanoseconds -> absoluteValue.toComponents { hours, minutes, seconds, nanoseconds ->
if (days != 0) val hasHours = hours != 0
append(days).append('D') val hasSeconds = seconds != 0 || nanoseconds != 0
val hasMinutes = minutes != 0 || (hasSeconds && hasHours)
if (hasHours) {
if (days == 0 || seconds != 0 || nanoseconds != 0 || minutes != 0 || hours != 0) { append(hours).append('H')
append('T') }
val hasHours = hours != 0 || days != 0 if (hasMinutes) {
val hasSeconds = seconds != 0 || nanoseconds != 0 append(minutes).append('M')
val hasMinutes = minutes != 0 || (hasSeconds && hasHours) }
if (hasHours) { if (hasSeconds || (!hasHours && !hasMinutes)) {
append(hours).append('H') append(seconds)
} if (nanoseconds != 0) {
if (hasMinutes) { append('.')
append(minutes).append('M') val nss = nanoseconds.toString().padStart(9, '0')
} when {
if (hasSeconds || (!hasHours && !hasMinutes)) { nanoseconds % 1_000_000 == 0 -> append(nss, 0, 3)
append(seconds) nanoseconds % 1_000 == 0 -> append(nss, 0, 6)
if (nanoseconds != 0) { else -> append(nss)
append('.')
val nss = nanoseconds.toString().padStart(9, '0')
when {
nanoseconds % 1_000_000 == 0 -> append(nss, 0, 3)
nanoseconds % 1_000 == 0 -> append(nss, 0, 6)
else -> append(nss)
}
} }
append('S')
} }
append('S')
} }
} }
} }
libraries/stdlib/test/time/DurationTest.kt
+5 -5
View File
@@ -254,7 +254,7 @@ class DurationTest {
assertEquals("PT0S", Duration.ZERO.toIsoString()) assertEquals("PT0S", Duration.ZERO.toIsoString())
// single unit // single unit
assertEquals("P1D", 1.days.toIsoString()) assertEquals("PT24H", 1.days.toIsoString())
assertEquals("PT1H", 1.hours.toIsoString()) assertEquals("PT1H", 1.hours.toIsoString())
assertEquals("PT1M", 1.minutes.toIsoString()) assertEquals("PT1M", 1.minutes.toIsoString())
assertEquals("PT1S", 1.seconds.toIsoString()) assertEquals("PT1S", 1.seconds.toIsoString())
@@ -267,9 +267,9 @@ class DurationTest {
assertEquals("PT0S", 0.9.nanoseconds.toIsoString()) assertEquals("PT0S", 0.9.nanoseconds.toIsoString())
// several units combined // several units combined
assertEquals("P1DT0H1M", (1.days + 1.minutes).toIsoString()) assertEquals("PT24H1M", (1.days + 1.minutes).toIsoString())
assertEquals("P1DT0H0M1S", (1.days + 1.seconds).toIsoString()) assertEquals("PT24H0M1S", (1.days + 1.seconds).toIsoString())
assertEquals("P1DT0H0M0.001S", (1.days + 1.milliseconds).toIsoString()) assertEquals("PT24H0M0.001S", (1.days + 1.milliseconds).toIsoString())
assertEquals("PT1H30M", (1.hours + 30.minutes).toIsoString()) assertEquals("PT1H30M", (1.hours + 30.minutes).toIsoString())
assertEquals("PT1H0M0.500S", (1.hours + 500.milliseconds).toIsoString()) assertEquals("PT1H0M0.500S", (1.hours + 500.milliseconds).toIsoString())
assertEquals("PT2M0.500S", (2.minutes + 500.milliseconds).toIsoString()) assertEquals("PT2M0.500S", (2.minutes + 500.milliseconds).toIsoString())
@@ -277,7 +277,7 @@ class DurationTest {
// negative // negative
assertEquals("-PT23H45M", (-1.days + 15.minutes).toIsoString()) assertEquals("-PT23H45M", (-1.days + 15.minutes).toIsoString())
assertEquals("-P1DT0H15M", (-1.days - 15.minutes).toIsoString()) assertEquals("-PT24H15M", (-1.days - 15.minutes).toIsoString())
// infinite // infinite
assertEquals("PT2147483647H", Duration.INFINITE.toIsoString()) assertEquals("PT2147483647H", Duration.INFINITE.toIsoString())