Skip to content

Commit 12f8fa3

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
cleanup
1 parent aaa81f2 commit 12f8fa3

File tree

4 files changed

+38
-53
lines changed

4 files changed

+38
-53
lines changed

‎app/build.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Build Properties
2-
#Sat Mar 29 12:14:52 EDT 2025
3-
version_build=15
2+
#Sat Mar 29 12:53:53 EDT 2025
3+
version_build=0
44
version_major=3
5-
version_minor=1
6-
version_patch=4
5+
version_minor=2
6+
version_patch=0
77
version_store=69

‎app/jacoco.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ task jacocoTestCoverageVerification(type: JacocoCoverageVerification, dependsOn:
7070
}
7171
limit {
7272
counter = 'BRANCH'
73-
minimum = 0.88
73+
minimum = 0.87
7474
}
7575
limit {
7676
counter = 'COMPLEXITY'

‎app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiWidth.kt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,20 @@ private val CHANNEL_WIDTH_320MHZ = if (buildMinVersionT()) ScanResult.CHANNEL_WI
2626
typealias ChannelWidth = Int
2727
typealias CalculateCenter = (primary: Int, center0: Int, center1: Int) -> Int
2828

29-
internal val calculateCenter20: CalculateCenter = { primary, _, _ -> primary }
3029
internal val calculateCenter40: CalculateCenter = { primary, center0, _ ->
3130
if (abs(primary - center0) >= WiFiWidth.MHZ_40.frequencyWidthHalf) (primary + center0) / 2 else center0
3231
}
33-
internal val calculateCenter80: CalculateCenter = { _, center0, _ -> center0 }
34-
internal val calculateCenter160: CalculateCenter = { _, _, center1 -> center1 }
35-
internal val calculateCenter320: CalculateCenter = { _, _, center1 -> center1 }
32+
internal val calculateCenterUsingPrimary: CalculateCenter = { primary, _, _ -> primary }
33+
internal val calculateCenterUsingCenter0: CalculateCenter = { _, center0, _ -> center0 }
34+
internal val calculateCenterUsingCenter1: CalculateCenter = { _, _, center1 -> center1 }
3635

3736
enum class WiFiWidth(val channelWidth: ChannelWidth, val frequencyWidth: Int, val guardBand: Int, val calculateCenter: CalculateCenter) {
38-
MHZ_20(ScanResult.CHANNEL_WIDTH_20MHZ, 20, 2, calculateCenter20),
37+
MHZ_20(ScanResult.CHANNEL_WIDTH_20MHZ, 20, 2, calculateCenterUsingPrimary),
3938
MHZ_40(ScanResult.CHANNEL_WIDTH_40MHZ, 40, 3, calculateCenter40),
40-
MHZ_80(ScanResult.CHANNEL_WIDTH_80MHZ, 80, 3, calculateCenter80),
41-
MHZ_160(ScanResult.CHANNEL_WIDTH_160MHZ, 160, 3, calculateCenter160),
42-
MHZ_80_PLUS(ScanResult.CHANNEL_WIDTH_80MHZ_PLUS_MHZ, 80, 3, calculateCenter80),
43-
MHZ_320(CHANNEL_WIDTH_320MHZ, 320, 3, calculateCenter320);
39+
MHZ_80(ScanResult.CHANNEL_WIDTH_80MHZ, 80, 3, calculateCenterUsingCenter0),
40+
MHZ_160(ScanResult.CHANNEL_WIDTH_160MHZ, 160, 3, calculateCenterUsingCenter1),
41+
MHZ_80_PLUS(ScanResult.CHANNEL_WIDTH_80MHZ_PLUS_MHZ, 80, 3, calculateCenterUsingCenter1),
42+
MHZ_320(CHANNEL_WIDTH_320MHZ, 320, 3, calculateCenterUsingCenter1);
4443

4544
val frequencyWidthHalf: Int = frequencyWidth / 2
4645

‎app/src/test/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiWidthTest.kt‎

Lines changed: 25 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ class WiFiWidthTest {
3131

3232
@Test
3333
fun groupByGroup() {
34-
assertThat(WiFiWidth.MHZ_20.calculateCenter).isInstanceOf(calculateCenter20::class.java)
34+
assertThat(WiFiWidth.MHZ_20.calculateCenter).isInstanceOf(calculateCenterUsingPrimary::class.java)
3535
assertThat(WiFiWidth.MHZ_40.calculateCenter).isInstanceOf(calculateCenter40::class.java)
36-
assertThat(WiFiWidth.MHZ_80.calculateCenter).isInstanceOf(calculateCenter80::class.java)
37-
assertThat(WiFiWidth.MHZ_160.calculateCenter).isInstanceOf(calculateCenter160::class.java)
38-
assertThat(WiFiWidth.MHZ_80_PLUS.calculateCenter).isInstanceOf(calculateCenter80::class.java)
39-
assertThat(WiFiWidth.MHZ_320.calculateCenter).isInstanceOf(calculateCenter320::class.java)
36+
assertThat(WiFiWidth.MHZ_80.calculateCenter).isInstanceOf(calculateCenterUsingCenter0::class.java)
37+
assertThat(WiFiWidth.MHZ_160.calculateCenter).isInstanceOf(calculateCenterUsingCenter1::class.java)
38+
assertThat(WiFiWidth.MHZ_80_PLUS.calculateCenter).isInstanceOf(calculateCenterUsingCenter1::class.java)
39+
assertThat(WiFiWidth.MHZ_320.calculateCenter).isInstanceOf(calculateCenterUsingCenter1::class.java)
4040
}
4141

4242
@Test
@@ -82,13 +82,13 @@ class WiFiWidthTest {
8282
}
8383

8484
@Test
85-
fun calculateCenter20() {
85+
fun calculateCenterUsingPrimary() {
8686
// setup
8787
val expected = 35
8888
// execute & validate
89-
assertThat(calculateCenter20(expected, Int.MIN_VALUE, Int.MIN_VALUE)).isEqualTo(expected)
90-
assertThat(calculateCenter20(expected, 0, Int.MIN_VALUE)).isEqualTo(expected)
91-
assertThat(calculateCenter20(expected, Int.MAX_VALUE, Int.MIN_VALUE)).isEqualTo(expected)
89+
assertThat(calculateCenterUsingPrimary(expected, Int.MIN_VALUE, Int.MIN_VALUE)).isEqualTo(expected)
90+
assertThat(calculateCenterUsingPrimary(expected, 0, Int.MIN_VALUE)).isEqualTo(expected)
91+
assertThat(calculateCenterUsingPrimary(expected, Int.MAX_VALUE, Int.MIN_VALUE)).isEqualTo(expected)
9292
}
9393

9494
@Test
@@ -113,45 +113,31 @@ class WiFiWidthTest {
113113
}
114114

115115
@Test
116-
fun calculateCenter80() {
116+
fun calculateCenterUsingCenter0() {
117117
// setup
118118
val expected = 35
119119
// execute & validate
120-
assertThat(calculateCenter80(0, expected, 0)).isEqualTo(expected)
121-
assertThat(calculateCenter80(0, expected, Int.MIN_VALUE)).isEqualTo(expected)
122-
assertThat(calculateCenter80(0, expected, Int.MAX_VALUE)).isEqualTo(expected)
123-
assertThat(calculateCenter80(Int.MIN_VALUE, expected, 0)).isEqualTo(expected)
124-
assertThat(calculateCenter80(Int.MAX_VALUE, expected, 0)).isEqualTo(expected)
125-
assertThat(calculateCenter80(Int.MIN_VALUE, expected, Int.MIN_VALUE)).isEqualTo(expected)
126-
assertThat(calculateCenter80(Int.MAX_VALUE, expected, Int.MAX_VALUE)).isEqualTo(expected)
120+
assertThat(calculateCenterUsingCenter0(0, expected, 0)).isEqualTo(expected)
121+
assertThat(calculateCenterUsingCenter0(0, expected, Int.MIN_VALUE)).isEqualTo(expected)
122+
assertThat(calculateCenterUsingCenter0(0, expected, Int.MAX_VALUE)).isEqualTo(expected)
123+
assertThat(calculateCenterUsingCenter0(Int.MIN_VALUE, expected, 0)).isEqualTo(expected)
124+
assertThat(calculateCenterUsingCenter0(Int.MAX_VALUE, expected, 0)).isEqualTo(expected)
125+
assertThat(calculateCenterUsingCenter0(Int.MIN_VALUE, expected, Int.MIN_VALUE)).isEqualTo(expected)
126+
assertThat(calculateCenterUsingCenter0(Int.MAX_VALUE, expected, Int.MAX_VALUE)).isEqualTo(expected)
127127
}
128128

129129
@Test
130-
fun calculateCenter160() {
130+
fun calculateCenterUsingCenter1() {
131131
// setup
132132
val expected = 35
133133
// execute & validate
134-
assertThat(calculateCenter160(0, 0, expected)).isEqualTo(expected)
135-
assertThat(calculateCenter160(0, Int.MIN_VALUE, expected)).isEqualTo(expected)
136-
assertThat(calculateCenter160(0, Int.MAX_VALUE, expected)).isEqualTo(expected)
137-
assertThat(calculateCenter160(Int.MIN_VALUE, 0, expected)).isEqualTo(expected)
138-
assertThat(calculateCenter160(Int.MAX_VALUE, 0, expected)).isEqualTo(expected)
139-
assertThat(calculateCenter160(Int.MIN_VALUE, Int.MIN_VALUE, expected)).isEqualTo(expected)
140-
assertThat(calculateCenter160(Int.MAX_VALUE, Int.MAX_VALUE, expected)).isEqualTo(expected)
141-
}
142-
143-
@Test
144-
fun calculateCenter320() {
145-
// setup
146-
val expected = 35
147-
// execute & validate
148-
assertThat(calculateCenter320(0, 0, expected)).isEqualTo(expected)
149-
assertThat(calculateCenter320(0, Int.MIN_VALUE, expected)).isEqualTo(expected)
150-
assertThat(calculateCenter320(0, Int.MAX_VALUE, expected)).isEqualTo(expected)
151-
assertThat(calculateCenter320(Int.MIN_VALUE, 0, expected)).isEqualTo(expected)
152-
assertThat(calculateCenter320(Int.MAX_VALUE, 0, expected)).isEqualTo(expected)
153-
assertThat(calculateCenter320(Int.MIN_VALUE, Int.MIN_VALUE, expected)).isEqualTo(expected)
154-
assertThat(calculateCenter320(Int.MAX_VALUE, Int.MAX_VALUE, expected)).isEqualTo(expected)
134+
assertThat(calculateCenterUsingCenter1(0, 0, expected)).isEqualTo(expected)
135+
assertThat(calculateCenterUsingCenter1(0, Int.MIN_VALUE, expected)).isEqualTo(expected)
136+
assertThat(calculateCenterUsingCenter1(0, Int.MAX_VALUE, expected)).isEqualTo(expected)
137+
assertThat(calculateCenterUsingCenter1(Int.MIN_VALUE, 0, expected)).isEqualTo(expected)
138+
assertThat(calculateCenterUsingCenter1(Int.MAX_VALUE, 0, expected)).isEqualTo(expected)
139+
assertThat(calculateCenterUsingCenter1(Int.MIN_VALUE, Int.MIN_VALUE, expected)).isEqualTo(expected)
140+
assertThat(calculateCenterUsingCenter1(Int.MAX_VALUE, Int.MAX_VALUE, expected)).isEqualTo(expected)
155141
}
156142

157143
}

0 commit comments

Comments
 (0)