From c1f7fd0281cbaa8e84ff9f34c3a4f4f6d54316af Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 6 Apr 2019 03:46:30 +0300
Subject: [PATCH] Duration: test toString in particular units

---
 libraries/stdlib/src/kotlin/time/Duration.kt |  2 ++
 libraries/stdlib/test/time/DurationTest.kt   | 36 ++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/libraries/stdlib/src/kotlin/time/Duration.kt b/libraries/stdlib/src/kotlin/time/Duration.kt
index 7f5c01924cc..18b378ae127 100644
--- a/libraries/stdlib/src/kotlin/time/Duration.kt
+++ b/libraries/stdlib/src/kotlin/time/Duration.kt
@@ -146,7 +146,9 @@ public inline class Duration internal constructor(internal val _value: Double) :
     }
 
     fun toString(unit: DurationUnit, decimals: Int = 0): String {
+        require(decimals >= 0) { "decimals must be not negative, but was $decimals" }
 //        if (decimals == 0) return toString(unit)
+        if (isInfinite()) return _value.toString()
         return formatToDecimals(inUnits(unit), decimals, unit.shortName())
     }
 
diff --git a/libraries/stdlib/test/time/DurationTest.kt b/libraries/stdlib/test/time/DurationTest.kt
index 448ff732ee2..33f31bd78e1 100644
--- a/libraries/stdlib/test/time/DurationTest.kt
+++ b/libraries/stdlib/test/time/DurationTest.kt
@@ -272,4 +272,40 @@ class DurationTest {
         // infinite
         assertEquals("PT2147483647H", Duration.INFINITE.toIsoString())
     }
+
+    @Test
+    fun toStringInUnits() {
+        var d = 1.days + 15.hours + 31.minutes + 45.seconds + 678.milliseconds + 920.microseconds + 516.34.nanoseconds
+
+        fun test(unit: DurationUnit, vararg representations: String) {
+            assertFails { d.toString(unit, -1) }
+            assertEquals(representations.toList(), representations.indices.map { d.toString(unit, it) })
+        }
+
+        test(DurationUnit.DAYS, "2d", "1.6d", "1.65d", "1.647d")
+        test(DurationUnit.HOURS, "40h", "39.5h", "39.53h")
+        test(DurationUnit.MINUTES, "2372m", "2371.8m", "2371.76m")
+        d -= 39.hours
+        test(DurationUnit.SECONDS, "1906s", "1905.7s", "1905.68s", "1905.679s")
+        d -= 1904.seconds
+        test(DurationUnit.MILLISECONDS, "1679ms", "1678.9ms", "1678.92ms", "1678.921ms")
+        d -= 1678.milliseconds
+        test(DurationUnit.MICROSECONDS, "921us", "920.5us", "920.52us", "920.516us")
+        d -= 920.microseconds
+        // sub-nanosecond precision errors
+        test(DurationUnit.NANOSECONDS, "516ns", "516.3ns", "516.34ns", "516.344ns", "516.3438ns")
+        d = (d - 516.nanoseconds) / 17
+        test(DurationUnit.NANOSECONDS, "0ns", "0.0ns", "0.02ns", "0.020ns", "0.0202ns")
+
+        d = Duration.MAX_VALUE
+        // are such long representations ok?
+        test(DurationUnit.DAYS, "20806633505350875${"0".repeat(278)}d")
+        test(DurationUnit.NANOSECONDS, "17976931348623157${"0".repeat(292)}ns")
+
+        d = Duration.INFINITE
+        test(DurationUnit.DAYS, "Infinity", "Infinity")
+        d = -Duration.INFINITE
+        test(DurationUnit.NANOSECONDS, "-Infinity", "-Infinity")
+    }
+
 }
\ No newline at end of file