Use timeSource in GuideTest to increase stability of cancel tests, reknit

Author: elizarov

core/kotlinx-coroutines-core/src/TimeSource.kt

@@ -7,6 +7,7 @@ package kotlinx.coroutines.experimental
 import java.util.concurrent.locks.LockSupport
 
 internal interface TimeSource {
+    fun currentTimeMillis(): Long
     fun nanoTime(): Long
     fun trackTask(block: Runnable): Runnable
     fun unTrackTask()
@@ -17,6 +18,7 @@ internal interface TimeSource {
 }
 
 internal object DefaultTimeSource : TimeSource {
+    override fun currentTimeMillis(): Long = System.currentTimeMillis()
     override fun nanoTime(): Long = System.nanoTime()
     override fun trackTask(block: Runnable): Runnable = block
     override fun unTrackTask() {}

core/kotlinx-coroutines-core/test/guide/example-cancel-02.kt

@@ -8,13 +8,13 @@ package kotlinx.coroutines.experimental.guide.cancel02
 import kotlinx.coroutines.experimental.*
 
 fun main(args: Array<String>) = runBlocking<Unit> {
-    val startTime = System.currentTimeMillis()
+    val startTime = timeSource.currentTimeMillis()
     val job = launch {
         var nextPrintTime = startTime
         var i = 0
         while (i < 5) { // computation loop, just wastes CPU
             // print a message twice a second
-            if (System.currentTimeMillis() >= nextPrintTime) {
+            if (timeSource.currentTimeMillis() >= nextPrintTime) {
                 println("I'm sleeping ${i++} ...")
                 nextPrintTime += 500L
             }

core/kotlinx-coroutines-core/test/guide/example-cancel-03.kt

@@ -8,13 +8,13 @@ package kotlinx.coroutines.experimental.guide.cancel03
 import kotlinx.coroutines.experimental.*
 
 fun main(args: Array<String>) = runBlocking<Unit> {
-    val startTime = System.currentTimeMillis()
+    val startTime = timeSource.currentTimeMillis()
     val job = launch {
         var nextPrintTime = startTime
         var i = 0
         while (isActive) { // cancellable computation loop
             // print a message twice a second
-            if (System.currentTimeMillis() >= nextPrintTime) {
+            if (timeSource.currentTimeMillis() >= nextPrintTime) {
                 println("I'm sleeping ${i++} ...")
                 nextPrintTime += 500L
             }

core/kotlinx-coroutines-core/test/guide/example-channel-10.kt

@@ -11,9 +11,9 @@ import kotlinx.coroutines.experimental.channels.*
 fun main(args: Array<String>) = runBlocking<Unit> {
     val tickerChannel = ticker(delay = 100, initialDelay = 0) // create ticker channel
     var nextElement = withTimeoutOrNull(1) { tickerChannel.receive() }
-    println("Initial element is available immediately: $nextElement") // Initial delay hasn't passed yet
+    println("Initial element is available immediately: $nextElement") // initial delay hasn't passed yet
 
-    nextElement = withTimeoutOrNull(50) { tickerChannel.receive() } // All subsequent elements has 100ms delay
+    nextElement = withTimeoutOrNull(50) { tickerChannel.receive() } // all subsequent elements has 100ms delay
     println("Next element is not ready in 50 ms: $nextElement")
 
     nextElement = withTimeoutOrNull(60) { tickerChannel.receive() }

core/kotlinx-coroutines-core/test/guide/test/TestUtil.kt

@@ -130,6 +130,7 @@ private class TestTimeSource(
 
     private val threads = ConcurrentHashMap<Thread, ThreadStatus>()
 
+    override fun currentTimeMillis(): Long = TimeUnit.NANOSECONDS.toMillis(time)
     override fun nanoTime(): Long = time
 
     @Synchronized

knit/src/Knit.kt

@@ -214,7 +214,9 @@ fun knit(markdownFileName: String): Boolean {
                         outLines += line
                     }
                 }
-                outLines += codeLines
+                for (code in codeLines) {
+                    outLines += code.replace("System.currentTimeMillis()", "timeSource.currentTimeMillis()")
+                }
                 codeLines.clear()
                 writeLinesIfNeeded(file, outLines)
             }

ui/coroutines-guide-ui.md

@@ -687,7 +687,6 @@ After delay
 [Job.cancel]: https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.experimental/-job/cancel.html
 [withContext]: https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.experimental/with-context.html
 [CommonPool]: https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.experimental/-common-pool/index.html
-[NonCancellable]: https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.experimental/-non-cancellable/index.html
 [CoroutineStart]: https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.experimental/-coroutine-start/index.html
 [async]: https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.experimental/async.html
 [CoroutineStart.UNDISPATCHED]: https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.experimental/-coroutine-start/-u-n-d-i-s-p-a-t-c-h-e-d.html