From 47afd9f6d63f7dcc9c87596a7e9308630687a455 Mon Sep 17 00:00:00 2001 From: Jane Sandberg Date: Sat, 15 Aug 2026 11:06:37 -0700 Subject: [PATCH] SOLR-18349: Use v2 of runComposeUiTest in the new ui tests The `runComposeUiTest` function [has been deprecated|https://developer.android.com/reference/kotlin/androidx/compose/ui/test/package-summary#runComposeUiTest(kotlin.coroutines.CoroutineContext,kotlin.coroutines.CoroutineContext,kotlin.time.Duration,kotlin.coroutines.SuspendFunction1)]. They have a drop-in replacement, though, we simply need to change the import. --- .../org/apache/solr/ui/views/auth/BasicAuthContentTest.kt | 2 +- .../apache/solr/ui/views/auth/UserAuthenticationContentTest.kt | 2 +- .../kotlin/org/apache/solr/ui/views/components/SolrCardTest.kt | 2 +- .../apache/solr/ui/views/configsets/ConfigsetsDropdownTest.kt | 2 +- .../solr/ui/views/configsets/CreateConfigsetDialogTest.kt | 2 +- .../solr/ui/views/configsets/ImportConfigsetDialogTest.kt | 2 +- .../apache/solr/ui/views/environment/EnvironmentContentTest.kt | 2 +- .../kotlin/org/apache/solr/ui/views/start/StartContentTest.kt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/auth/BasicAuthContentTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/auth/BasicAuthContentTest.kt index 403b97350ea9..e28ee5641c62 100644 --- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/auth/BasicAuthContentTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/auth/BasicAuthContentTest.kt @@ -23,7 +23,7 @@ import androidx.compose.ui.test.assert import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertIsNotEnabled import androidx.compose.ui.test.onNodeWithTag -import androidx.compose.ui.test.runComposeUiTest +import androidx.compose.ui.test.v2.runComposeUiTest import kotlin.test.Test import kotlin.test.assertEquals import org.apache.solr.ui.components.auth.BasicAuthComponent diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/auth/UserAuthenticationContentTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/auth/UserAuthenticationContentTest.kt index b805bc6e867b..f55fd7421bf7 100644 --- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/auth/UserAuthenticationContentTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/auth/UserAuthenticationContentTest.kt @@ -20,7 +20,7 @@ package org.apache.solr.ui.views.auth import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.onNodeWithTag -import androidx.compose.ui.test.runComposeUiTest +import androidx.compose.ui.test.v2.runComposeUiTest import kotlin.test.Test import org.apache.solr.ui.components.auth.AuthenticationComponent.Model import org.apache.solr.ui.generated.resources.Res diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/components/SolrCardTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/components/SolrCardTest.kt index 53fb3c99cdb6..89495d39cee3 100644 --- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/components/SolrCardTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/components/SolrCardTest.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.onNodeWithTag -import androidx.compose.ui.test.runComposeUiTest +import androidx.compose.ui.test.v2.runComposeUiTest import kotlin.test.Test class SolrCardTest { diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownTest.kt index ca275943c22d..dfdc4d9a3c69 100644 --- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownTest.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.test.assertIsNotEnabled import androidx.compose.ui.test.isDisplayed import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performClick -import androidx.compose.ui.test.runComposeUiTest +import androidx.compose.ui.test.v2.runComposeUiTest import kotlin.test.Test import org.apache.solr.ui.domain.Configset diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialogTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialogTest.kt index a3d7868eb9a4..fe89a54b0f19 100644 --- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialogTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialogTest.kt @@ -23,7 +23,7 @@ import androidx.compose.ui.test.assertIsNotEnabled import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performTextClearance import androidx.compose.ui.test.performTextInput -import androidx.compose.ui.test.runComposeUiTest +import androidx.compose.ui.test.v2.runComposeUiTest import kotlin.test.Test import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.UnconfinedTestDispatcher diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialogTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialogTest.kt index 1f064f318760..352780d1b15e 100644 --- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialogTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialogTest.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.test.assertTextContains import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performTextClearance -import androidx.compose.ui.test.runComposeUiTest +import androidx.compose.ui.test.v2.runComposeUiTest import kotlin.test.Test import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.UnconfinedTestDispatcher diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/environment/EnvironmentContentTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/environment/EnvironmentContentTest.kt index a118bca50849..71b224a3fa42 100644 --- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/environment/EnvironmentContentTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/environment/EnvironmentContentTest.kt @@ -19,7 +19,7 @@ package org.apache.solr.ui.views.environment import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.onNodeWithText -import androidx.compose.ui.test.runComposeUiTest +import androidx.compose.ui.test.v2.runComposeUiTest import kotlin.test.Test import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/start/StartContentTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/start/StartContentTest.kt index 6f1afa7f6a2d..ec5dcbb7924b 100644 --- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/start/StartContentTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/start/StartContentTest.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.test.isDisplayed import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick -import androidx.compose.ui.test.runComposeUiTest +import androidx.compose.ui.test.v2.runComposeUiTest import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue