enhance instrumented tests

Author: VREMSoftwareDevelopment

.github/workflows/android_ci.yml

@@ -28,10 +28,12 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./app/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml
+      - name: run instrumented tests
+        run: bash ./gradlew connectedAndroidTest --stacktrace
       - name: build apk
         run: bash ./gradlew assembleDebug --stacktrace
       - name: artifact apk
         uses: actions/upload-artifact@v4
         with:
           name: artifact-apk
-          path: app/build/outputs/apk/debug
+          path: app/build/outputs/apk/debug

app/build.gradle

@@ -57,6 +57,7 @@ dependencies {
     // Android Test Dependencies
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
 }
 
 android {

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Mon Mar 31 19:38:42 EDT 2025
-version_build=3
+#Mon Mar 31 20:38:21 EDT 2025
+version_build=4
 version_major=3
 version_minor=2
 version_patch=0

app/jacoco.gradle

@@ -70,7 +70,7 @@ task jacocoTestCoverageVerification(type: JacocoCoverageVerification, dependsOn:
             }
             limit {
                 counter = 'BRANCH'
-                minimum = 0.87
+                minimum = 0.88
             }
             limit {
                 counter = 'COMPLEXITY'

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

@@ -17,59 +17,16 @@
  */
 package com.vrem.wifianalyzer
 
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.matcher.ViewMatchers
-import org.hamcrest.Matchers
+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.withId
 
 internal class FilterInstrumentedTest : Runnable {
     override fun run() {
-        actionOpen()
-        actionClose()
-    }
-
-    private fun actionClose() {
-        pauseLong()
-        Espresso.onView(
-            Matchers.allOf(
-                ViewMatchers.withId(android.R.id.button3),
-                ViewMatchers.withText(FILTER_CLOSE_TAG),
-                ChildAtPosition(
-                    ChildAtPosition(
-                        ViewMatchers.withClassName(Matchers.`is`("android.widget.ScrollView")),
-                        FILTER_BUTTON_CLOSE
-                    ), FILTER_ACTION
-                )
-            )
-        )
-            .perform(ViewActions.scrollTo(), ViewActions.click())
-    }
-
-    private fun actionOpen() {
+        onView(withId(R.id.action_filter)).perform(click())
+        pauseShort()
+        onView(withId(android.R.id.button3)).perform(scrollTo(), click())
         pauseShort()
-        Espresso.onView(
-            Matchers.allOf(
-                ViewMatchers.withId(R.id.action_filter),
-                ViewMatchers.withContentDescription(FILTER_BUTTON_TAG),
-                ChildAtPosition(
-                    ChildAtPosition(
-                        ViewMatchers.withId(R.id.toolbar),
-                        FILTER_BUTTON_OPEN
-                    ),
-                    FILTER_ACTION
-                ),
-                ViewMatchers.isDisplayed()
-            )
-        )
-            .perform(ViewActions.click())
-    }
-
-
-    companion object {
-        private const val FILTER_BUTTON_OPEN = 2
-        private const val FILTER_BUTTON_CLOSE = 0
-        private const val FILTER_ACTION = 0
-        private const val FILTER_BUTTON_TAG = "Filter"
-        private const val FILTER_CLOSE_TAG = "Close"
     }
-}
+}

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

@@ -19,7 +19,9 @@ 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.matcher.BoundedMatcher
 import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.TypeSafeMatcher
@@ -36,6 +38,17 @@ internal class ChildAtPosition(private val parentMatcher: Matcher<View>, private
     }
 }
 
+internal fun withToolbarTitle(expectedTitle: CharSequence): Matcher<View> {
+    return object : BoundedMatcher<View, Toolbar>(Toolbar::class.java) {
+        override fun describeTo(description: Description) {
+            description.appendText("with toolbar title: $expectedTitle")
+        }
+
+        override fun matchesSafely(toolbar: Toolbar): Boolean =
+            toolbar.title == expectedTitle
+    }
+}
+
 private const val SLEEP_TIME_SHORT = 5000
 private const val SLEEP_TIME_LONG = SLEEP_TIME_SHORT * 3
 

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

@@ -21,6 +21,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
+import androidx.test.rule.GrantPermissionRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -32,24 +33,27 @@ class MainInstrumentedTest {
     @get:Rule
     val activityTestRule: ActivityScenarioRule<MainActivity> = activityScenarioRule()
 
+    @get:Rule
+    val grantPermissionRule: GrantPermissionRule = GrantPermissionRule.grant(
+        android.Manifest.permission.ACCESS_COARSE_LOCATION,
+        android.Manifest.permission.ACCESS_FINE_LOCATION,
+        android.Manifest.permission.ACCESS_WIFI_STATE,
+        android.Manifest.permission.CHANGE_WIFI_STATE,
+        android.Manifest.permission.NEARBY_WIFI_DEVICES
+    )
+
     @Test
     fun navigation() {
-        pauseShort()
         NavigationInstrumentedTest().run()
-        pauseShort()
     }
 
     @Test
     fun scanner() {
-        pauseShort()
         ScannerInstrumentedTest().run()
-        pauseShort()
     }
 
     @Test
     fun filter() {
-        pauseShort()
         FilterInstrumentedTest().run()
-        pauseShort()
     }
 }

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

@@ -17,71 +17,73 @@
  */
 package com.vrem.wifianalyzer
 
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.appcompat.widget.Toolbar
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.*
 import org.hamcrest.Matchers
+import org.hamcrest.Matchers.allOf
+
+private const val NAVIGATION_DRAWER_BUTTON = 0
+private const val NAVIGATION_DRAWER_ACTION = 1
+private const val NAVIGATION_DRAWER_TAG = "Open navigation drawer"
 
 internal class NavigationInstrumentedTest : Runnable {
+
     override fun run() {
-        selectMenuItem(CHANNEL_RATING)
-        selectMenuItem(CHANNEL_GRAPH)
-        selectMenuItem(TIME_GRAPH)
-        pauseLong()
-        selectMenuItem(AVAILABLE_CHANNELS)
-        selectMenuItem(VENDORS)
-        selectMenuItem(ACCESS_POINTS)
-        selectMenuItem(SETTINGS)
-        pressBackButton()
-        selectMenuItem(ABOUT)
-        pressBackButton()
+        listOf(
+            2 to "Channel Rating",
+            3 to "Channel Graph",
+            4 to "Time Graph",
+            1 to "Access Points",
+            7 to "Available Channels",
+            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()
+        }
     }
 
-    private fun selectMenuItem(menuItem: Int) {
-        pauseShort()
-        val appCompatImageButton = Espresso.onView(
-            Matchers.allOf(
-                ViewMatchers.withContentDescription(NAVIGATION_DRAWER_TAG),
+    private fun selectMenuItem(menuItem: Int, expectedTitle: String) {
+        onView(
+            allOf(
+                withContentDescription(NAVIGATION_DRAWER_TAG),
                 ChildAtPosition(
-                    Matchers.allOf(
-                        ViewMatchers.withId(R.id.toolbar),
+                    allOf(
+                        withId(R.id.toolbar),
                         ChildAtPosition(
-                            ViewMatchers.withClassName(Matchers.`is`("com.google.android.material.appbar.AppBarLayout")),
+                            withClassName(Matchers.`is`("com.google.android.material.appbar.AppBarLayout")),
                             NAVIGATION_DRAWER_BUTTON
                         )
                     ),
                     NAVIGATION_DRAWER_ACTION
                 ),
-                ViewMatchers.isDisplayed()
+                isDisplayed()
             )
-        )
-        appCompatImageButton.perform(ViewActions.click())
-        pauseShort()
-        val navigationMenuItemView = Espresso.onView(
-            Matchers.allOf(
+        ).check(matches(isDisplayed())).perform(click())
+
+        onView(
+            allOf(
                 ChildAtPosition(
-                    Matchers.allOf(
-                        ViewMatchers.withId(com.google.android.material.R.id.design_navigation_view),
-                        ChildAtPosition(ViewMatchers.withId(R.id.nav_drawer), NAVIGATION_DRAWER_BUTTON)
+                    allOf(
+                        withId(com.google.android.material.R.id.design_navigation_view),
+                        ChildAtPosition(withId(R.id.nav_drawer), NAVIGATION_DRAWER_BUTTON)
                     ), menuItem
                 ),
-                ViewMatchers.isDisplayed()
+                isDisplayed()
             )
-        )
-        navigationMenuItemView.perform(ViewActions.click())
-    }
+        ).check(matches(isDisplayed())).perform(click())
 
-    companion object {
-        private const val ACCESS_POINTS = 1
-        private const val CHANNEL_RATING = 2
-        private const val CHANNEL_GRAPH = 3
-        private const val TIME_GRAPH = 4
-        private const val AVAILABLE_CHANNELS = 7
-        private const val VENDORS = 8
-        private const val SETTINGS = 10
-        private const val ABOUT = 11
-        private const val NAVIGATION_DRAWER_BUTTON = 0
-        private const val NAVIGATION_DRAWER_ACTION = 1
-        private const val NAVIGATION_DRAWER_TAG = "Open navigation drawer"
+        onView(isAssignableFrom(Toolbar::class.java)).check(matches(withToolbarTitle(expectedTitle)))
     }
+
 }

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

@@ -17,38 +17,24 @@
  */
 package com.vrem.wifianalyzer
 
-import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.matcher.ViewMatchers
-import org.hamcrest.Matchers
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.matcher.ViewMatchers.*
+import com.vrem.wifianalyzer.R.id.action_scanner
+import org.hamcrest.Matchers.allOf
+
+private const val PAUSE = "Pause"
+private const val PLAY = "Play"
 
 internal class ScannerInstrumentedTest : Runnable {
-    override fun run() {
-        scannerAction(SCANNER_PAUSE_TAG)
-        pauseLong()
-        scannerAction(SCANNER_RESUME_TAG)
-    }
 
-    private fun scannerAction(tag: String) {
+    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()
-        val actionMenuItemView = Espresso.onView(
-            Matchers.allOf(
-                ViewMatchers.withId(R.id.action_scanner),
-                ViewMatchers.withContentDescription(tag),
-                ChildAtPosition(
-                    ChildAtPosition(ViewMatchers.withId(R.id.toolbar), SCANNER_BUTTON),
-                    SCANNER_ACTION
-                ),
-                ViewMatchers.isDisplayed()
-            )
-        )
-        actionMenuItemView.perform(ViewActions.click())
     }
 
-    companion object {
-        private const val SCANNER_BUTTON = 2
-        private const val SCANNER_ACTION = 1
-        private const val SCANNER_PAUSE_TAG = "Pause"
-        private const val SCANNER_RESUME_TAG = "Play"
-    }
 }

app/src/test/kotlin/com/vrem/wifianalyzer/wifi/band/WiFiChannelsTest.kt

@@ -145,7 +145,7 @@ class WiFiChannelsTest {
     }
 
     @Test
-    fun wiFiWidthUsingChannel() {
+    fun wiFiWidthUsingChannelInRange() {
         fixtures.forEach { (wiFiBand, fixture) ->
             fixture.activeChannels.forEach { (wiFiWidth, channels) ->
                 val expected = if (wiFiBand == WiFiBand.GHZ2 && wiFiWidth == WiFiWidth.MHZ_40) {
@@ -162,6 +162,20 @@ class WiFiChannelsTest {
         }
     }
 
+    @Test
+    fun wiFiWidthUsingChannelNotInRange() {
+        fixtures.forEach { (wiFiBand, fixture) ->
+            val first = wiFiBand.wiFiChannels.channelRange.first.channel
+            val last = wiFiBand.wiFiChannels.channelRange.second.channel
+            assertThat(fixture.wiFiWidthByChannel(first - 1))
+                .describedAs("$wiFiBand")
+                .isEqualTo(WiFiWidth.MHZ_20)
+            assertThat(fixture.wiFiWidthByChannel(last + 1))
+                .describedAs("$wiFiBand")
+                .isEqualTo(WiFiWidth.MHZ_20)
+        }
+    }
+
     @Test
     fun availableChannels() {
         fixtures.forEach { (wiFiBand, fixture, expectedWiFiInfo) ->