From 1e7de1248459483e3119797bad114a0815e27126 Mon Sep 17 00:00:00 2001 From: HissPirat Date: Mon, 29 Jun 2020 09:53:48 +0200 Subject: [PATCH] #2098 updated history and bookmark tests --- .../effects/ShowDeleteBookmarksDialogTest.kt | 44 +++++++------------ .../effects/ShowDeleteHistoryDialogTest.kt | 38 ++++++---------- 2 files changed, 29 insertions(+), 53 deletions(-) diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialogTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialogTest.kt index f6df95cf8..8d6d7d78d 100644 --- a/core/src/test/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialogTest.kt +++ b/core/src/test/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialogTest.kt @@ -34,19 +34,16 @@ import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteAllBookmarks import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteSelectedBookmarks internal class ShowDeleteBookmarksDialogTest { + val effects = mockk>>(relaxed = true) + private val newBookmarksDao = mockk() + val activity = mockk() + private val dialogShower = mockk(relaxed = true) @Test fun `invoke with shows dialog that offers ConfirmDelete action`() { - val effects = mockk>>(relaxed = true) - val newBookmarksDao = mockk() - val activity = mockk() val showDeleteBookmarksDialog = ShowDeleteBookmarksDialog(effects, bookmarkState(), newBookmarksDao) - val dialogShower = mockk() - every { activity.activityComponent.inject(showDeleteBookmarksDialog) } answers { - showDeleteBookmarksDialog.dialogShower = dialogShower - Unit - } + mockkActivityInjection(showDeleteBookmarksDialog) val lambdaSlot = slot<() -> Unit>() showDeleteBookmarksDialog.invokeWith(activity) verify { dialogShower.show(any(), capture(lambdaSlot)) } @@ -54,45 +51,36 @@ internal class ShowDeleteBookmarksDialogTest { verify { effects.offer(DeleteBookmarkItems(effects, bookmarkState(), newBookmarksDao)) } } + private fun mockkActivityInjection(showDeleteBookmarksDialog: ShowDeleteBookmarksDialog) { + every { activity.activityComponent.inject(showDeleteBookmarksDialog) } answers { + showDeleteBookmarksDialog.dialogShower = dialogShower + Unit + } + } + @Test fun `invoke with selected items shows dialog with DeleteSelectedBookmarks title`() { - val effects = mockk>>(relaxed = true) - val newBookmarksDao = mockk() - val activity = mockk() val showDeleteBookmarksDialog = ShowDeleteBookmarksDialog( effects, bookmarkState(listOf(bookmark(isSelected = true))), newBookmarksDao ) - val dialogShower = mockk() - every { activity.activityComponent.inject(showDeleteBookmarksDialog) } answers { - showDeleteBookmarksDialog.dialogShower = dialogShower - Unit - } - val lambdaSlot = slot<() -> Unit>() + mockkActivityInjection(showDeleteBookmarksDialog) showDeleteBookmarksDialog.invokeWith(activity) - verify { dialogShower.show(DeleteSelectedBookmarks, capture(lambdaSlot)) } + verify { dialogShower.show(DeleteSelectedBookmarks, any()) } } @Test fun `invoke with no selected items shows dialog with DeleteAllBookmarks title`() { - val effects = mockk>>(relaxed = true) - val newBookmarksDao = mockk() - val activity = mockk() val showDeleteBookmarksDialog = ShowDeleteBookmarksDialog( effects, bookmarkState(listOf(bookmark())), newBookmarksDao ) - val dialogShower = mockk() - every { activity.activityComponent.inject(showDeleteBookmarksDialog) } answers { - showDeleteBookmarksDialog.dialogShower = dialogShower - Unit - } - val lambdaSlot = slot<() -> Unit>() + mockkActivityInjection(showDeleteBookmarksDialog) showDeleteBookmarksDialog.invokeWith(activity) - verify { dialogShower.show(DeleteAllBookmarks, capture(lambdaSlot)) } + verify { dialogShower.show(DeleteAllBookmarks, any()) } } } diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/effects/ShowDeleteHistoryDialogTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/effects/ShowDeleteHistoryDialogTest.kt index a453eadcc..5c0dbcad7 100644 --- a/core/src/test/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/effects/ShowDeleteHistoryDialogTest.kt +++ b/core/src/test/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/effects/ShowDeleteHistoryDialogTest.kt @@ -16,18 +16,15 @@ import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteAllHistory import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteSelectedHistory internal class ShowDeleteHistoryDialogTest { + val effects = mockk>>(relaxed = true) + private val historyDao = mockk() + val activity = mockk() + private val dialogShower = mockk(relaxed = true) @Test fun `invoke with shows dialog that offers ConfirmDelete action`() { - val effects = mockk>>(relaxed = true) - val historyDao = mockk() - val activity = mockk() val showDeleteHistoryDialog = ShowDeleteHistoryDialog(effects, historyState(), historyDao) - val dialogShower = mockk() - every { activity.activityComponent.inject(showDeleteHistoryDialog) } answers { - showDeleteHistoryDialog.dialogShower = dialogShower - Unit - } + mockkActivityInjection(showDeleteHistoryDialog) val lambdaSlot = slot<() -> Unit>() showDeleteHistoryDialog.invokeWith(activity) verify { dialogShower.show(any(), capture(lambdaSlot)) } @@ -37,37 +34,28 @@ internal class ShowDeleteHistoryDialogTest { @Test fun `invoke with selected item shows dialog with delete selected items title`() { - val effects = mockk>>(relaxed = true) - val historyDao = mockk() - val activity = mockk() val showDeleteHistoryDialog = ShowDeleteHistoryDialog( effects, historyState(listOf(historyItem(isSelected = true))), historyDao ) - val dialogShower = mockk() - every { activity.activityComponent.inject(showDeleteHistoryDialog) } answers { - showDeleteHistoryDialog.dialogShower = dialogShower - Unit - } - val lambdaSlot = slot<() -> Unit>() + mockkActivityInjection(showDeleteHistoryDialog) showDeleteHistoryDialog.invokeWith(activity) - verify { dialogShower.show(DeleteSelectedHistory, capture(lambdaSlot)) } + verify { dialogShower.show(DeleteSelectedHistory, any()) } } @Test fun `invoke with no selected items shows dialog with delete all items title`() { - val effects = mockk>>(relaxed = true) - val historyDao = mockk() - val activity = mockk() val showDeleteHistoryDialog = ShowDeleteHistoryDialog(effects, historyState(), historyDao) - val dialogShower = mockk() + mockkActivityInjection(showDeleteHistoryDialog) + showDeleteHistoryDialog.invokeWith(activity) + verify { dialogShower.show(DeleteAllHistory, any()) } + } + + private fun mockkActivityInjection(showDeleteHistoryDialog: ShowDeleteHistoryDialog) { every { activity.activityComponent.inject(showDeleteHistoryDialog) } answers { showDeleteHistoryDialog.dialogShower = dialogShower Unit } - val lambdaSlot = slot<() -> Unit>() - showDeleteHistoryDialog.invokeWith(activity) - verify { dialogShower.show(DeleteAllHistory, capture(lambdaSlot)) } } }