refactor emulator tests

Author: VREMSoftwareDevelopment

.github/actions/emulator-step/action.yml

@@ -14,8 +14,9 @@ runs:
       with:
         api-level: ${{ inputs.api-level }}
         arch: x86_64
-        profile: Medium Phone
+        profile: medium_phone
         force-avd-creation: false
         emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
         disable-animations: true
         script: ${{ inputs.script }}
+

.github/workflows/android-ci.yml

@@ -4,7 +4,6 @@ on:
   push:
     paths-ignore:
       - '**/*.md'
-      - '.github/workflows/android-test-ci.yml'
       - '.github/workflows/android-emulator-test.yml'
       - '.github/workflows/codeql-analysis.yml'
       - '.github/workflows/close-empty-xml.yml'
@@ -13,7 +12,6 @@ on:
   pull_request:
     paths-ignore:
       - '**/*.md'
-      - '.github/workflows/android-test-ci.yml'
       - '.github/workflows/android-emulator-test.yml'
       - '.github/workflows/codeql-analysis.yml'
       - '.github/workflows/close-empty-xml.yml'

.github/workflows/android-test-ci.yml

@@ -27,21 +27,13 @@ import org.hamcrest.Matchers.allOf
 internal class ChannelAvailableInstrumentedTest : Runnable {
     override fun run() {
         selectMenuItem(7, "Available Channels")
-        verify2GHzSection()
-        verify5GHzSection()
-        verify6GHzSection()
+        verifySections()
         pressBack()
     }
 
-    private fun verify2GHzSection() {
-        onView(allOf(withText("2.4 GHz"), isDisplayed())).check(matches(isDisplayed()))
-    }
-
-    private fun verify5GHzSection() {
-        onView(allOf(withText("5 GHz"), isDisplayed())).check(matches(isDisplayed()))
-    }
-
-    private fun verify6GHzSection() {
-        onView(allOf(withText("6 GHz"), isDisplayed())).check(matches(isDisplayed()))
+    private fun verifySections() {
+        listOf("2.4 GHz", "5 GHz", "6 GHz").forEach { section ->
+            onView(allOf(withText(section), isDisplayed())).check(matches(isDisplayed()))
+        }
     }
 }

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

@@ -22,6 +22,7 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.ViewAction
 import androidx.test.espresso.action.GeneralClickAction
@@ -31,6 +32,8 @@ import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.BoundedMatcher
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
@@ -155,3 +158,9 @@ internal fun selectMenuItem(
 
     onView(isAssignableFrom(Toolbar::class.java)).check(matches(withToolbarTitle(expectedTitle)))
 }
+
+internal fun scrollToAndVerify(text: String, recyclerViewId: Int = androidx.preference.R.id.recycler_view) {
+    onView(withId(recyclerViewId))
+        .perform(RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(hasDescendant(withText(text))))
+    onView(withText(text)).check(matches(isDisplayed()))
+}

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

@@ -17,46 +17,30 @@
  */
 package com.vrem.wifianalyzer
 
-import androidx.recyclerview.widget.RecyclerView
-import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.contrib.RecyclerViewActions
-import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
 
 internal class SettingsInstrumentedTest : Runnable {
     override fun run() {
         selectMenuItem(10, "Settings")
-        verifyVisibleSettings()
-        verifyScrollableSettings()
+        verifySettings()
         pressBack()
     }
 
-    private fun verifyVisibleSettings() {
-        onView(withText("Scan Interval")).check(matches(isDisplayed()))
-        onView(withText("Sort Access Points By")).check(matches(isDisplayed()))
-        onView(withText("Group Access Points By")).check(matches(isDisplayed()))
-        onView(withText("Connection Display")).check(matches(isDisplayed()))
-        onView(withText("Access Point Display")).check(matches(isDisplayed()))
-        onView(withText("Graph Maximum Signal Strength")).check(matches(isDisplayed()))
-        onView(withText("Channel Graph Legend Display")).check(matches(isDisplayed()))
-        onView(withText("Time Graph Legend Display")).check(matches(isDisplayed()))
-    }
-
-    private fun verifyScrollableSettings() {
-        scrollToAndVerify("Theme")
-        scrollToAndVerify("Keep screen on")
-        scrollToAndVerify("Country")
-        scrollToAndVerify("Language")
-        scrollToAndVerify("Reset")
-    }
-
-    private fun scrollToAndVerify(text: String) {
-        onView(withId(androidx.preference.R.id.recycler_view))
-            .perform(RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(hasDescendant(withText(text))))
-        onView(withText(text)).check(matches(isDisplayed()))
+    private fun verifySettings() {
+        listOf(
+            "Scan Interval",
+            "Sort Access Points By",
+            "Group Access Points By",
+            "Connection Display",
+            "Access Point Display",
+            "Graph Maximum Signal Strength",
+            "Channel Graph Legend Display",
+            "Time Graph Legend Display",
+            "Theme",
+            "Keep screen on",
+            "Country",
+            "Language",
+            "Reset"
+        ).forEach { scrollToAndVerify(it) }
     }
 }