Refactor CI configuration for Android tests

Author: VREMSoftwareDevelopment

.github/workflows/android_test_ci.yml

@@ -4,29 +4,29 @@ jobs:
   instrumentation_tests:
     runs-on: ubuntu-latest
     steps:
-    - name: checkout repository
-      uses: actions/checkout@v4
-    - name: set up JDK 21
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'zulu'
-        java-version: '21'
-    - name: set up Android SDK
-      uses: android-actions/setup-android@v3
-    - name: build APKs
-      run: |
-        ./gradlew assembleDebug
-        ./gradlew assembleAndroidTest
-    - name: run tests
-      uses: emulator-wtf/run-tests@v0
-      with:
-        api-token: ${{ secrets.EW_API_TOKEN }}
-        app: app/build/outputs/apk/debug/app-debug.apk
-        test: app/build/outputs/apk/androidTest/app-debug-androidTest.apk
-        outputs-dir: build/test-results
-    - name: publish test results
-      uses: mikepenz/action-junit-report@v5
-      if: always()
-      with:
-        report_paths: 'build/test-results/**/*.xml'
-        
+      - name: checkout repository
+        uses: actions/checkout@v4
+      - name: set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+      - name: set up Android SDK
+        uses: android-actions/setup-android@v3
+      - name: build app apk
+        run: bash ./gradlew assembleDebug
+      - name: build android test apk
+        run: bash ./gradlew assembleAndroidTest
+      - name: run tests
+        uses: emulator-wtf/run-tests@v0
+        with:
+          api-token: ${{ secrets.EW_API_TOKEN }}
+          app: app/build/outputs/apk/debug/app-debug.apk
+          test: app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
+          outputs-dir: build/test-results
+      - name: publish test results
+        uses: mikepenz/action-junit-report@v5
+        if: always()
+        with:
+          report_paths: 'build/test-results/**/*.xml'
+

app/src/androidTest/kotlin/com/vrem/wifianalyzer/FilterInstrumentedTest.kt

@@ -20,13 +20,13 @@ package com.vrem.wifianalyzer
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import org.hamcrest.Matchers.allOf
 
 internal class FilterInstrumentedTest : Runnable {
     override fun run() {
-        onView(withId(R.id.action_filter)).perform(click())
-        pauseShort()
-        onView(withId(android.R.id.button3)).perform(scrollTo(), click())
-        pauseShort()
+        onView(allOf(withId(R.id.action_filter), isDisplayed())).perform(click())
+        onView(allOf(withId(android.R.id.button3), isDisplayed())).perform(scrollTo(), click())
     }
 }

app/src/androidTest/kotlin/com/vrem/wifianalyzer/InstrumentedTestUtils.kt

@@ -20,13 +20,16 @@ package com.vrem.wifianalyzer
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
-import androidx.test.espresso.Espresso
+import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.matcher.BoundedMatcher
 import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.TypeSafeMatcher
 
-internal class ChildAtPosition(private val parentMatcher: Matcher<View>, private val position: Int) : TypeSafeMatcher<View>() {
+private const val SLEEP_1_SECOND = 1000
+private const val SLEEP_3_SECONDS = 3000
+
+internal class ChildAtPosition(val parentMatcher: Matcher<View>, val position: Int) : TypeSafeMatcher<View>() {
     override fun describeTo(description: Description) {
         description.appendText("Child at position $position in parent ")
         parentMatcher.describeTo(description)
@@ -49,20 +52,16 @@ internal fun withToolbarTitle(expectedTitle: CharSequence): Matcher<View> {
     }
 }
 
-private const val SLEEP_TIME_SHORT = 5000
-private const val SLEEP_TIME_LONG = SLEEP_TIME_SHORT * 3
-
 internal fun pressBackButton() {
-    pauseShort()
-    Espresso.pressBack()
+    pressBack()
 }
 
 internal fun pauseShort() {
-    pause(SLEEP_TIME_SHORT)
+    pause(SLEEP_1_SECOND)
 }
 
 internal fun pauseLong() {
-    pause(SLEEP_TIME_LONG)
+    pause(SLEEP_3_SECONDS)
 }
 
 private fun pause(sleepTime: Int) {

app/src/androidTest/kotlin/com/vrem/wifianalyzer/NavigationInstrumentedTest.kt

@@ -41,14 +41,12 @@ internal class NavigationInstrumentedTest : Runnable {
             8 to "Vendors"
         ).forEach { (id, title) ->
             selectMenuItem(id, title)
-            pauseShort()
         }
         listOf(
             10 to "Settings",
             11 to "About"
         ).forEach { (id, title) ->
             selectMenuItem(id, title)
-            pauseShort()
             pressBackButton()
         }
     }

app/src/androidTest/kotlin/com/vrem/wifianalyzer/ScannerInstrumentedTest.kt

@@ -30,11 +30,7 @@ internal class ScannerInstrumentedTest : Runnable {
 
     override fun run() {
         onView(allOf(withId(action_scanner), withContentDescription(PAUSE), isDisplayed())).perform(click())
-        pauseShort()
         onView(allOf(withId(action_scanner), withContentDescription(PLAY), isDisplayed())).perform(click())
-        pauseShort()
-        onView(allOf(withId(action_scanner), withContentDescription(PAUSE), isDisplayed()))
-        pauseShort()
     }
 
 }