リファクタリング (#48)

* SearchResultViewModelのStatusを継承するクラスをデータクラスに変更
jageishi · Nov 6, 2019 · ee2267f · ee2267f
1 parent 9e19fee
commit ee2267f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/app/src/main/java/org/ageage/eggplant/search/SearchResultViewModel.kt b/app/src/main/java/org/ageage/eggplant/search/SearchResultViewModel.kt
@@ -123,8 +123,8 @@ class SearchResultViewModel(
         object LoadingNextPage : Status()
         object Success : Status()
         object ReachedLastPage : Status()
-        class Error(val error: Throwable) : Status()
-        class ErrorLoadNextPage(val error: Throwable) : Status()
+        data class Error(val error: Throwable) : Status()
+        data class ErrorLoadNextPage(val error: Throwable) : Status()
 
         val isLoading: Boolean
             get() = this is Loading

diff --git a/app/src/test/java/org/ageage/eggplant/search/SearchResultViewModelTest.kt b/app/src/test/java/org/ageage/eggplant/search/SearchResultViewModelTest.kt
@@ -87,14 +87,9 @@ class SearchResultViewModelTest {
         orderedVerifier.verify(statusObserver, times(1))
             .onChanged(SearchResultViewModel.Status.Loading)
         orderedVerifier.verify(statusObserver, times(1))
-            .onChanged(any())
+            .onChanged(SearchResultViewModel.Status.Error(exception))
         orderedVerifier.verify(itemObserver, never())
             .onChanged(any())
-
-        assertThat(viewModel.status.value)
-            .isInstanceOf(SearchResultViewModel.Status.Error::class.java)
-        assertThat((viewModel.status.value as SearchResultViewModel.Status.Error).error)
-            .isEqualTo(exception)
     }
 
     @Test
@@ -194,14 +189,10 @@ class SearchResultViewModelTest {
         orderedVerifier.verify(statusObserver, times(1))
             .onChanged(SearchResultViewModel.Status.LoadingNextPage)
         orderedVerifier.verify(statusObserver, times(1))
-            .onChanged(any())
+            .onChanged(SearchResultViewModel.Status.ErrorLoadNextPage(exception))
         orderedVerifier.verify(itemObserver, never())
             .onChanged(any())
 
-        assertThat(viewModel.status.value)
-            .isInstanceOf(SearchResultViewModel.Status.ErrorLoadNextPage::class.java)
-        assertThat((viewModel.status.value as SearchResultViewModel.Status.ErrorLoadNextPage).error)
-            .isEqualTo(exception)
         assertThat(viewModel.hasLoadNextPageError)
             .isTrue()
     }