[do not merge]: no compose dependencies [skip ci]

espresso-server/app/build.gradle.kts

@@ -115,8 +115,8 @@ dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test:${kotlinVersion}")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
     testImplementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
-    testImplementation("androidx.compose.ui:ui-test:${composeVersion}")
-    testImplementation("androidx.compose.ui:ui-test-junit4:${composeVersion}")
+//    testImplementation("androidx.compose.ui:ui-test:${composeVersion}")
+//    testImplementation("androidx.compose.ui:ui-test-junit4:${composeVersion}")
 
     androidTestImplementation("androidx.annotation:annotation:${annotationVersion}")
     androidTestImplementation("androidx.test.espresso:espresso-contrib:${espressoVersion}") {
@@ -137,12 +137,12 @@ dependencies {
     androidTestImplementation("org.nanohttpd:nanohttpd-webserver:${Version.nanohttpd}")
     androidTestImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
     androidTestImplementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
-    androidTestImplementation("androidx.compose.ui:ui-test:${composeVersion}") {
-        because("Android Compose support")
-    }
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:${composeVersion}") {
-        because("Android Compose support")
-    }
+//    androidTestImplementation("androidx.compose.ui:ui-test:${composeVersion}") {
+//        because("Android Compose support")
+//    }
+//    androidTestImplementation("androidx.compose.ui:ui-test-junit4:${composeVersion}") {
+//        because("Android Compose support")
+//    }
 
     // additionalAndroidTestDependencies placeholder (don't change or delete this line)
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/EspressoServerRunnerTest.kt

@@ -31,7 +31,6 @@ import org.junit.Rule
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 
 /**
  * Instrumentation test, which will execute on an Android device.
@@ -41,24 +40,6 @@ import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 @LargeTest
 class EspressoServerRunnerTest {
 
-    @get:Rule
-    val composeRule = AndroidComposeTestRule(
-        activityRule = EmptyTestRule(),
-        activityProvider = { error("Can't provide current activity") }
-    ).also {
-        composeTestRule = it
-    }
-
-    private val syncComposeClock = Thread {
-        while (!Server.isStopRequestReceived) {
-            if (context.currentStrategyType == DriverContext.StrategyType.COMPOSE) {
-                composeTestRule.mainClock.advanceTimeByFrame()
-            }
-            // Let Android run measure, draw and in general any other async operations. AndroidComposeTestRule.android.kt:325
-            Thread.sleep(ANDROID_ASYNC_WAIT_TIME_MS)
-        }
-    }
-
     @Test
     @Throws(InterruptedException::class, IOException::class, DuplicateRouteException::class)
     fun startEspressoServer() {
@@ -68,13 +49,11 @@ class EspressoServerRunnerTest {
         }
         try {
             Server.start()
-            syncComposeClock.start()
             while (!Server.isStopRequestReceived) {
                 Thread.sleep(1000)
             }
         } finally {
             Server.stop()
-            syncComposeClock.join()
         }
 
         assertEquals(true, true) // Keep Codacy happy
@@ -85,7 +64,6 @@ class EspressoServerRunnerTest {
     }
 
     companion object {
-        lateinit var composeTestRule: AndroidComposeTestRule<*, *>
         val context = DriverContext()
         const val ANDROID_ASYNC_WAIT_TIME_MS = 10L
     }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/Clear.kt

@@ -16,15 +16,12 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import androidx.compose.ui.test.performTextClearance
 import androidx.test.espresso.PerformException
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.EspressoElement
 
 import androidx.test.espresso.action.ViewActions.clearText
-import io.appium.espressoserver.lib.handlers.exceptions.StaleElementException
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
 
 class Clear : RequestHandler<AppiumParams, Unit> {
 
@@ -36,14 +33,4 @@ class Clear : RequestHandler<AppiumParams, Unit> {
             throw InvalidElementStateException("clear", params.elementId!!, e)
         }
     }
-
-    override fun handleCompose(params: AppiumParams) {
-        try {
-            getNodeInteractionById(params.elementId).performTextClearance()
-        } catch (e: AssertionError) {
-            throw StaleElementException(params.elementId!!)
-        } catch (e: IllegalArgumentException) {
-            throw InvalidElementStateException("Clear", params.elementId!!, e)
-        }
-    }
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/Click.kt

@@ -16,15 +16,12 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import androidx.compose.ui.test.performClick
 import androidx.test.espresso.PerformException
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.EspressoElement
 
 import androidx.test.espresso.action.ViewActions.click
-import io.appium.espressoserver.lib.handlers.exceptions.StaleElementException
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
 
 class Click : RequestHandler<AppiumParams, Unit> {
 
@@ -36,14 +33,4 @@ class Click : RequestHandler<AppiumParams, Unit> {
             throw InvalidElementStateException("click", params.elementId!!, e)
         }
     }
-
-    override fun handleCompose(params: AppiumParams) {
-        try {
-            getNodeInteractionById(params.elementId).performClick()
-        } catch (e: AssertionError) {
-            throw StaleElementException(params.elementId!!)
-        } catch (e: IllegalArgumentException) {
-            throw InvalidElementStateException("Click", params.elementId!!, e)
-        }
-    }
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/ElementScreenshot.kt

@@ -16,8 +16,6 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
-import io.appium.espressoserver.lib.helpers.takeComposeNodeScreenshot
 import io.appium.espressoserver.lib.helpers.takeEspressoViewScreenshot
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.EspressoElement
@@ -26,7 +24,4 @@ class ElementScreenshot : RequestHandler<AppiumParams, String> {
 
     override fun handleEspresso(params: AppiumParams): String =
         takeEspressoViewScreenshot(EspressoElement.getCachedViewStateById(params.elementId).view)
-
-    override fun handleCompose(params: AppiumParams): String =
-        takeComposeNodeScreenshot(getNodeInteractionById(params.elementId!!))
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/ElementValue.kt

@@ -18,8 +18,6 @@ package io.appium.espressoserver.lib.handlers
 
 import android.widget.NumberPicker
 import android.widget.ProgressBar
-import androidx.compose.ui.test.performTextClearance
-import androidx.compose.ui.test.performTextInput
 import androidx.test.espresso.PerformException
 
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException
@@ -30,7 +28,6 @@ import androidx.test.espresso.action.ViewActions.replaceText
 import androidx.test.espresso.action.ViewActions.typeText
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidElementStateException
 import io.appium.espressoserver.lib.helpers.AndroidLogger
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
 import io.appium.espressoserver.lib.viewaction.ViewTextGetter
 
 class ElementValue(private val isReplacing: Boolean) : RequestHandler<TextValueParams, Unit> {
@@ -76,18 +73,6 @@ class ElementValue(private val isReplacing: Boolean) : RequestHandler<TextValueP
         }
     }
 
-    override fun handleCompose(params: TextValueParams) {
-        val value: String = extractTextToEnter(params)
-        try {
-            if (isReplacing) {
-                getNodeInteractionById(params.elementId).performTextClearance()
-            }
-            getNodeInteractionById(params.elementId).performTextInput(value)
-        } catch (e: IllegalArgumentException) {
-            throw InvalidElementStateException("Clear", params.elementId!!, e)
-        }
-    }
-
     private fun extractTextToEnter(params: TextValueParams) =
         when (Pair(params.value == null, params.text == null)) {
             Pair(

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/FindElement.kt

@@ -19,7 +19,6 @@ package io.appium.espressoserver.lib.handlers
 import io.appium.espressoserver.lib.handlers.exceptions.*
 import io.appium.espressoserver.lib.helpers.*
 import io.appium.espressoserver.lib.model.BaseElement
-import io.appium.espressoserver.lib.model.ComposeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.Locator
 import io.appium.espressoserver.lib.viewaction.ViewGetter
@@ -46,15 +45,4 @@ class FindElement : RequestHandler<Locator, BaseElement> {
         // If we have a match, return success
         return EspressoElement(viewState)
     }
-
-    override fun handleCompose(params: Locator): BaseElement {
-        val nodeInteractions = toNodeInteractionsCollection(params)
-        if (nodeInteractions.fetchSemanticsNodes(false).isEmpty()) throw NoSuchElementException(
-            String.format(
-                "Could not find a compose element with strategy '%s' and selector '%s'",
-                params.using, params.value
-            )
-        )
-        return ComposeElement(nodeInteractions[0])
-    }
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/FindElements.kt

@@ -20,7 +20,6 @@ import io.appium.espressoserver.lib.handlers.exceptions.InvalidArgumentException
 import io.appium.espressoserver.lib.handlers.exceptions.InvalidSelectorException
 import io.appium.espressoserver.lib.helpers.*
 import io.appium.espressoserver.lib.model.BaseElement
-import io.appium.espressoserver.lib.model.ComposeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.Locator
 import io.appium.espressoserver.lib.viewaction.ViewGetter
@@ -39,10 +38,4 @@ class FindElements : RequestHandler<Locator, List<BaseElement>> {
             params.value ?: throw InvalidArgumentException()
         ).map { EspressoElement(it) }
     }
-
-    override fun handleCompose(params: Locator): List<BaseElement> {
-        val nodeInteractions = toNodeInteractionsCollection(params)
-        return List(nodeInteractions.fetchSemanticsNodes(false).size)
-            { index -> ComposeElement(nodeInteractions[index]) }
-    }
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetAttribute.kt

@@ -24,7 +24,6 @@ import io.appium.espressoserver.lib.drivers.DriverContext
 import io.appium.espressoserver.lib.handlers.exceptions.AppiumException
 import io.appium.espressoserver.lib.handlers.exceptions.NotYetImplementedException
 import io.appium.espressoserver.lib.helpers.AndroidLogger
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.*
 import io.appium.espressoserver.lib.viewaction.ViewTextGetter
 
@@ -39,15 +38,7 @@ class GetAttribute : RequestHandler<AppiumParams, String?> {
             throw AppiumException("Attribute name cannot be null or empty")
         }
 
-        return when (EspressoServerRunnerTest.context.currentStrategyType) {
-            DriverContext.StrategyType.COMPOSE -> getComposeAttribute(params.elementId!!, attributeName)
-            DriverContext.StrategyType.ESPRESSO -> getEspressoAttribute(params.elementId!!, attributeName)
-        }
-    }
-
-
-    private fun getComposeAttribute(elementId: String, attributeName: String): String? {
-        return ComposeNodeElement(getSemanticsNode(elementId)).getAttribute(attributeName)
+        return getEspressoAttribute(params.elementId!!, attributeName)
     }
 
     private fun getEspressoAttribute(elementId: String, attributeName: String): String? {

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetDisplayed.kt

@@ -16,8 +16,6 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import androidx.compose.ui.test.assertIsDisplayed
-import io.appium.espressoserver.lib.helpers.getNodeInteractionById
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.ViewElement
@@ -26,13 +24,5 @@ class GetDisplayed : RequestHandler<AppiumParams, Boolean> {
 
     override fun handleEspresso(params: AppiumParams): Boolean =
         ViewElement(EspressoElement.getCachedViewStateById(params.elementId, false).view).isVisible
-
-    override fun handleCompose(params: AppiumParams): Boolean =
-        try {
-            getNodeInteractionById(params.elementId).assertIsDisplayed()
-            true
-        } catch (e: AssertionError) {
-            false
-        }
 }
 

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetEnabled.kt

@@ -16,17 +16,12 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.ViewElement
 import io.appium.espressoserver.lib.model.EspressoElement
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetEnabled : RequestHandler<AppiumParams, Boolean> {
 
     override fun handleEspresso(params: AppiumParams): Boolean =
         ViewElement(EspressoElement.getCachedViewStateById(params.elementId).view).isEnabled
-
-    override fun handleCompose(params: AppiumParams): Boolean =
-        ComposeNodeElement(getSemanticsNode(params.elementId!!)).isEnabled
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetLocation.kt

@@ -16,22 +16,15 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.Location
 import io.appium.espressoserver.lib.model.ViewElement
 import io.appium.espressoserver.lib.model.EspressoElement
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetLocation : RequestHandler<AppiumParams, Location> {
 
     override fun handleEspresso(params: AppiumParams): Location {
         val viewElement = ViewElement(EspressoElement.getCachedViewStateById(params.elementId).view)
         return Location(viewElement.bounds.left, viewElement.bounds.top)
     }
-
-    override fun handleCompose(params: AppiumParams): Location {
-        val composeNodeElement = ComposeNodeElement(getSemanticsNode(params.elementId!!))
-        return Location(composeNodeElement.bounds.left, composeNodeElement.bounds.top)
-    }
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetName.kt

@@ -16,21 +16,14 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
 import io.appium.espressoserver.lib.model.ViewElement
 import io.appium.espressoserver.lib.model.EspressoElement
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 
 class GetName : RequestHandler<AppiumParams, String?> {
 
     override fun handleEspresso(params: AppiumParams): String? {
         val viewState = EspressoElement.getCachedViewStateById(params.elementId)
         return ViewElement(viewState.view).contentDescription?.toString()
     }
-
-    override fun handleCompose(params: AppiumParams): String? {
-        val composeNodeElement = ComposeNodeElement(getSemanticsNode(params.elementId!!))
-        return composeNodeElement.contentDescription?.toString()
-    }
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetRect.kt

@@ -16,9 +16,7 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 import io.appium.espressoserver.lib.model.Rect
 import io.appium.espressoserver.lib.model.ViewElement
@@ -27,7 +25,4 @@ class GetRect : RequestHandler<AppiumParams, Rect> {
 
     override fun handleEspresso(params: AppiumParams): Rect =
         ViewElement(EspressoElement.getCachedViewStateById(params.elementId).view).rect
-
-    override fun handleCompose(params: AppiumParams): Rect =
-        ComposeNodeElement(getSemanticsNode(params.elementId!!)).rect
 }

espresso-server/app/src/androidTest/java/io/appium/espressoserver/lib/handlers/GetSelected.kt

@@ -16,9 +16,7 @@
 
 package io.appium.espressoserver.lib.handlers
 
-import io.appium.espressoserver.lib.helpers.getSemanticsNode
 import io.appium.espressoserver.lib.model.AppiumParams
-import io.appium.espressoserver.lib.model.ComposeNodeElement
 import io.appium.espressoserver.lib.model.EspressoElement
 
 import io.appium.espressoserver.lib.model.ViewElement
@@ -27,7 +25,4 @@ class GetSelected : RequestHandler<AppiumParams, Boolean> {
 
     override fun handleEspresso(params: AppiumParams): Boolean =
             ViewElement(EspressoElement.getCachedViewStateById(params.elementId).view).isSelected
-
-    override fun handleCompose(params: AppiumParams): Boolean =
-            ComposeNodeElement(getSemanticsNode(params.elementId!!)).isSelected
 }