add missing tests

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Tue Mar 25 22:01:30 EDT 2025
-version_build=10
+#Tue Mar 25 22:38:45 EDT 2025
+version_build=11
 version_major=3
 version_minor=1
 version_patch=4

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/band/WiFiChannelCountryGHZ2.kt

@@ -23,8 +23,8 @@ import java.util.SortedSet
 
 internal class WiFiChannelCountryGHZ2 {
     private val countries = setOf("AS", "CA", "CO", "DO", "FM", "GT", "GU", "MP", "MX", "PA", "PR", "UM", "US", "UZ", "VI")
-    private val channels = sortedSetOf(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)
-    private val world = channels.union(setOf(12, 13)).toSortedSet()
+    private val channels = (1..11).toSortedSet()
+    private val world = channels.union((12..13).toSet()).toSortedSet()
 
     fun findChannels(countryCode: String): SortedSet<Int> =
         if (countries.contains(countryCode.toCapitalize(Locale.getDefault()))) channels else world

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/band/WiFiChannels.kt

@@ -48,10 +48,10 @@ abstract class WiFiChannels(val channelRange: WiFiChannelPair, val graphChannels
 
     fun graphChannelByFrequency(frequency: Int): String {
         val wiFiChannel: WiFiChannel = wiFiChannelByFrequency(frequency)
-        return if (WiFiChannel.UNKNOWN == wiFiChannel) {
-            String.EMPTY
+        return if (WiFiChannel.UNKNOWN != wiFiChannel && graphChannels.contains(wiFiChannel.channel)) {
+            "${wiFiChannel.channel}"
         } else {
-            if (graphChannels.contains(wiFiChannel.channel)) "${wiFiChannel.channel}" else String.EMPTY
+            String.EMPTY
         }
     }
 
@@ -60,10 +60,9 @@ abstract class WiFiChannels(val channelRange: WiFiChannelPair, val graphChannels
     fun wiFiChannels(): List<WiFiChannel> = (channelRange.first.channel..channelRange.second.channel).map { wiFiChannelByChannel(it) }
 
     private fun wiFiChannel(frequency: Int, wiFiChannelPair: WiFiChannelPair): WiFiChannel {
-        val (first, last) = wiFiChannelPair
-        val firstChannel: Int = (first.channel + if (first.channel < 0) -0.5 else 0.5).toInt()
-        val channel: Int = ((frequency - first.frequency).toDouble() / FREQUENCY_SPREAD + firstChannel).toInt()
-        return if (frequency in first.frequency..last.frequency) WiFiChannel(channel, frequency) else WiFiChannel.UNKNOWN
+        val firstChannel: Int = (wiFiChannelPair.first.channel + if (wiFiChannelPair.first.channel < 0) -0.5 else 0.5).toInt()
+        val channel: Int = ((frequency - wiFiChannelPair.first.frequency).toDouble() / FREQUENCY_SPREAD + firstChannel).toInt()
+        return WiFiChannel(channel, frequency)
     }
 
     companion object {

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/band/WiFiChannelsGHZ6.kt

@@ -29,7 +29,7 @@ class WiFiChannelsGHZ6 : WiFiChannels(channelRange, graphChannels) {
     }
 
     companion object {
-        private val channelRange = WiFiChannelPair(WiFiChannel(-1, 5945), WiFiChannel(235, 7125))
+        private val channelRange = WiFiChannelPair(WiFiChannel(-5, 5925), WiFiChannel(235, 7125))
         private val graphChannels: Set<Int> = setOf(15, 47, 79, 110, 142, 174, 208)
     }
 

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

@@ -103,7 +103,7 @@ class WiFiChannelsGHZ2Test {
     }
 
     @Test
-    fun graphChannelByFrequency() {
+    fun graphChannelByFrequencyInRange() {
         expectedChannels.forEach { it ->
             // setup
             val expected = if (expectedGraphChannels.contains(it.channel)) "${it.channel}" else String.EMPTY
@@ -114,4 +114,10 @@ class WiFiChannelsGHZ2Test {
         }
     }
 
+    @Test
+    fun graphChannelByFrequencyOutInRange() {
+        assertThat(fixture.graphChannelByFrequency(expectedChannels.first().frequency - 1)).isEmpty()
+        assertThat(fixture.graphChannelByFrequency(expectedChannels.last().frequency + 1)).isEmpty()
+    }
+
 }

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

@@ -115,4 +115,10 @@ class WiFiChannelsGHZ5Test {
         }
     }
 
+    @Test
+    fun graphChannelByFrequencyOutInRange() {
+        assertThat(fixture.graphChannelByFrequency(expectedChannels.first().frequency - 1)).isEmpty()
+        assertThat(fixture.graphChannelByFrequency(expectedChannels.last().frequency + 1)).isEmpty()
+    }
+
 }

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

@@ -24,7 +24,7 @@ import org.junit.Test
 import java.util.Locale
 
 class WiFiChannelsGHZ6Test {
-    private val expectedChannels: List<WiFiChannel> = (-1..235).map { WiFiChannel(it, 5950 + it * FREQUENCY_SPREAD) }
+    private val expectedChannels: List<WiFiChannel> = (-5..235).map { WiFiChannel(it, 5950 + it * FREQUENCY_SPREAD) }
     private val expectedGraphChannels = listOf(15, 47, 79, 110, 142, 174, 208)
     private val fixture: WiFiChannelsGHZ6 = WiFiChannelsGHZ6()
 
@@ -114,4 +114,10 @@ class WiFiChannelsGHZ6Test {
         }
     }
 
+    @Test
+    fun graphChannelByFrequencyOutInRange() {
+        assertThat(fixture.graphChannelByFrequency(expectedChannels.first().frequency - 1)).isEmpty()
+        assertThat(fixture.graphChannelByFrequency(expectedChannels.last().frequency + 1)).isEmpty()
+    }
+
 }