Allow using kotlin.test from tests in the core module from JavaFx

Author: dkhalanskyjb

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

@@ -26,13 +26,8 @@ abstract class MainDispatcherTestBase: TestBase() {
     /** Tests the [toString] behavior of [Dispatchers.Main] and [MainCoroutineDispatcher.immediate] */
     @Test
     fun testMainDispatcherToString() {
-        // TODO: workaround for not having module-info.java for the `test` source set
-        if (Dispatchers.Main.toString() != "Dispatchers.Main") {
-            throw AssertionError("Expected Dispatchers.Main, but had ${Dispatchers.Main}")
-        }
-        if (Dispatchers.Main.immediate.toString() != "Dispatchers.Main.immediate") {
-            throw AssertionError("Expected Dispatchers.Main.immediate, but had ${Dispatchers.Main.immediate}")
-        }
+        assertEquals("Dispatchers.Main", Dispatchers.Main.toString())
+        assertEquals("Dispatchers.Main.immediate", Dispatchers.Main.immediate.toString())
     }
 
     /** Tests that the tasks scheduled earlier from [MainCoroutineDispatcher.immediate] will be executed earlier,
@@ -54,10 +49,7 @@ abstract class MainDispatcherTestBase: TestBase() {
     /** Tests that [Dispatchers.Main] and its [MainCoroutineDispatcher.immediate] are treated as different values. */
     @Test
     fun testHandlerDispatcherNotEqualToImmediate() {
-        // TODO: workaround for not having module-info.java for the `test` source set
-        if (Dispatchers.Main == Dispatchers.Main.immediate) {
-            throw AssertionError("Expected Dispatchers.Main and Dispatchers.Main.immediate not to be equal")
-        }
+        assertNotEquals(Dispatchers.Main, Dispatchers.Main.immediate)
     }
 
     /** Tests that after a delay, the execution gets back to the main thread. */

ui/kotlinx-coroutines-javafx/build.gradle.kts

@@ -2,15 +2,8 @@
  * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
-buildscript {
-    dependencies {
-        // this line can be removed when https://github.com/openjfx/javafx-gradle-plugin/pull/135 is released
-        classpath("org.javamodularity:moduleplugin:1.8.12")
-    }
-}
-
 plugins {
-    id("org.openjfx.javafxplugin") version "0.0.13"
+    id("org.openjfx.javafxplugin") version "0.0.14"
 }
 
 configurations {
@@ -34,6 +27,7 @@ tasks {
     test {
         extensions.configure(org.javamodularity.moduleplugin.extensions.TestModuleOptions::class) {
             addReads["kotlinx.coroutines.core"] = "junit"
+            addReads["kotlinx.coroutines.core"] = "kotlin.test"
             addReads["kotlinx.coroutines.javafx"] = "kotlin.test"
         }
         jvmArgs = listOf(