From f837a45d213b842fdf81aea0bc096432cdcbb4a4 Mon Sep 17 00:00:00 2001 From: Yash Khare Date: Fri, 17 Apr 2020 20:08:10 +0530 Subject: [PATCH] Update the disposabe and improve test methods --- .../org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt | 2 +- .../zim_manager/fileselect_view/ZimFileSelectFragment.kt | 2 +- .../kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt index b81e71806..bfb42baef 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt @@ -110,7 +110,7 @@ class ZimManageViewModel @Inject constructor( val requestFiltering = BehaviorProcessor.createDefault("") val currentPage = PublishProcessor.create() - val libraryTabIsVisible = currentPage.filter { it == 1 } + val libraryTabIsVisible = currentPage.map { it == 1 }.filter { it } private val compositeDisposable = CompositeDisposable() diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt index 86becaa26..f3ee19197 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt @@ -115,7 +115,7 @@ class ZimFileSelectFragment : BaseFragment() { disposable.add(zimManageViewModel.libraryTabIsVisible.subscribe { finishActionMode() }) } - fun finishActionMode() { + private fun finishActionMode() { actionMode?.finish() } diff --git a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt index 5c45d0f54..7385640aa 100644 --- a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt +++ b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt @@ -519,14 +519,14 @@ class ZimManageViewModelTest { } @Test - fun `finish actionMode on tab change to online section`() { + fun `libraryTabIsVisible emits when currentPage is 1`() { viewModel.libraryTabIsVisible.test() .also { viewModel.currentPage.offer(1) } - .assertValue(1) + .assertValue(true) } @Test - fun `no change in actionMode`() { + fun `libraryTabIsVisible does not emit when currentPage is 0`() { viewModel.libraryTabIsVisible.test() .also { viewModel.currentPage.offer(0) } .assertEmpty()