Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,39 +22,39 @@ class HomeScreen {
private val internetServiceProviderLabel = hasText("TalkTalk Limited")
private val openSourceNoticesButton = hasText("Open Source Notices")

fun ComposeContentTestRule.seesIpAddressLabel() {
fun ComposeContentTestRule.seeIpAddressLabel() {
assertIsDisplayed(ipAddressLabel)
}

fun ComposeContentTestRule.seesIpAddressSubtitleLabel() {
fun ComposeContentTestRule.seeIpAddressSubtitleLabel() {
assertIsDisplayed(ipAddressSubtitleLabel)
}

fun ComposeContentTestRule.seesCityLabel() {
fun ComposeContentTestRule.seeCityLabel() {
assertIsDisplayed(cityLabel)
}

fun ComposeContentTestRule.seesRegionLabel() {
fun ComposeContentTestRule.seeRegionLabel() {
assertIsDisplayed(regionLabel)
}

fun ComposeContentTestRule.seesCountryLabel() {
fun ComposeContentTestRule.seeCountryLabel() {
assertIsDisplayed(countryLabel)
}

fun ComposeContentTestRule.seesGeolocationLabel() {
fun ComposeContentTestRule.seeGeolocationLabel() {
assertIsDisplayed(geolocationLabel)
}

fun ComposeContentTestRule.seesPostCodeLabel() {
fun ComposeContentTestRule.seePostCodeLabel() {
assertIsDisplayed(postCodeLabel)
}

fun ComposeContentTestRule.seesTimeZoneLabel() {
fun ComposeContentTestRule.seeTimeZoneLabel() {
assertIsDisplayed(timeZoneLabel)
}

fun ComposeContentTestRule.seesInternetServiceProviderLabel() {
fun ComposeContentTestRule.seeInternetServiceProviderLabel() {
assertIsDisplayed(internetServiceProviderLabel)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity

class OpenSourceNoticesScreen {
fun seesScreen() {
fun seeScreen() {
intended(hasComponent(OssLicensesMenuActivity::class.java.name))
}
}
20 changes: 10 additions & 10 deletions app/src/androidTest/java/com/mitteloupe/whoami/test/HomeTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class HomeTest : BaseTest() {
fun givenConnectedWhenStartingAppThenIpAddressPresented() {
with(composeTestRule) {
with(homeScreen) {
seesIpAddressLabel()
seesIpAddressSubtitleLabel()
seeIpAddressLabel()
seeIpAddressSubtitleLabel()
}
}
}
Expand All @@ -48,13 +48,13 @@ class HomeTest : BaseTest() {
fun givenConnectedWhenStartingAppThenIpAddressDetailsPresented() {
with(composeTestRule) {
with(homeScreen) {
seesCityLabel()
seesRegionLabel()
seesCountryLabel()
seesGeolocationLabel()
seesPostCodeLabel()
seesTimeZoneLabel()
seesInternetServiceProviderLabel()
seeCityLabel()
seeRegionLabel()
seeCountryLabel()
seeGeolocationLabel()
seePostCodeLabel()
seeTimeZoneLabel()
seeInternetServiceProviderLabel()
}
}
}
Expand All @@ -68,7 +68,7 @@ class HomeTest : BaseTest() {
}

with(openSourceNoticesScreen) {
seesScreen()
seeScreen()
}
}
Intents.release()
Expand Down