Skip to content

Renamed UnhandledDestinationException to UnhandledNavigationException. #402

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

Merged
EranBoudjnah merged 5 commits into from
Apr 13, 2025
Merged

Renamed UnhandledDestinationException to UnhandledNavigationException. #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
458d870
Renamed UnhandledDestinationException to UnhandledNavigationException.
EranBoudjnah Mar 17, 2025
1bdbc58
Merge branch 'master' into rename_exception_for_consistency
EranBoudjnah Apr 12, 2025
1d86d4c
Merge branch 'master' into rename_exception_for_consistency
EranBoudjnah Apr 12, 2025
8dd67c8
Updated unit test.
EranBoudjnah Apr 13, 2025
efd2aeb
Renamed test and added retries.
EranBoudjnah Apr 13, 2025
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
6 changes: 4 additions & 2 deletions app/src/androidTest/java/com/mitteloupe/whoami/test/HistoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ class HistoryTest : BaseTest() {
@LocalStore(
localStoreDataIds = [KEY_VALUE_NO_HISTORY]
)
fun givenNoHistoryWhenOnHistoryScreenThenSeesHistory() {
fun givenNoHistoryWhenOnHistoryScreenThenSeesNoRecords() {
with(historyScreen) {
seeNoRecordsLabel()
retry(repeat = 20) {
seeNoRecordsLabel()
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/mitteloupe/whoami/navigation/mapper/HistoryNavigationEventDestinationMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.mitteloupe.whoami.navigation.mapper

import com.mitteloupe.whoami.architecture.presentation.navigation.PresentationNavigationEvent
import com.mitteloupe.whoami.architecture.presentation.navigation.PresentationNavigationEvent.Back
import com.mitteloupe.whoami.architecture.ui.navigation.exception.UnhandledDestinationException
import com.mitteloupe.whoami.architecture.ui.navigation.exception.UnhandledNavigationException
import com.mitteloupe.whoami.architecture.ui.navigation.mapper.NavigationEventDestinationMapper
import com.mitteloupe.whoami.architecture.ui.navigation.model.UiDestination

Expand All @@ -13,7 +13,7 @@ class HistoryNavigationEventDestinationMapper :
override fun mapTypedEvent(navigationEvent: PresentationNavigationEvent): UiDestination =
when (navigationEvent) {
is Back -> backUiDestination()
else -> throw UnhandledDestinationException(navigationEvent)
else -> throw UnhandledNavigationException(navigationEvent)
}

private fun backUiDestination() = UiDestination { navController ->
Expand Down
6 changes: 3 additions & 3 deletions .../java/com/mitteloupe/whoami/navigation/mapper/HomeNavigationEventDestinationMapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import androidx.navigation.NavController
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
import com.mitteloupe.whoami.analytics.Analytics
import com.mitteloupe.whoami.architecture.presentation.navigation.PresentationNavigationEvent
import com.mitteloupe.whoami.architecture.ui.navigation.exception.UnhandledDestinationException
import com.mitteloupe.whoami.architecture.ui.navigation.exception.UnhandledNavigationException
import com.mitteloupe.whoami.home.presentation.navigation.HomePresentationNavigationEvent.OnSavedDetails
import com.mitteloupe.whoami.home.presentation.navigation.HomePresentationNavigationEvent.OnViewHistory
import com.mitteloupe.whoami.home.presentation.navigation.HomePresentationNavigationEvent.OnViewOpenSourceNotices
Expand Down Expand Up @@ -115,12 +115,12 @@ class HomeNavigationEventDestinationMapperTest {
val actualException = requireNotNull(caughtException)
assertThat(
actualException,
isA(UnhandledDestinationException::class.java)
isA(UnhandledNavigationException::class.java)
)
assertThat(
actualException.message,
matchesPattern(
"^Navigation to PresentationNavigationEvent\\\$MockitoMock\\\$\\w+ " +
"^Navigation event PresentationNavigationEvent\\\$MockitoMock\\\$\\w+ " +
"was not handled.$"
)
)
Expand Down
4 changes: 2 additions & 2 deletions ...xception/UnhandledDestinationException.kt → ...exception/UnhandledNavigationException.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.mitteloupe.whoami.architecture.ui.navigation.exception

import com.mitteloupe.whoami.architecture.presentation.navigation.PresentationNavigationEvent

class UnhandledDestinationException(destination: PresentationNavigationEvent) :
class UnhandledNavigationException(event: PresentationNavigationEvent) :
IllegalArgumentException(
"Navigation to ${destination::class.simpleName} was not handled."
"Navigation event ${event::class.simpleName} was not handled."
)
4 changes: 2 additions & 2 deletions ...m/mitteloupe/whoami/architecture/ui/navigation/mapper/NavigationEventDestinationMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.mitteloupe.whoami.architecture.ui.navigation.mapper

import com.mitteloupe.whoami.architecture.presentation.navigation.PresentationNavigationEvent
import com.mitteloupe.whoami.architecture.ui.navigation.exception.UnhandledDestinationException
import com.mitteloupe.whoami.architecture.ui.navigation.exception.UnhandledNavigationException
import com.mitteloupe.whoami.architecture.ui.navigation.model.UiDestination
import kotlin.reflect.KClass

Expand All @@ -15,7 +15,7 @@ abstract class NavigationEventDestinationMapper<in EVENT : PresentationNavigatio
}

else -> {
mapGenericEvent(navigationEvent) ?: throw UnhandledDestinationException(
mapGenericEvent(navigationEvent) ?: throw UnhandledNavigationException(
navigationEvent
)
}
Expand Down