Handled PR notes from Yigit

objcode · objcode · commit 1382050a12fe · 2019-03-14T16:35:26.000-07:00
diff --git a/core/kotlinx-coroutines-test/src/TestBuilders.kt b/core/kotlinx-coroutines-test/src/TestBuilders.kt
@@ -83,7 +83,7 @@ fun TestCoroutineDispatcher.runBlockingTest(block: suspend TestCoroutineScope.()
 }
 
 private fun CoroutineContext?.checkArguments(): Pair<CoroutineContext, ContinuationInterceptor> {
-    var safeContext= this ?: TestCoroutineExceptionHandler() + TestCoroutineDispatcher()
+    var safeContext = this ?: TestCoroutineExceptionHandler() + TestCoroutineDispatcher()
 
     val dispatcher = safeContext[ContinuationInterceptor].run {
         this?.let {
diff --git a/core/kotlinx-coroutines-test/test/TestBuildersTest.kt b/core/kotlinx-coroutines-test/test/TestBuildersTest.kt
@@ -73,7 +73,7 @@ class TestBuildersTest {
         scope.runCurrent()
         assertTrue(deferred.isActive)
 
-        scope.advanceTimeToNextDelayed()
+        scope.advanceUntilIdle()
         assertEquals(3, deferred.getCompleted())
     }
 
@@ -93,7 +93,7 @@ class TestBuildersTest {
             retval
         }
 
-        scope.advanceTimeToNextDelayed()
+        scope.advanceTimeBy(1_000)
         scope.launch {
             assertRunsFast {
                 assertEquals(3, deferred.getCompleted())

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ fun TestCoroutineDispatcher.runBlockingTest(block: suspend TestCoroutineScope.()`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`private fun CoroutineContext?.checkArguments(): Pair<CoroutineContext, ContinuationInterceptor> {`
`86`		`- var safeContext= this ?: TestCoroutineExceptionHandler() + TestCoroutineDispatcher()`
	`86`	`+ var safeContext = this ?: TestCoroutineExceptionHandler() + TestCoroutineDispatcher()`
`87`	`87`
`88`	`88`	`val dispatcher = safeContext[ContinuationInterceptor].run {`
`89`	`89`	`this?.let {`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class TestBuildersTest {`
`73`	`73`	`scope.runCurrent()`
`74`	`74`	`assertTrue(deferred.isActive)`
`75`	`75`
`76`		`- scope.advanceTimeToNextDelayed()`
	`76`	`+ scope.advanceUntilIdle()`
`77`	`77`	`assertEquals(3, deferred.getCompleted())`
`78`	`78`	`}`
`79`	`79`
`@@ -93,7 +93,7 @@ class TestBuildersTest {`
`93`	`93`	`retval`
`94`	`94`	`}`
`95`	`95`
`96`		`- scope.advanceTimeToNextDelayed()`
	`96`	`+ scope.advanceTimeBy(1_000)`
`97`	`97`	`scope.launch {`
`98`	`98`	`assertRunsFast {`
`99`	`99`	`assertEquals(3, deferred.getCompleted())`