more tests

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Sat Jul 12 12:37:43 EDT 2025
-version_build=12
+#Sun Jul 13 12:33:53 EDT 2025
+version_build=13
 version_major=3
 version_minor=2
 version_patch=1

app/jacoco.gradle

@@ -69,51 +69,28 @@ def jacocoCoverageVerificationProvider = tasks.register('jacocoTestCoverageVerif
             element = 'BUNDLE'
             limit {
                 counter = 'INSTRUCTION'
-                minimum = 0.97
+                minimum = 0.98
             }
             limit {
                 counter = 'BRANCH'
-                minimum = 0.88
+                minimum = 0.90
             }
             limit {
                 counter = 'COMPLEXITY'
-                minimum = 0.92
+                minimum = 0.94
             }
             limit {
                 counter = 'LINE'
                 minimum = 0.98
             }
             limit {
                 counter = 'METHOD'
-                minimum = 0.97
+                minimum = 0.98
             }
             limit {
                 counter = 'CLASS'
                 minimum = 0.99
             }
         }
-        rule {
-            element = 'CLASS'
-            limit {
-                counter = 'INSTRUCTION'
-                minimum = 0.67
-            }
-            limit {
-                counter = 'BRANCH'
-                minimum = 0.50
-            }
-            limit {
-                counter = 'COMPLEXITY'
-                minimum = 0.33
-            }
-            limit {
-                counter = 'LINE'
-                minimum = 0.60
-            }
-            limit {
-                counter = 'METHOD'
-                minimum = 0.33
-            }
-        }
     }
 }

app/src/main/kotlin/com/vrem/wifianalyzer/navigation/NavigationMenuController.kt

@@ -48,7 +48,7 @@ class NavigationMenuController(
     private fun setChecked(menu: Menu, id: Int) {
         if (id != -1) {
             menu.forEach { it.isChecked = false }
-            menu.findItem(id)?.isChecked = true
+            menu.findItem(id)!!.isChecked = true
         }
     }
 

app/src/main/kotlin/com/vrem/wifianalyzer/permission/ApplicationPermission.kt

@@ -28,24 +28,19 @@ class ApplicationPermission(
     private val permissionDialog: PermissionDialog = PermissionDialog(activity)
 ) {
     fun check() {
-        PERMISSIONS.forEach {
-            if (!granted(it) && !activity.isFinishing) {
-                permissionDialog.show()
-            }
+        if (!granted() && !activity.isFinishing) {
+            permissionDialog.show()
         }
     }
 
     fun granted(requestCode: Int, grantResults: IntArray): Boolean =
         requestCode == REQUEST_CODE && grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
 
     fun granted(): Boolean =
-        PERMISSIONS.all { return granted(it) }
-
-    private fun granted(permission: String): Boolean =
-        activity.checkSelfPermission(permission) == PackageManager.PERMISSION_GRANTED
+        activity.checkSelfPermission(PERMISSION) == PackageManager.PERMISSION_GRANTED
 
     companion object {
-        internal val PERMISSIONS = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION)
+        internal const val PERMISSION = Manifest.permission.ACCESS_FINE_LOCATION
         internal const val REQUEST_CODE = 0x123450
     }
 

app/src/main/kotlin/com/vrem/wifianalyzer/permission/PermissionDialog.kt

@@ -31,7 +31,7 @@ class PermissionDialog(private val activity: Activity) {
     fun show(): View? {
         val view = activity.layoutInflater.inflate(R.layout.info_permission, null)
         val visibility = if (buildMinVersionP()) View.VISIBLE else View.GONE
-        view.findViewById<View>(R.id.throttling)?.visibility = visibility
+        view.findViewById<View>(R.id.throttling)!!.visibility = visibility
         AlertDialog.Builder(activity)
             .setView(view)
             .setTitle(R.string.app_full_name)
@@ -46,7 +46,7 @@ class PermissionDialog(private val activity: Activity) {
     internal class OkClick(private val activity: Activity) : DialogInterface.OnClickListener {
         override fun onClick(alertDialog: DialogInterface, which: Int) {
             alertDialog.dismiss()
-            activity.requestPermissions(ApplicationPermission.PERMISSIONS, ApplicationPermission.REQUEST_CODE)
+            activity.requestPermissions(arrayOf(ApplicationPermission.PERMISSION), ApplicationPermission.REQUEST_CODE)
         }
     }
 

app/src/main/kotlin/com/vrem/wifianalyzer/vendor/model/VendorService.kt

@@ -53,7 +53,6 @@ class VendorService(private val resources: Resources) {
         val vendors: MutableMap<String, List<String>> = TreeMap()
         readZipFile(resources, R.raw.data)
             .map { it.split("|").toTypedArray() }
-            .filter { it.size == 2 }
             .forEach {
                 val name = it[0]
                 val results: List<String> = it[1].chunked(MAX_SIZE)

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingAdapter.kt

@@ -74,12 +74,12 @@ class ChannelRatingAdapter(
     override fun getView(position: Int, view: View?, parent: ViewGroup): View {
         val wiFiBand = MainContext.INSTANCE.settings.wiFiBand()
         val binding = view?.let { ChannelRatingAdapterBinding(it) } ?: ChannelRatingAdapterBinding(create(parent))
-        getItem(position)?.let { wiFiChannel ->
-            val wiFiWidth = wiFiBand.wiFiChannels.wiFiWidthByChannel(wiFiChannel.channel)
-            binding.channelRatingChannel.text = wiFiChannel.channel.toString()
-            binding.channelRatingAPCount.text = channelRating.count(wiFiChannel).toString()
+        getItem(position)?.let {
+            val wiFiWidth = wiFiBand.wiFiChannels.wiFiWidthByChannel(it.channel)
+            binding.channelRatingChannel.text = it.channel.toString()
+            binding.channelRatingAPCount.text = channelRating.count(it).toString()
             binding.channelRatingWidth.text = ContextCompat.getString(context, wiFiWidth.textResource)
-            ratingBar(wiFiChannel, binding.channelRating)
+            ratingBar(it, binding.channelRating)
         }
         return binding.root
     }

app/src/test/kotlin/com/vrem/util/FileUtilsTest.kt

@@ -44,8 +44,9 @@ class FileUtilsTest {
     fun readFile() {
         // setup
         val id = 11
+        val input = "Line-1\r\nLine-2\r\n"
         val expected = "Line-1\nLine-2\n"
-        whenever(resources.openRawResource(id)).thenReturn(expected.byteInputStream())
+        whenever(resources.openRawResource(id)).thenReturn(input.byteInputStream())
         // execute
         val actual = readFile(resources, id)
         // validate
@@ -90,12 +91,26 @@ class FileUtilsTest {
         verify(resources).openRawResource(id)
     }
 
-    private fun createZippedInputStream(lines: List<String>): InputStream {
+    @Test
+    fun readZipFileWithEmptyZipReturnsEmptyList() {
+        // setup
+        val id = 12
+        whenever(resources.openRawResource(id)).thenReturn(createZippedInputStream(emptyList(), false))
+        // execute
+        val actual = readZipFile(resources, id)
+        // validate
+        assertThat(actual).isEmpty()
+        verify(resources).openRawResource(id)
+    }
+
+    private fun createZippedInputStream(lines: List<String>, addEntry: Boolean = true): InputStream {
         val outputStream = ByteArrayOutputStream()
         ZipOutputStream(outputStream).use {
-            it.putNextEntry(ZipEntry("file.txt"))
-            it.write(lines.joinToString("\n").toByteArray())
-            it.closeEntry()
+            if (addEntry) {
+                it.putNextEntry(ZipEntry("file.txt"))
+                it.write(lines.joinToString("\n").toByteArray())
+                it.closeEntry()
+            }
         }
         return outputStream.toByteArray().inputStream()
     }

app/src/test/kotlin/com/vrem/wifianalyzer/navigation/availability/FilterOnTest.kt

@@ -99,6 +99,25 @@ class FilterOnTest {
         verify(optionMenu).menu
     }
 
+    @Test
+    fun navigationOptionFilterOnWithNoIconDoesNotSetTint() {
+        // setup
+        whenever(filterAdapter.isActive()).thenReturn(false)
+        whenever(mainActivity.optionMenu).thenReturn(optionMenu)
+        whenever(optionMenu.menu).thenReturn(menu)
+        whenever(menu.findItem(R.id.action_filter)).thenReturn(menuItem)
+        whenever(menuItem.icon).thenReturn(null)
+        // execute
+        navigationOptionFilterOn(mainActivity)
+        // validate
+        verify(mainActivity).optionMenu
+        verify(optionMenu).menu
+        verify(menu).findItem(R.id.action_filter)
+        verify(menuItem).icon
+        verify(filterAdapter).isActive()
+        verify(menuItem).isVisible = true
+    }
+
     private fun verifyMenuItem() {
         verify(mainActivity).optionMenu
         verify(optionMenu).menu

app/src/test/kotlin/com/vrem/wifianalyzer/permission/ApplicationPermissionTest.kt

@@ -80,7 +80,7 @@ class ApplicationPermissionTest {
     }
 
     @Test
-    fun granted() {
+    fun grantedWithRequestCode() {
         // setup
         val grantResults = intArrayOf(PackageManager.PERMISSION_GRANTED)
         // execute
@@ -118,4 +118,26 @@ class ApplicationPermissionTest {
         // validate
         assertThat(actual).isFalse
     }
+
+    @Test
+    fun grantedWhenPermissionGranted() {
+        // setup
+        doReturn(PackageManager.PERMISSION_GRANTED).whenever(activity).checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION)
+        // execute
+        val actual = fixture.granted()
+        // validate
+        assertThat(actual).isTrue
+        verify(activity).checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION)
+    }
+
+    @Test
+    fun grantedWhenPermissionDenied() {
+        // setup
+        doReturn(PackageManager.PERMISSION_DENIED).whenever(activity).checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION)
+        // execute
+        val actual = fixture.granted()
+        // validate
+        assertThat(actual).isFalse
+        verify(activity).checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION)
+    }
 }