Fix the tests after updating to Kotlin 2.1.0

JetBrains · Jan 21, 2025 · 4ebd80f · 4ebd80f
1 parent 0f12171
commit 4ebd80f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/...rces/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.kt b/...rces/library/src/commonTest/kotlin/org/jetbrains/compose/resources/ComposeResourceTest.kt
@@ -5,7 +5,10 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.runComposeUiTest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.withContext
 import kotlin.test.*
 
 @OptIn(ExperimentalTestApi::class, InternalResourceApi::class)

diff --git a/...es/library/src/commonTest/kotlin/org/jetbrains/compose/resources/RecompositionsCounter.kt b/...es/library/src/commonTest/kotlin/org/jetbrains/compose/resources/RecompositionsCounter.kt
@@ -1,12 +1,14 @@
 package org.jetbrains.compose.resources
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.NonSkippableComposable
 
 internal class RecompositionsCounter {
     var count = 0
         private set
 
     @Composable
+    @NonSkippableComposable
     fun content(block: @Composable () -> Unit) {
         count++
         block()

diff --git a/...sources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/StringFormatTest.kt b/...sources/library/src/commonTest/kotlin/org/jetbrains/compose/resources/StringFormatTest.kt
@@ -87,7 +87,7 @@ class StringFormatTest {
     }
 
     @Test
-    fun `replaceWithArgs ensures %d and %s placeholders behave identically`() {
+    fun `replaceWithArgs ensures _d and _s placeholders behave identically`() {
         val template = "%1\$d, %1\$s, %2\$d, %2\$s"
         val args = listOf("42", "hello")
 

diff --git a/html/core/src/jsTest/kotlin/FailingTestCases.kt b/html/core/src/jsTest/kotlin/FailingTestCases.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.compose.web.core.tests
 
 import kotlin.test.Test
+import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class FailingTestCases {
@@ -20,7 +21,8 @@ class FailingTestCases {
         } catch (e: Throwable) {
             expectedErrorThrown = true
         }
-        assertTrue(expectedErrorThrown)
+        // No exception in Kotlin 2.1.0
+        assertFalse(expectedErrorThrown)
     }
 }