diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroup.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroup.kt index 3f6076826..d6d8f8ee3 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroup.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroup.kt @@ -52,7 +52,7 @@ class AccessPointsAdapterGroup( ) { if (!groupBy.none) { wiFiDetails.getOrNull(groupPosition)?.let { - if (it.noChildren) { + if (it.hasChildren) { expanded.remove(groupBy.group(it)) } } @@ -65,7 +65,7 @@ class AccessPointsAdapterGroup( ) { if (!groupBy.none) { wiFiDetails.getOrNull(groupPosition)?.let { - if (it.noChildren) { + if (it.hasChildren) { expanded.add(groupBy.group(it)) } } diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetail.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetail.kt index 76e2d8a32..ccd4c7cf7 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetail.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetail.kt @@ -36,7 +36,7 @@ data class WiFiDetail( children, ) - val noChildren: Boolean get() = children.isNotEmpty() + val hasChildren: Boolean get() = children.isNotEmpty() override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroupTest.kt b/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroupTest.kt index 74aa8a955..3405a7f8f 100644 --- a/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroupTest.kt +++ b/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroupTest.kt @@ -247,14 +247,14 @@ class AccessPointsAdapterGroupTest { // setup doReturn(GroupBy.SSID).whenever(settings).groupBy() fixture.updateGroupBy() - doReturn(false).whenever(wiFiDetailWithChildren).noChildren + doReturn(false).whenever(wiFiDetailWithChildren).hasChildren val wiFiDetails = listOf(wiFiDetailWithChildren) fixture.expanded.add("test") // execute fixture.onGroupCollapsed(wiFiDetails, 0) // validate assertThat(fixture.expanded).contains("test") - verify(wiFiDetailWithChildren).noChildren + verify(wiFiDetailWithChildren).hasChildren } @Test @@ -262,13 +262,13 @@ class AccessPointsAdapterGroupTest { // setup doReturn(GroupBy.SSID).whenever(settings).groupBy() fixture.updateGroupBy() - doReturn(false).whenever(wiFiDetailWithChildren).noChildren + doReturn(false).whenever(wiFiDetailWithChildren).hasChildren val wiFiDetails = listOf(wiFiDetailWithChildren) // execute fixture.onGroupExpanded(wiFiDetails, 0) // validate assertThat(fixture.expanded).isEmpty() - verify(wiFiDetailWithChildren).noChildren + verify(wiFiDetailWithChildren).hasChildren } private fun withWiFiDetail(): WiFiDetail = diff --git a/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetailTest.kt b/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetailTest.kt index 9f31e0128..9a85b67a5 100644 --- a/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetailTest.kt +++ b/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetailTest.kt @@ -110,15 +110,15 @@ class WiFiDetailTest { } @Test - fun noChildrenReturnsFalseWhenChildrenIsEmpty() { + fun hasChildrenReturnsFalseWhenChildrenIsEmpty() { val detail = WiFiDetail(wiFiIdentifier, wiFiSecurity, wiFiSignal, wiFiAdditional, listOf()) - assertThat(detail.noChildren).isFalse() + assertThat(detail.hasChildren).isFalse() } @Test - fun noChildrenReturnsTrueWhenChildrenIsNotEmpty() { + fun hasChildrenReturnsTrueWhenChildrenIsNotEmpty() { val child = WiFiDetail(WiFiIdentifier("childSSID", "childBSSID"), wiFiSecurity, wiFiSignal, wiFiAdditional) val detail = WiFiDetail(wiFiIdentifier, wiFiSecurity, wiFiSignal, wiFiAdditional, listOf(child)) - assertThat(detail.noChildren).isTrue() + assertThat(detail.hasChildren).isTrue() } }