Skip to content

Commit

Permalink
Merge branch 'currency-to-settings'
Browse files Browse the repository at this point in the history
  • Loading branch information
@shorthouse
shorthouse committed Mar 14, 2024
2 parents 45e511c + 7a3d585 commit f13118a
Show file tree
Hide file tree
Showing 13 changed files with 392 additions and 384 deletions.
235 changes: 1 addition & 234 deletions app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/MarketScreenTest.kt
View file

Large diffs are not rendered by default.

226 changes: 226 additions & 0 deletions app/src/androidTest/java/dev/shorthouse/coinwatch/ui/screen/SettingsScreenTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@ import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotSelected
import androidx.compose.ui.test.assertIsSelected
import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.isNotSelected
import androidx.compose.ui.test.isSelected
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import com.google.common.truth.Truth.assertThat
import dev.shorthouse.coinwatch.BuildConfig
import dev.shorthouse.coinwatch.data.preferences.global.Currency
import dev.shorthouse.coinwatch.data.preferences.global.StartScreen
import dev.shorthouse.coinwatch.ui.screen.settings.SettingsScreen
import dev.shorthouse.coinwatch.ui.screen.settings.SettingsUiState
Expand All @@ -37,6 +40,8 @@ class SettingsScreenTest {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
Expand All @@ -60,6 +65,8 @@ class SettingsScreenTest {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
Expand All @@ -79,6 +86,8 @@ class SettingsScreenTest {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
Expand All @@ -88,6 +97,8 @@ class SettingsScreenTest {
onNodeWithContentDescription("Back").assertIsDisplayed()
onNodeWithText("Settings").assertIsDisplayed()
onNodeWithText("Preferences").assertIsDisplayed()
onNodeWithText("Currency").assertIsDisplayed()
onNodeWithText("USD").assertIsDisplayed()
onNodeWithText("Start screen").assertIsDisplayed()
onNodeWithText("Market").assertIsDisplayed()
onNodeWithText("About").assertIsDisplayed()
Expand All @@ -113,6 +124,8 @@ class SettingsScreenTest {
SettingsScreen(
uiState = uiState,
onNavigateUp = { onNavigateUpCalled = true },
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
Expand All @@ -134,6 +147,8 @@ class SettingsScreenTest {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
Expand Down Expand Up @@ -165,6 +180,8 @@ class SettingsScreenTest {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = { startScreen ->
onUpdateStartScreenCalled = startScreen == StartScreen.Search
}
Expand All @@ -191,6 +208,8 @@ class SettingsScreenTest {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
Expand Down Expand Up @@ -224,6 +243,8 @@ class SettingsScreenTest {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
Expand Down Expand Up @@ -257,6 +278,8 @@ class SettingsScreenTest {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
Expand All @@ -278,4 +301,207 @@ class SettingsScreenTest {
.assertIsDisplayed().assertIsSelected()
}
}

@Test
fun when_currencyIsUsd_should_displayCurrencyAsUsd() {
val uiState = SettingsUiState(
currency = Currency.USD
)

composeTestRule.setContent {
AppTheme {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
}

composeTestRule.apply {
onNodeWithText("Currency").assertIsDisplayed()
onNodeWithText("USD").assertIsDisplayed()
}
}

@Test
fun when_currencyIsGbp_should_displayCurrencyAsGbp() {
val uiState = SettingsUiState(
currency = Currency.GBP
)

composeTestRule.setContent {
AppTheme {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
}

composeTestRule.apply {
onNodeWithText("Currency").assertIsDisplayed()
onNodeWithText("GBP").assertIsDisplayed()
}
}

@Test
fun when_currencyIsEur_should_displayCurrencyAsEur() {
val uiState = SettingsUiState(
currency = Currency.EUR
)

composeTestRule.setContent {
AppTheme {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
}

composeTestRule.apply {
onNodeWithText("Currency").assertIsDisplayed()
onNodeWithText("EUR").assertIsDisplayed()
}
}

@Test
fun when_currencySettingsClicked_should_callShowCurrencyBottomSheet() {
var showCurrencyBottomSheet = false
val uiState = SettingsUiState()

composeTestRule.setContent {
AppTheme {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = { showCurrencyBottomSheet = true },
onUpdateStartScreen = {}
)
}
}

composeTestRule.onNodeWithText("Currency").performClick()
assertThat(showCurrencyBottomSheet).isTrue()
}

@Test
fun when_currencyIsUsd_should_haveUsdSelectedInCurrencyBottomSheet() {
val uiState = SettingsUiState(
currency = Currency.USD,
isCurrencySheetShown = true
)

composeTestRule.setContent {
AppTheme {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
}

composeTestRule.apply {
onNodeWithText("Coin currency").assertIsDisplayed()
onNode(hasText("USD").and(isSelected())).assertIsDisplayed()
onNode(hasText("GBP").and(isNotSelected())).assertIsDisplayed()
onNode(hasText("EUR").and(isNotSelected())).assertIsDisplayed()
}
}

@Test
fun when_currencyIsGbp_should_haveGbpSelectedInCurrencyBottomSheet() {
val uiState = SettingsUiState(
currency = Currency.GBP,
isCurrencySheetShown = true
)

composeTestRule.setContent {
AppTheme {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
}

composeTestRule.apply {
onNodeWithText("Coin currency").assertIsDisplayed()
onNode(hasText("USD").and(isNotSelected())).assertIsDisplayed()
onNode(hasText("GBP").and(isSelected())).assertIsDisplayed()
onNode(hasText("EUR").and(isNotSelected())).assertIsDisplayed()
}
}

@Test
fun when_currencyIsEur_should_haveEurSelectedInCurrencyBottomSheet() {
val uiState = SettingsUiState(
currency = Currency.EUR,
isCurrencySheetShown = true
)

composeTestRule.setContent {
AppTheme {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = {},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
}

composeTestRule.apply {
onNodeWithText("Coin currency").assertIsDisplayed()
onNode(hasText("USD").and(isNotSelected())).assertIsDisplayed()
onNode(hasText("GBP").and(isNotSelected())).assertIsDisplayed()
onNode(hasText("EUR").and(isSelected())).assertIsDisplayed()
}
}

@Test
fun when_chooseCurrencyBottomSheetOption_should_callUpdateCurrency() {
var updateCurrencyCalled = false
val uiState = SettingsUiState(
currency = Currency.USD,
isCurrencySheetShown = true
)

composeTestRule.setContent {
AppTheme {
SettingsScreen(
uiState = uiState,
onNavigateUp = {},
onUpdateCurrency = { currency ->
updateCurrencyCalled = currency == Currency.GBP
},
onUpdateIsCurrencySheetShown = {},
onUpdateStartScreen = {}
)
}
}

composeTestRule.apply {
onNodeWithText("GBP").performClick()
}

assertThat(updateCurrencyCalled).isTrue()
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/dev/shorthouse/coinwatch/domain/UpdateCurrencyUseCase.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ class UpdateCurrencyUseCase @Inject constructor(
private val userPreferencesRepository: UserPreferencesRepository
) {
suspend operator fun invoke(currency: Currency) {
updateCoinSort(currency = currency)
updateCurrency(currency = currency)
}

private suspend fun updateCoinSort(currency: Currency) {
private suspend fun updateCurrency(currency: Currency) {
userPreferencesRepository.updateCurrency(currency = currency)
}
}
Loading

0 comments on commit f13118a

Please sign in to comment.