Move tests to common

Author: zuevmaxim

kotlinx-coroutines-core/common/test/ThreadContextElementTest.kt

@@ -37,17 +37,40 @@ class ThreadContextElementTest : TestBase() {
         finish(2)
     }
 
+    @Test
+    fun testDispatched() = runTest {
+        val mainDispatcher = coroutineContext[ContinuationInterceptor]!!
+        val data = MyData()
+        val element = MyElement(data)
+        assertNull(threadContextElementThreadLocal.get())
+        val job = launch(Dispatchers.Default + element) {
+            assertSame(element, coroutineContext[MyElement])
+            assertSame(data, threadContextElementThreadLocal.get())
+            withContext(mainDispatcher) {
+                assertSame(element, coroutineContext[MyElement])
+                assertSame(data, threadContextElementThreadLocal.get())
+            }
+            assertSame(element, coroutineContext[MyElement])
+            assertSame(data, threadContextElementThreadLocal.get())
+        }
+        assertNull(threadContextElementThreadLocal.get())
+        job.join()
+        assertNull(threadContextElementThreadLocal.get())
+    }
+
     @Test
     fun testUndispatched() = runTest {
         val exceptionHandler = coroutineContext[CoroutineExceptionHandler]!!
         val data = MyData()
         val element = MyElement(data)
-        val job = GlobalScope.launch(
+        val job = launch(
             context = Dispatchers.Default + exceptionHandler + element,
             start = CoroutineStart.UNDISPATCHED
         ) {
+            assertSame(element, coroutineContext[MyElement])
             assertSame(data, threadContextElementThreadLocal.get())
             yield()
+            assertSame(element, coroutineContext[MyElement])
             assertSame(data, threadContextElementThreadLocal.get())
         }
         assertNull(threadContextElementThreadLocal.get())

kotlinx-coroutines-core/jvm/test/ThreadContextElementJvmTest.kt

@@ -8,50 +8,6 @@ import kotlinx.coroutines.flow.*
 
 class ThreadContextElementJvmTest : TestBase() {
 
-    @Test
-    fun testExample() = runTest {
-        val exceptionHandler = coroutineContext[CoroutineExceptionHandler]!!
-        val mainDispatcher = coroutineContext[ContinuationInterceptor]!!
-        val mainThread = Thread.currentThread()
-        val data = MyData()
-        val element = MyElement(data)
-        assertNull(threadContextElementThreadLocal.get())
-        val job = GlobalScope.launch(element + exceptionHandler) {
-            assertTrue(mainThread != Thread.currentThread())
-            assertSame(element, coroutineContext[MyElement])
-            assertSame(data, threadContextElementThreadLocal.get())
-            withContext(mainDispatcher) {
-                assertSame(mainThread, Thread.currentThread())
-                assertSame(element, coroutineContext[MyElement])
-                assertSame(data, threadContextElementThreadLocal.get())
-            }
-            assertTrue(mainThread != Thread.currentThread())
-            assertSame(element, coroutineContext[MyElement])
-            assertSame(data, threadContextElementThreadLocal.get())
-        }
-        assertNull(threadContextElementThreadLocal.get())
-        job.join()
-        assertNull(threadContextElementThreadLocal.get())
-    }
-
-    @Test
-    fun testUndispatched() = runTest {
-        val exceptionHandler = coroutineContext[CoroutineExceptionHandler]!!
-        val data = MyData()
-        val element = MyElement(data)
-        val job = GlobalScope.launch(
-            context = Dispatchers.Default + exceptionHandler + element,
-            start = CoroutineStart.UNDISPATCHED
-        ) {
-            assertSame(data, threadContextElementThreadLocal.get())
-            yield()
-            assertSame(data, threadContextElementThreadLocal.get())
-        }
-        assertNull(threadContextElementThreadLocal.get())
-        job.join()
-        assertNull(threadContextElementThreadLocal.get())
-    }
-
     @Test
     fun testWithContext() = runTest {
         expect(1)

kotlinx-coroutines-core/native/test/ThreadContextElementNativeTest.kt

@@ -3,55 +3,9 @@ package kotlinx.coroutines
 import kotlinx.coroutines.testing.*
 import kotlin.coroutines.*
 import kotlin.test.*
-import kotlin.native.concurrent.*
 
 class ThreadContextElementNativeTest : TestBase() {
 
-    @OptIn(ObsoleteWorkersApi::class)
-    @Test
-    fun testExample() = runTest {
-        val exceptionHandler = coroutineContext[CoroutineExceptionHandler]!!
-        val mainDispatcher = coroutineContext[ContinuationInterceptor]!!
-        val mainThread = Worker.current.id
-        val data = MyData()
-        val element = MyElement(data)
-        assertNull(threadContextElementThreadLocal.get())
-        val job = GlobalScope.launch(element + exceptionHandler) {
-            assertTrue(mainThread != Worker.current.id)
-            assertSame(element, coroutineContext[MyElement])
-            assertSame(data, threadContextElementThreadLocal.get())
-            withContext(mainDispatcher) {
-                assertSame(mainThread, Worker.current.id)
-                assertSame(element, coroutineContext[MyElement])
-                assertSame(data, threadContextElementThreadLocal.get())
-            }
-            assertTrue(mainThread != Worker.current.id)
-            assertSame(element, coroutineContext[MyElement])
-            assertSame(data, threadContextElementThreadLocal.get())
-        }
-        assertNull(threadContextElementThreadLocal.get())
-        job.join()
-        assertNull(threadContextElementThreadLocal.get())
-    }
-
-    @Test
-    fun testUndispatched() = runTest {
-        val exceptionHandler = coroutineContext[CoroutineExceptionHandler]!!
-        val data = MyData()
-        val element = MyElement(data)
-        val job = GlobalScope.launch(
-            context = Dispatchers.Default + exceptionHandler + element,
-            start = CoroutineStart.UNDISPATCHED
-        ) {
-            assertSame(data, threadContextElementThreadLocal.get())
-            yield()
-            assertSame(data, threadContextElementThreadLocal.get())
-        }
-        assertNull(threadContextElementThreadLocal.get())
-        job.join()
-        assertNull(threadContextElementThreadLocal.get())
-    }
-
     @Test
     fun testWithContext() = runTest {
         expect(1)