Skip to content

Rename noChildren to hasChildren for clarity #599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gioalex07 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename noChildren to hasChildren for clarity #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class AccessPointsAdapterGroup(
) {
if (!groupBy.none) {
wiFiDetails.getOrNull(groupPosition)?.let {
if (it.noChildren) {
if (it.hasChildren) {
expanded.remove(groupBy.group(it))
}
}
Expand All @@ -65,7 +65,7 @@ class AccessPointsAdapterGroup(
) {
if (!groupBy.none) {
wiFiDetails.getOrNull(groupPosition)?.let {
if (it.noChildren) {
if (it.hasChildren) {
expanded.add(groupBy.group(it))
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetail.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions app/src/test/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroupTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,28 +247,28 @@ 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
fun onGroupExpandedDoesNotAddIfHasChildren() {
// 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 =
Expand Down
8 changes: 4 additions & 4 deletions app/src/test/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiDetailTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}