Check toMillis overflow in operators with Duration

Fix #868

Author: fvasco

integration/kotlinx-coroutines-jdk8/src/time/Time.kt

@@ -6,28 +6,45 @@ package kotlinx.coroutines.time
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.selects.SelectBuilder
 import java.time.Duration
-import java.util.concurrent.TimeUnit
+import java.time.temporal.ChronoUnit
 
 /**
  * "java.time" adapter method for [kotlinx.coroutines.delay]
  */
 public suspend fun delay(duration: Duration) =
-    kotlinx.coroutines.delay(duration.toMillis())
+        kotlinx.coroutines.delay(duration.toMillisDelay())
 
 /**
  * "java.time" adapter method for [SelectBuilder.onTimeout]
  */
 public fun <R> SelectBuilder<R>.onTimeout(duration: Duration, block: suspend () -> R) =
-    onTimeout(duration.toMillis(), block)
+        onTimeout(duration.toMillisDelay(), block)
 
 /**
  * "java.time" adapter method for [kotlinx.coroutines.withTimeout]
  */
 public suspend fun <T> withTimeout(duration: Duration, block: suspend CoroutineScope.() -> T): T =
-    kotlinx.coroutines.withTimeout(duration.toMillis(), block)
+        kotlinx.coroutines.withTimeout(duration.toMillisDelay(), block)
 
 /**
  * "java.time" adapter method for [kotlinx.coroutines.withTimeoutOrNull]
  */
 public suspend fun <T> withTimeoutOrNull(duration: Duration, block: suspend CoroutineScope.() -> T): T? =
-    kotlinx.coroutines.withTimeoutOrNull(duration.toMillis(), block)
+        kotlinx.coroutines.withTimeoutOrNull(duration.toMillisDelay(), block)
+
+/**
+ * Convert the [Duration] to millisecond delay.
+ *
+ * @return strictly positive duration is coerced to 1..[Long.MAX_VALUE] ms, `0` otherwise.
+ */
+private fun Duration.toMillisDelay(): Long =
+        if (this <= ChronoUnit.MILLIS.duration) {
+            if (this <= Duration.ZERO) 0
+            else 1
+        } else {
+            // values of Duration.ofMillis(Long.MAX_VALUE)
+            val maxSeconds = 9223372036854775
+            val maxNanos = 807000000
+            if (seconds < maxSeconds || seconds == maxSeconds && nano < maxNanos) toMillis()
+            else Long.MAX_VALUE
+        }

integration/kotlinx-coroutines-jdk8/test/time/TimeTest.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.coroutines.time
+
+import kotlinx.coroutines.*
+import org.hamcrest.core.*
+import org.junit.*
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.selects.select
+import java.time.temporal.ChronoUnit
+
+class TimeTest : TestBase() {
+
+    private val durations = ChronoUnit.values().map { it.duration }
+
+    @Test
+    fun testDelay() {
+        runTest {
+            for (duration in durations) {
+                delay(duration.negated())
+
+                launch(start = CoroutineStart.UNDISPATCHED) {
+                    delay(duration)
+                }
+                        .cancel()
+            }
+        }
+    }
+
+    @Test
+    fun testOnTimeout() {
+        runTest {
+            for (duration in durations) {
+                select<Unit> {
+                    onTimeout(duration) {}
+                    onTimeout(duration.negated()) {}
+                }
+            }
+        }
+    }
+
+    @Test
+    fun testWithTimeout() {
+        runTest {
+            for (duration in durations) {
+                withTimeout(duration) {}
+            }
+        }
+    }
+
+    @Test
+    fun testWithTimeoutOrNull() {
+        runTest {
+            for (duration in durations) {
+                withTimeoutOrNull(duration) {}
+            }
+        }
+    }
+
+}