Fixes

Author: dkhalanskyjb

kotlinx-coroutines-test/common/src/TestBuilders.kt

@@ -164,7 +164,7 @@ public fun TestScope.runTest(
 ): TestResult = asSpecificImplementation().let {
     it.enter()
     createTestResult {
-        runTestCoroutine(it, dispatchTimeoutMs, testBody) { it.finish() }
+        runTestCoroutine(it, dispatchTimeoutMs, testBody) { it.leave() }
     }
 }
 

kotlinx-coroutines-test/common/src/TestScope.kt

@@ -157,10 +157,10 @@ internal class TestScopeImpl(context: CoroutineContext) :
 
     override val testScheduler get() = context[TestCoroutineScheduler]!!
 
-    var entered = false
-    var finished = false
-    val uncaughtExceptions = mutableListOf<Throwable>()
-    val lock = SynchronizedObject()
+    private var entered = false
+    private var finished = false
+    private val uncaughtExceptions = mutableListOf<Throwable>()
+    private val lock = SynchronizedObject()
 
     /** Called upon entry to [runTest]. Will throw if called more than once. */
     fun enter() {
@@ -180,7 +180,7 @@ internal class TestScopeImpl(context: CoroutineContext) :
     }
 
     /** Called at the end of the test. May only be called once. */
-    fun finish(): List<Throwable> {
+    fun leave(): List<Throwable> {
         val exceptions = synchronized(lock) {
             check(entered && !finished)
             finished = true
@@ -206,6 +206,9 @@ internal class TestScopeImpl(context: CoroutineContext) :
             }
         }
     }
+
+    override fun toString(): String =
+        "TestScope[" + (if (finished) "test ended" else if (entered) "test started" else "test not started") + "]"
 }
 
 /** Use the knowledge that any [TestScope] that we receive is necessarily a [TestScopeImpl]. */

kotlinx-coroutines-test/common/src/migration/TestBuildersDeprecated.kt

@@ -82,7 +82,7 @@ public fun runBlockingTestOnTestScope(
     deferred.getCompletionExceptionOrNull()?.let {
         throw it
     }
-    scope.finish().throwAll()
+    scope.leave().throwAll()
     val jobs = context.activeJobs() - startJobs
     if (jobs.isNotEmpty())
         throw UncompletedCoroutinesError("Some jobs were not completed at the end of the test: $jobs")

kotlinx-coroutines-test/common/test/StandardTestDispatcherTest.kt

@@ -12,10 +12,15 @@ class StandardTestDispatcherTest: OrderedExecutionTestBase() {
 
     private val scope = TestScope(StandardTestDispatcher())
 
+    @BeforeTest
+    fun init() {
+        scope.asSpecificImplementation().enter()
+    }
+
     @AfterTest
     fun cleanup() {
         scope.runCurrent()
-        assertEquals(listOf(), scope.asSpecificImplementation().finish())
+        assertEquals(listOf(), scope.asSpecificImplementation().leave())
     }
 
     /** Tests that the [StandardTestDispatcher] follows an execution order similar to `runBlocking`. */

kotlinx-coroutines-test/common/test/TestCoroutineSchedulerTest.kt

@@ -247,7 +247,7 @@ class TestCoroutineSchedulerTest {
             }
         }
         advanceUntilIdle()
-        asSpecificImplementation().finish().throwAll()
+        asSpecificImplementation().leave().throwAll()
         if (timesOut)
             assertTrue(caughtException)
         else

kotlinx-coroutines-test/common/test/TestScopeTest.kt

@@ -88,7 +88,7 @@ class TestScopeTest {
         }
         assertFalse(result)
         scope.asSpecificImplementation().enter()
-        assertFailsWith<UncompletedCoroutinesError> { scope.asSpecificImplementation().finish() }
+        assertFailsWith<UncompletedCoroutinesError> { scope.asSpecificImplementation().leave() }
         assertFalse(result)
     }
 
@@ -104,7 +104,7 @@ class TestScopeTest {
         }
         assertFalse(result)
         scope.asSpecificImplementation().enter()
-        assertFailsWith<UncompletedCoroutinesError> { scope.asSpecificImplementation().finish() }
+        assertFailsWith<UncompletedCoroutinesError> { scope.asSpecificImplementation().leave() }
         assertFalse(result)
     }
 
@@ -121,7 +121,7 @@ class TestScopeTest {
         job.cancel()
         assertFalse(result)
         scope.asSpecificImplementation().enter()
-        assertFailsWith<UncompletedCoroutinesError> { scope.asSpecificImplementation().finish() }
+        assertFailsWith<UncompletedCoroutinesError> { scope.asSpecificImplementation().leave() }
         assertFalse(result)
     }
 
@@ -155,7 +155,7 @@ class TestScopeTest {
             launch(SupervisorJob()) { throw TestException("y") }
             launch(SupervisorJob()) { throw TestException("z") }
             runCurrent()
-            val e = asSpecificImplementation().finish()
+            val e = asSpecificImplementation().leave()
             assertEquals(3, e.size)
             assertEquals("x", e[0].message)
             assertEquals("y", e[1].message)