From 4fd2254f3f0ce89ec21d146f84cf78bcb5ce1c3e Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 27 Mar 2021 21:36:57 +0300
Subject: [PATCH] Advance TestTimeSource more precisely

Change durations in its test so that they hold precise number
of nanoseconds
---
 .../stdlib/src/kotlin/time/TimeSources.kt      |  6 +++---
 .../stdlib/test/time/TestTimeSourceTest.kt     | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libraries/stdlib/src/kotlin/time/TimeSources.kt b/libraries/stdlib/src/kotlin/time/TimeSources.kt
index d5e5da5dfbc..1fd56c8009b 100644
--- a/libraries/stdlib/src/kotlin/time/TimeSources.kt
+++ b/libraries/stdlib/src/kotlin/time/TimeSources.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -84,14 +84,14 @@ public class TestTimeSource : AbstractLongTimeSource(unit = DurationUnit.NANOSEC
      * @throws IllegalStateException when the reading value overflows as the result of this operation.
      */
     public operator fun plusAssign(duration: Duration) {
-        val delta = duration.toDouble(unit)
-        val longDelta = delta.toLong()
+        val longDelta = duration.toLong(unit)
         reading = if (longDelta != Long.MIN_VALUE && longDelta != Long.MAX_VALUE) {
             // when delta fits in long, add it as long
             val newReading = reading + longDelta
             if (reading xor longDelta >= 0 && reading xor newReading < 0) overflow(duration)
             newReading
         } else {
+            val delta = duration.toDouble(unit)
             // when delta is greater than long, add it as double
             val newReading = reading + delta
             if (newReading > Long.MAX_VALUE || newReading < Long.MIN_VALUE) overflow(duration)
diff --git a/libraries/stdlib/test/time/TestTimeSourceTest.kt b/libraries/stdlib/test/time/TestTimeSourceTest.kt
index ee5e554217b..e40c1cb88d0 100644
--- a/libraries/stdlib/test/time/TestTimeSourceTest.kt
+++ b/libraries/stdlib/test/time/TestTimeSourceTest.kt
@@ -18,9 +18,9 @@ class TestTimeSourceTest {
             assertFailsWith<IllegalStateException>((-enormousDuration).toString()) { TestTimeSource() += -enormousDuration }
         }
 
-        val moderatePositiveDuration = Duration.nanoseconds(Long.MAX_VALUE.takeHighestOneBit())
-        val borderlinePositiveDuration = Duration.nanoseconds(Long.MAX_VALUE) // rounded to 2.0^63, which is slightly more than Long.MAX_VALUE
-        val borderlineNegativeDuration = Duration.nanoseconds(Long.MIN_VALUE)
+        val moderatePositiveDuration = Duration.nanoseconds(Long.MAX_VALUE) / 1.5
+        val borderlineQuarterPositiveDuration = Duration.nanoseconds(Long.MAX_VALUE / 4) // precise number of ns
+        val borderlineQuarterNegativeDuration = Duration.nanoseconds(Long.MIN_VALUE / 4)
         run {
             val timeSource = TestTimeSource()
             timeSource += moderatePositiveDuration
@@ -28,20 +28,20 @@ class TestTimeSourceTest {
         }
         run {
             val timeSource = TestTimeSource()
-            timeSource += borderlinePositiveDuration
-            assertFailsWith<IllegalStateException>("Should overflow positive") { timeSource += Duration.nanoseconds(1) }
+            repeat(4) { timeSource += borderlineQuarterPositiveDuration }
+            assertFailsWith<IllegalStateException>("Should overflow positive") { timeSource += Duration.nanoseconds(4) }
         }
         run {
             val timeSource = TestTimeSource()
-            timeSource += borderlineNegativeDuration
-            assertFailsWith<IllegalStateException>("Should overflow negative") { timeSource += -Duration.nanoseconds(1) }
+            repeat(4) { timeSource += borderlineQuarterNegativeDuration }
+            assertFailsWith<IllegalStateException>("Should overflow negative") { timeSource += -Duration.nanoseconds(4) }
         }
 
         run {
             val timeSource = TestTimeSource()
             timeSource += moderatePositiveDuration
-            // does not overflow event if duration doesn't fit in long
-            timeSource += -moderatePositiveDuration + borderlineNegativeDuration
+            // does not overflow even if duration doesn't fit in long, but the result fits
+            timeSource += -moderatePositiveDuration - Duration.nanoseconds(Long.MAX_VALUE)
         }
     }