Skip to content

Commit 039229a

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
enhance test cases
1 parent 04b1fae commit 039229a

10 files changed

Lines changed: 355 additions & 201 deletions

File tree

‎app/build.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Build Properties
2-
#Fri Apr 11 18:01:13 EDT 2025
3-
version_build=8
2+
#Sat Apr 12 11:08:13 EDT 2025
3+
version_build=9
44
version_major=3
55
version_minor=2
66
version_patch=0

‎app/src/main/res/raw/data.txt‎

Lines changed: 272 additions & 178 deletions
Large diffs are not rendered by default.

‎app/src/main/res/values/dimens.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
~ along with this program. If not, see <http://www.gnu.org/licenses/>
1818
-->
1919

20-
<resources>
20+
<resources xmlns:tools="http://schemas.android.com/tools">
2121
<dimen name="no_margin">0dp</dimen>
2222

2323
<dimen name="activity_horizontal_margin">16dp</dimen>
@@ -34,4 +34,7 @@
3434
<dimen name="icon_large">36dp</dimen>
3535

3636
<dimen name="font_small">10sp</dimen>
37+
38+
<dimen name="design_bottom_navigation_text_size" tools:override="true">12sp</dimen>
39+
<dimen name="design_bottom_navigation_active_text_size" tools:override="true">12sp</dimen>
3740
</resources>

‎app/src/test/kotlin/com/vrem/wifianalyzer/vendor/model/VendorServiceTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ class VendorServiceTest {
3232
private val macAddress = "00:23:AB:8C:DF:10"
3333
private val vendorNameInvalid = "XXXXX"
3434
private val macAddressInvalid = "XX:XX:XX"
35-
private val vendorSize = 19230
36-
private val macsSize = 36644
37-
private val macsCiscoSize = 1160
35+
private val vendorSize = 19324
36+
private val macsSize = 37173
37+
private val macsCiscoSize = 1176
3838
private val filterVendor = "1394 "
3939
private val filterMac = "00:A0:2"
4040
private val expectedVendorName1 = "1394 TRADE ASSOCIATION"
4141
private val expectedVendorName2 = "TRANSITIONS RESEARCH CORP"
4242
private val expectedVendorName3 = "1394 PRINTER WORKING GROUP"
4343
private val expectedMac1 = "00:00:0C"
4444
private val expectedMac2 = "FC:FB:FB"
45-
private val expectedMac3 = "28:34:A2"
45+
private val expectedMac3 = "28:94:0F"
4646

4747
private val mainActivity = RobolectricUtil.INSTANCE.activity
4848
private val fixture = VendorService(mainActivity.resources)

‎app/src/test/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterDataTest.kt‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,24 @@ package com.vrem.wifianalyzer.wifi.accesspoint
2020
import android.widget.ExpandableListView
2121
import com.vrem.wifianalyzer.MainContextHelper.INSTANCE
2222
import com.vrem.wifianalyzer.wifi.band.WiFiBand
23-
import com.vrem.wifianalyzer.wifi.model.*
23+
import com.vrem.wifianalyzer.wifi.model.GroupBy
24+
import com.vrem.wifianalyzer.wifi.model.Security
25+
import com.vrem.wifianalyzer.wifi.model.SortBy
26+
import com.vrem.wifianalyzer.wifi.model.Strength
27+
import com.vrem.wifianalyzer.wifi.model.WiFiData
28+
import com.vrem.wifianalyzer.wifi.model.WiFiDetail
29+
import com.vrem.wifianalyzer.wifi.model.WiFiIdentifier
30+
import com.vrem.wifianalyzer.wifi.model.WiFiSignal
31+
import com.vrem.wifianalyzer.wifi.model.WiFiWidth
2432
import org.assertj.core.api.Assertions.assertThat
2533
import org.junit.After
2634
import org.junit.Test
27-
import org.mockito.kotlin.*
35+
import org.mockito.kotlin.any
36+
import org.mockito.kotlin.eq
37+
import org.mockito.kotlin.mock
38+
import org.mockito.kotlin.verify
39+
import org.mockito.kotlin.verifyNoMoreInteractions
40+
import org.mockito.kotlin.whenever
2841

2942
class AccessPointsAdapterDataTest {
3043
private val wiFiData: WiFiData = mock()

‎app/src/test/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroupTest.kt‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,20 @@ package com.vrem.wifianalyzer.wifi.accesspoint
2020
import android.widget.ExpandableListAdapter
2121
import android.widget.ExpandableListView
2222
import com.vrem.wifianalyzer.MainContextHelper.INSTANCE
23-
import com.vrem.wifianalyzer.wifi.model.*
23+
import com.vrem.wifianalyzer.wifi.model.GroupBy
24+
import com.vrem.wifianalyzer.wifi.model.WiFiDetail
25+
import com.vrem.wifianalyzer.wifi.model.WiFiIdentifier
26+
import com.vrem.wifianalyzer.wifi.model.WiFiSignal
27+
import com.vrem.wifianalyzer.wifi.model.WiFiWidth
2428
import org.assertj.core.api.Assertions.assertThat
2529
import org.junit.After
2630
import org.junit.Test
27-
import org.mockito.kotlin.*
31+
import org.mockito.kotlin.any
32+
import org.mockito.kotlin.mock
33+
import org.mockito.kotlin.times
34+
import org.mockito.kotlin.verify
35+
import org.mockito.kotlin.verifyNoMoreInteractions
36+
import org.mockito.kotlin.whenever
2837

2938
class AccessPointsAdapterGroupTest {
3039
private val expandableListView: ExpandableListView = mock()
@@ -135,5 +144,9 @@ class AccessPointsAdapterGroupTest {
135144
)
136145

137146
private fun withWiFiDetails(): List<WiFiDetail> =
138-
listOf(withWiFiDetail(), WiFiDetail(WiFiIdentifier("SSID2", "BSSID2")), WiFiDetail(WiFiIdentifier("SSID3", "BSSID3")))
147+
listOf(
148+
withWiFiDetail(),
149+
WiFiDetail(WiFiIdentifier("SSID2", "BSSID2")),
150+
WiFiDetail(WiFiIdentifier("SSID3", "BSSID3"))
151+
)
139152
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,12 @@ class WiFiChannelCountryTest {
3636
assertThat(actual.countryName(expected)).isEqualTo(expected.displayCountry)
3737
}
3838

39+
@Test
40+
fun unknownLocale() {
41+
val locale = Locale("XYZ")
42+
val wiFiChannelCountry = WiFiChannelCountry(locale)
43+
assertThat(wiFiChannelCountry.countryCode).isEqualTo("")
44+
assertThat(wiFiChannelCountry.countryName(Locale.US)).isEqualTo("-Unknown")
45+
}
46+
3947
}

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ class WiFiChannelsParameterizedTest {
4242

4343
@Test
4444
fun inRange() {
45-
assertThat(fixture.inRange(expectedWiFiInfo.expectedChannels.first().frequency)).describedAs("$wiFiBand").isTrue()
46-
assertThat(fixture.inRange(expectedWiFiInfo.expectedChannels.last().frequency)).describedAs("$wiFiBand").isTrue()
45+
assertThat(fixture.inRange(expectedWiFiInfo.expectedChannels.first().frequency)).isTrue()
46+
assertThat(fixture.inRange(expectedWiFiInfo.expectedChannels.last().frequency)).isTrue()
4747
}
4848

4949
@Test
@@ -61,8 +61,10 @@ class WiFiChannelsParameterizedTest {
6161

6262
@Test
6363
fun wiFiChannelByFrequencyOutOfRange() {
64-
assertThat(fixture.wiFiChannelByFrequency(expectedWiFiInfo.expectedChannels.first().frequency - 1)).isEqualTo(WiFiChannel.UNKNOWN)
65-
assertThat(fixture.wiFiChannelByFrequency(expectedWiFiInfo.expectedChannels.last().frequency + 1)).isEqualTo(WiFiChannel.UNKNOWN)
64+
assertThat(fixture.wiFiChannelByFrequency(expectedWiFiInfo.expectedChannels.first().frequency - 1))
65+
.isEqualTo(WiFiChannel.UNKNOWN)
66+
assertThat(fixture.wiFiChannelByFrequency(expectedWiFiInfo.expectedChannels.last().frequency + 1))
67+
.isEqualTo(WiFiChannel.UNKNOWN)
6668
}
6769

6870
@Test
@@ -74,8 +76,10 @@ class WiFiChannelsParameterizedTest {
7476

7577
@Test
7678
fun wiFiChannelByChannelNotInRange() {
77-
assertThat(fixture.wiFiChannelByChannel(expectedWiFiInfo.expectedChannels.first().channel - 1)).isEqualTo(WiFiChannel.UNKNOWN)
78-
assertThat(fixture.wiFiChannelByChannel(expectedWiFiInfo.expectedChannels.last().channel + 1)).isEqualTo(WiFiChannel.UNKNOWN)
79+
assertThat(fixture.wiFiChannelByChannel(expectedWiFiInfo.expectedChannels.first().channel - 1))
80+
.isEqualTo(WiFiChannel.UNKNOWN)
81+
assertThat(fixture.wiFiChannelByChannel(expectedWiFiInfo.expectedChannels.last().channel + 1))
82+
.isEqualTo(WiFiChannel.UNKNOWN)
7983
}
8084

8185
@Test
@@ -115,8 +119,10 @@ class WiFiChannelsParameterizedTest {
115119

116120
@Test
117121
fun wiFiWidthUsingChannelNotInRange() {
118-
assertThat(fixture.wiFiWidthByChannel(wiFiBand.wiFiChannels.channelRange.first.channel - 1)).isEqualTo(WiFiWidth.MHZ_20)
119-
assertThat(fixture.wiFiWidthByChannel(wiFiBand.wiFiChannels.channelRange.second.channel + 1)).isEqualTo(WiFiWidth.MHZ_20)
122+
assertThat(fixture.wiFiWidthByChannel(wiFiBand.wiFiChannels.channelRange.first.channel - 1))
123+
.isEqualTo(WiFiWidth.MHZ_20)
124+
assertThat(fixture.wiFiWidthByChannel(wiFiBand.wiFiChannels.channelRange.second.channel + 1))
125+
.isEqualTo(WiFiWidth.MHZ_20)
120126
}
121127

122128
@Test

‎app/src/test/kotlin/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingAdapterTest.kt‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,25 @@ import com.vrem.wifianalyzer.RobolectricUtil
3232
import com.vrem.wifianalyzer.databinding.ChannelRatingBestBinding
3333
import com.vrem.wifianalyzer.wifi.band.WiFiBand
3434
import com.vrem.wifianalyzer.wifi.band.WiFiChannel
35-
import com.vrem.wifianalyzer.wifi.model.*
35+
import com.vrem.wifianalyzer.wifi.model.ChannelAPCount
36+
import com.vrem.wifianalyzer.wifi.model.ChannelRating
37+
import com.vrem.wifianalyzer.wifi.model.SortBy
38+
import com.vrem.wifianalyzer.wifi.model.Strength
3639
import com.vrem.wifianalyzer.wifi.model.Strength.Companion.reverse
40+
import com.vrem.wifianalyzer.wifi.model.WiFiConnection
41+
import com.vrem.wifianalyzer.wifi.model.WiFiData
42+
import com.vrem.wifianalyzer.wifi.model.WiFiWidth
3743
import com.vrem.wifianalyzer.wifi.predicate.Predicate
3844
import com.vrem.wifianalyzer.wifi.predicate.predicate
3945
import org.assertj.core.api.Assertions.assertThat
4046
import org.junit.After
4147
import org.junit.Test
4248
import org.junit.runner.RunWith
43-
import org.mockito.kotlin.*
49+
import org.mockito.kotlin.doReturn
50+
import org.mockito.kotlin.mock
51+
import org.mockito.kotlin.verify
52+
import org.mockito.kotlin.verifyNoMoreInteractions
53+
import org.mockito.kotlin.whenever
4454
import org.robolectric.annotation.Config
4555
import java.util.Locale
4656

‎app/src/test/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewWrapperTest.kt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@ import org.assertj.core.api.Assertions.assertThat
3232
import org.junit.After
3333
import org.junit.Before
3434
import org.junit.Test
35-
import org.mockito.kotlin.*
35+
import org.mockito.kotlin.any
36+
import org.mockito.kotlin.doReturn
37+
import org.mockito.kotlin.mock
38+
import org.mockito.kotlin.never
39+
import org.mockito.kotlin.spy
40+
import org.mockito.kotlin.verify
41+
import org.mockito.kotlin.verifyNoMoreInteractions
42+
import org.mockito.kotlin.whenever
3643

3744
class GraphViewWrapperTest {
3845
private val graphView: GraphView = mock()

0 commit comments

Comments
 (0)