fix unit test

Author: dosukoi-android

ui/viewModel/src/main/java/jp/dosukoi/ui/viewmodel/myPage/MyPageViewModel.kt

@@ -39,7 +39,7 @@ class MyPageViewModel @Inject constructor(
                 )
             }.onSuccess { screenState ->
                 _myPageState.update {
-                    it.copy(screenState = LoadState.Loaded(screenState))
+                    it.copy(screenState = LoadState.Loaded(screenState), isRefreshing = false)
                 }
             }.onFailure {
                 when (it) {

ui/viewModel/src/test/java/jp/dosukoi/ui/viewmodel/myPage/MyPageViewModelUnitTest.kt

@@ -7,6 +7,7 @@ import io.mockk.impl.annotations.InjectMockKs
 import io.mockk.impl.annotations.RelaxedMockK
 import io.mockk.mockk
 import jp.dosukoi.data.entity.myPage.UserStatus
+import jp.dosukoi.data.usecase.auth.GetAccessTokenUseCase
 import jp.dosukoi.data.usecase.myPage.GetRepositoriesUseCase
 import jp.dosukoi.data.usecase.myPage.GetUserStatusUseCase
 import jp.dosukoi.testing.common.assertType
@@ -33,7 +34,7 @@ class MyPageViewModelUnitTest {
     private lateinit var getRepositoriesUseCase: GetRepositoriesUseCase
 
     @RelaxedMockK
-    private lateinit var myPageListener: MyPageListener
+    private lateinit var getAccessTokenUseCase: GetAccessTokenUseCase
 
     @InjectMockKs
     private lateinit var viewModel: MyPageViewModel
@@ -52,7 +53,7 @@ class MyPageViewModelUnitTest {
     @Test
     fun init_success_authenticated() = runBlockingTest {
         // given
-        val myPageState = mutableListOf<LoadState<MyPageUiState>>()
+        val myPageState = mutableListOf<MyPageUiState>()
         val job = viewModel.myPageState.onEach {
             myPageState.add(it)
         }.launchIn(this)
@@ -61,8 +62,8 @@ class MyPageViewModelUnitTest {
         viewModel.init()
 
         // then
-        assertThat(myPageState[0]).isEqualTo(LoadState.Loading)
-        assertType<LoadState.Loaded<MyPageUiState>>(myPageState[1]) {
+        assertThat(myPageState[0].screenState).isEqualTo(LoadState.Loading)
+        assertType<LoadState.Loaded<MyPageScreenState>>(myPageState[1].screenState) {
             assertThat(this.data.userStatus).isInstanceOf(UserStatus.Authenticated::class.java)
             assertThat(this.data.repositoryList.size).isEqualTo(3)
         }
@@ -73,7 +74,7 @@ class MyPageViewModelUnitTest {
     fun init_success_un_authenticated() = runBlockingTest {
         // given
         coEvery { getUserStatusUseCase.execute() } returns UserStatus.UnAuthenticated
-        val myPageState = mutableListOf<LoadState<MyPageUiState>>()
+        val myPageState = mutableListOf<MyPageUiState>()
         val job = viewModel.myPageState.onEach {
             myPageState.add(it)
         }.launchIn(this)
@@ -82,8 +83,8 @@ class MyPageViewModelUnitTest {
         viewModel.init()
 
         // then
-        assertThat(myPageState[0]).isEqualTo(LoadState.Loading)
-        assertType<LoadState.Loaded<MyPageUiState>>(myPageState[1]) {
+        assertThat(myPageState[0].screenState).isEqualTo(LoadState.Loading)
+        assertType<LoadState.Loaded<MyPageScreenState>>(myPageState[1].screenState) {
             assertThat(this.data.userStatus).isEqualTo(UserStatus.UnAuthenticated)
         }
         job.cancel()
@@ -93,7 +94,7 @@ class MyPageViewModelUnitTest {
     fun init_failure() = runBlockingTest {
         // given
         coEvery { getUserStatusUseCase.execute() } throws RuntimeException()
-        val myPageState = mutableListOf<LoadState<MyPageUiState>>()
+        val myPageState = mutableListOf<MyPageUiState>()
         val job = viewModel.myPageState.onEach {
             myPageState.add(it)
         }.launchIn(this)
@@ -102,16 +103,16 @@ class MyPageViewModelUnitTest {
         viewModel.init()
 
         // then
-        assertThat(myPageState[0]).isEqualTo(LoadState.Loading)
-        assertThat(myPageState[1]).isInstanceOf(LoadState.Error::class.java)
+        assertThat(myPageState[0].screenState).isEqualTo(LoadState.Loading)
+        assertThat(myPageState[1].screenState).isInstanceOf(LoadState.Error::class.java)
 
         job.cancel()
     }
 
     @Test
     fun onRetryClick() = runBlockingTest {
         // given
-        val myPageState = mutableListOf<LoadState<MyPageUiState>>()
+        val myPageState = mutableListOf<MyPageUiState>()
         val job = viewModel.myPageState.onEach {
             myPageState.add(it)
         }.launchIn(this)
@@ -120,8 +121,8 @@ class MyPageViewModelUnitTest {
         viewModel.onRetryClick()
 
         // then
-        assertThat(myPageState[0]).isEqualTo(LoadState.Loading)
-        assertType<LoadState.Loaded<MyPageUiState>>(myPageState[1]) {
+        assertThat(myPageState[0].screenState).isEqualTo(LoadState.Loading)
+        assertType<LoadState.Loaded<MyPageScreenState>>(myPageState[1].screenState) {
             assertThat(this.data.repositoryList.size).isEqualTo(3)
         }
         job.cancel()
@@ -143,7 +144,7 @@ class MyPageViewModelUnitTest {
                 mockk()
             )
         )
-        val myPageState = mutableListOf<LoadState<MyPageUiState>>()
+        val myPageState = mutableListOf<MyPageUiState>()
         val job = viewModel.myPageState.onEach {
             myPageState.add(it)
         }.launchIn(this)
@@ -153,16 +154,16 @@ class MyPageViewModelUnitTest {
         viewModel.onRefresh()
 
         // then
-        assertThat(myPageState[0]).isEqualTo(LoadState.Loading)
-        assertType<LoadState.Loaded<MyPageUiState>>(myPageState[1]) {
+        assertThat(myPageState[0].screenState).isEqualTo(LoadState.Loading)
+        assertType<LoadState.Loaded<MyPageScreenState>>(myPageState[1].screenState) {
             assertThat(this.data.repositoryList.size).isEqualTo(3)
         }
-        assertType<LoadState.Loaded<MyPageUiState>>(myPageState[2]) {
-            assertThat(this.data.isRefreshing).isTrue()
-        }
-        assertType<LoadState.Loaded<MyPageUiState>>(myPageState[3]) {
-            assertThat(this.data.repositoryList.size).isEqualTo(4)
-            assertThat(this.data.isRefreshing).isFalse()
+        assertThat(myPageState[2].isRefreshing).isTrue()
+        myPageState[3].also {
+            assertThat(it.isRefreshing).isFalse()
+            assertType<LoadState.Loaded<MyPageScreenState>>(it.screenState) {
+                assertThat(this.data.repositoryList.size).isEqualTo(4)
+            }
         }
 
         job.cancel()