Expect CME only on JVM

Author: ilya-g

core/commonTest/src/contract/list/ImmutableListTest.kt

@@ -19,8 +19,7 @@ package kotlinx.collections.immutable.contractTests.immutableList
 import kotlinx.collections.immutable.*
 import kotlinx.collections.immutable.contractTests.compare
 import kotlinx.collections.immutable.contractTests.listBehavior
-import kotlinx.collections.immutable.tests.isDigit
-import kotlinx.collections.immutable.tests.isUpperCase
+import kotlinx.collections.immutable.tests.*
 import kotlin.test.*
 
 class ImmutableListTest {
@@ -152,7 +151,9 @@ class ImmutableListTest {
         // So, structural changes in builder causes CME on subList iteration.
         var subList = builder.subList(2, 5)
         builder[4] = 'x'
-        assertFailsWith<ConcurrentModificationException> { subList.joinToString("") }
+        testOn(TestPlatform.JVM) {
+            assertFailsWith<ConcurrentModificationException> { subList.joinToString("") }
+        }
 
         // builder is the exclusive owner of the inner trie.
         // So, `set(index, value)` doesn't lead to structural changes.

core/commonTest/src/stress/list/PersistentListBuilderTest.kt

@@ -20,6 +20,7 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.contractTests.compare
 import kotlinx.collections.immutable.contractTests.listIteratorProperties
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.tests.*
 import kotlin.random.Random
 import kotlin.test.*
 
@@ -282,8 +283,10 @@ class PersistentListBuilderTest {
         assertEquals(0, builder[beginIndex * 2])
 
         builder.add(0)
-        assertFailsWith<ConcurrentModificationException> {
-            subList.add(0)
+        testOn(TestPlatform.JVM) {
+            assertFailsWith<ConcurrentModificationException> {
+                subList.add(0)
+            }
         }
     }
 

core/commonTest/src/testUtils.kt

@@ -29,3 +29,14 @@ internal fun <K, V> MutableMap<K, V>.remove(key: K, value: V): Boolean =
         }
 
 public expect fun assertTypeEquals(expected: Any?, actual: Any?)
+
+public enum class TestPlatform {
+    JVM,
+    JS,
+    Native
+}
+public expect val currentPlatform: TestPlatform
+
+public inline fun testOn(platform: TestPlatform, action: () -> Unit) {
+    if (platform == currentPlatform) action()
+}

core/jsTest/src/testUtilsJs.kt

@@ -20,4 +20,6 @@ import kotlin.test.assertEquals
 
 public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
     assertEquals(expected?.let { it::class.js }, actual?.let { it::class.js })
-}
+}
+
+public actual val currentPlatform: TestPlatform get() = TestPlatform.JS

core/jvmTest/src/testUtilsJvm.kt

@@ -20,4 +20,6 @@ import kotlin.test.assertEquals
 
 public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
     assertEquals(expected?.javaClass, actual?.javaClass)
-}
+}
+
+public actual val currentPlatform: TestPlatform get() = TestPlatform.JVM

core/nativeTest/src/testUtilsNative.kt

@@ -26,3 +26,5 @@ public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
         assertTrue(expected == null && actual == null)
     }
 }
+
+public actual val currentPlatform: TestPlatform get() = TestPlatform.Native