From 9c36507564afe676f004160bc48a9247951260a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?=
 <hoc081098@gmail.com>
Date: Thu, 22 Sep 2022 10:05:49 +0700
Subject: [PATCH 1/6] refactor: context receivers

---
 .idea/codeStyles/Project.xml                  |  3 +++
 .idea/vcs.xml                                 |  6 +++++
 build.gradle.kts                              |  1 +
 buildSrc/src/main/kotlin/deps.kt              |  4 +--
 .../hoc/flowmvi/data/UserRepositoryImpl.kt    | 12 ++++++---
 .../domain/repository/UserRepository.kt       | 13 ++++++---
 .../flowmvi/domain/usecase/AddUserUseCase.kt  |  5 ++--
 .../domain/usecase/RefreshGetUsersUseCase.kt  |  5 ++--
 .../domain/usecase/RemoveUserUseCase.kt       |  5 ++--
 .../domain/usecase/SearchUsersUseCase.kt      |  5 ++--
 .../main/java/com/hoc/flowmvi/ui/add/AddVM.kt |  9 ++++---
 .../java/com/hoc/flowmvi/ui/main/MainVM.kt    | 27 +++++++++----------
 .../com/hoc/flowmvi/ui/search/SearchVM.kt     |  9 ++++---
 13 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index e2d7732b..3d1bc999 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -12,6 +12,9 @@
       <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..4c6280eb 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
diff --git a/build.gradle.kts b/build.gradle.kts
index 62e65e73..f7fca140 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -157,6 +157,7 @@ allprojects {
     kotlinOptions {
       val version = JavaVersion.VERSION_11.toString()
       jvmTarget = version
+      freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
     }
   }
 
diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt
index 9b1e4a3c..5f4fb59e 100644
--- a/buildSrc/src/main/kotlin/deps.kt
+++ b/buildSrc/src/main/kotlin/deps.kt
@@ -7,7 +7,7 @@ import org.gradle.plugin.use.PluginDependenciesSpec
 import org.gradle.plugin.use.PluginDependencySpec
 
 const val ktlintVersion = "0.46.1"
-const val kotlinVersion = "1.7.10"
+const val kotlinVersion = "1.7.20-RC"
 
 object appConfig {
   const val applicationId = "com.hoc.flowmvi"
@@ -75,7 +75,7 @@ object deps {
   const val timber = "com.jakewharton.timber:timber:5.0.1"
 
   object arrow {
-    private const val version = "1.1.2"
+    private const val version = "1.1.3-rc.1"
     const val core = "io.arrow-kt:arrow-core:$version"
   }
 
diff --git a/data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt b/data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt
index 9297e6c1..23d1c57a 100644
--- a/data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt
+++ b/data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt
@@ -2,7 +2,7 @@ package com.hoc.flowmvi.data
 
 import arrow.core.Either.Companion.catch as catchEither
 import arrow.core.ValidatedNel
-import arrow.core.continuations.either
+import arrow.core.continuations.EffectScope
 import arrow.core.left
 import arrow.core.leftWiden
 import arrow.core.right
@@ -99,13 +99,16 @@ internal class UserRepositoryImpl(
       emit(errorMapper(it).left())
     }
 
+  context(EffectScope<UserError>)
   override suspend fun refresh() = catchEither { getUsersFromRemote().first() }
     .tap { sendChange(Change.Refreshed(it)) }
     .map { }
     .tapLeft { logError(it, "refresh") }
     .mapLeft(errorMapper)
+    .bind()
 
-  override suspend fun remove(user: User) = either<UserError, Unit> {
+  context(EffectScope<UserError>)
+  override suspend fun remove(user: User) {
     withContext(dispatchers.io) {
       val response = catchEither { userApiService.remove(user.id) }
         .tapLeft { logError(it, "remove user=$user") }
@@ -121,7 +124,8 @@ internal class UserRepositoryImpl(
     }
   }
 
-  override suspend fun add(user: User) = either<UserError, Unit> {
+  context(EffectScope<UserError>)
+  override suspend fun add(user: User) {
     withContext(dispatchers.io) {
       val response = catchEither { userApiService.add(domainToBody(user)) }
         .tapLeft { logError(it, "add user=$user") }
@@ -137,10 +141,12 @@ internal class UserRepositoryImpl(
     }
   }
 
+  context(EffectScope<UserError>)
   override suspend fun search(query: String) = withContext(dispatchers.io) {
     catchEither { userApiService.search(query).map(responseToDomainThrows) }
       .tapLeft { logError(it, "search query=$query") }
       .mapLeft(errorMapper)
+      .bind()
   }
 
   private companion object {
diff --git a/domain/src/main/java/com/hoc/flowmvi/domain/repository/UserRepository.kt b/domain/src/main/java/com/hoc/flowmvi/domain/repository/UserRepository.kt
index acb9843e..e60bc747 100644
--- a/domain/src/main/java/com/hoc/flowmvi/domain/repository/UserRepository.kt
+++ b/domain/src/main/java/com/hoc/flowmvi/domain/repository/UserRepository.kt
@@ -1,6 +1,7 @@
 package com.hoc.flowmvi.domain.repository
 
 import arrow.core.Either
+import arrow.core.continuations.EffectScope
 import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.model.UserError
 import kotlinx.coroutines.flow.Flow
@@ -8,11 +9,15 @@ import kotlinx.coroutines.flow.Flow
 interface UserRepository {
   fun getUsers(): Flow<Either<UserError, List<User>>>
 
-  suspend fun refresh(): Either<UserError, Unit>
+  context(EffectScope<UserError>)
+  suspend fun refresh()
 
-  suspend fun remove(user: User): Either<UserError, Unit>
+  context(EffectScope<UserError>)
+  suspend fun remove(user: User)
 
-  suspend fun add(user: User): Either<UserError, Unit>
+  context(EffectScope<UserError>)
+  suspend fun add(user: User)
 
-  suspend fun search(query: String): Either<UserError, List<User>>
+  context(EffectScope<UserError>)
+  suspend fun search(query: String): List<User>
 }
diff --git a/domain/src/main/java/com/hoc/flowmvi/domain/usecase/AddUserUseCase.kt b/domain/src/main/java/com/hoc/flowmvi/domain/usecase/AddUserUseCase.kt
index 59eeb0e6..851b5fda 100644
--- a/domain/src/main/java/com/hoc/flowmvi/domain/usecase/AddUserUseCase.kt
+++ b/domain/src/main/java/com/hoc/flowmvi/domain/usecase/AddUserUseCase.kt
@@ -1,10 +1,11 @@
 package com.hoc.flowmvi.domain.usecase
 
-import arrow.core.Either
+import arrow.core.continuations.EffectScope
 import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.model.UserError
 import com.hoc.flowmvi.domain.repository.UserRepository
 
 class AddUserUseCase(private val userRepository: UserRepository) {
-  suspend operator fun invoke(user: User): Either<UserError, Unit> = userRepository.add(user)
+  context(EffectScope<UserError>)
+  suspend operator fun invoke(user: User): Unit = userRepository.add(user)
 }
diff --git a/domain/src/main/java/com/hoc/flowmvi/domain/usecase/RefreshGetUsersUseCase.kt b/domain/src/main/java/com/hoc/flowmvi/domain/usecase/RefreshGetUsersUseCase.kt
index ae6e17a5..70f42e86 100644
--- a/domain/src/main/java/com/hoc/flowmvi/domain/usecase/RefreshGetUsersUseCase.kt
+++ b/domain/src/main/java/com/hoc/flowmvi/domain/usecase/RefreshGetUsersUseCase.kt
@@ -1,9 +1,10 @@
 package com.hoc.flowmvi.domain.usecase
 
-import arrow.core.Either
+import arrow.core.continuations.EffectScope
 import com.hoc.flowmvi.domain.model.UserError
 import com.hoc.flowmvi.domain.repository.UserRepository
 
 class RefreshGetUsersUseCase(private val userRepository: UserRepository) {
-  suspend operator fun invoke(): Either<UserError, Unit> = userRepository.refresh()
+  context(EffectScope<UserError>)
+  suspend operator fun invoke(): Unit = userRepository.refresh()
 }
diff --git a/domain/src/main/java/com/hoc/flowmvi/domain/usecase/RemoveUserUseCase.kt b/domain/src/main/java/com/hoc/flowmvi/domain/usecase/RemoveUserUseCase.kt
index fce13af0..8a2c2917 100644
--- a/domain/src/main/java/com/hoc/flowmvi/domain/usecase/RemoveUserUseCase.kt
+++ b/domain/src/main/java/com/hoc/flowmvi/domain/usecase/RemoveUserUseCase.kt
@@ -1,10 +1,11 @@
 package com.hoc.flowmvi.domain.usecase
 
-import arrow.core.Either
+import arrow.core.continuations.EffectScope
 import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.model.UserError
 import com.hoc.flowmvi.domain.repository.UserRepository
 
 class RemoveUserUseCase(private val userRepository: UserRepository) {
-  suspend operator fun invoke(user: User): Either<UserError, Unit> = userRepository.remove(user)
+  context(EffectScope<UserError>)
+  suspend operator fun invoke(user: User): Unit = userRepository.remove(user)
 }
diff --git a/domain/src/main/java/com/hoc/flowmvi/domain/usecase/SearchUsersUseCase.kt b/domain/src/main/java/com/hoc/flowmvi/domain/usecase/SearchUsersUseCase.kt
index fd6713c0..b1c22afd 100644
--- a/domain/src/main/java/com/hoc/flowmvi/domain/usecase/SearchUsersUseCase.kt
+++ b/domain/src/main/java/com/hoc/flowmvi/domain/usecase/SearchUsersUseCase.kt
@@ -1,11 +1,12 @@
 package com.hoc.flowmvi.domain.usecase
 
-import arrow.core.Either
+import arrow.core.continuations.EffectScope
 import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.model.UserError
 import com.hoc.flowmvi.domain.repository.UserRepository
 
 class SearchUsersUseCase(private val userRepository: UserRepository) {
-  suspend operator fun invoke(query: String): Either<UserError, List<User>> =
+  context(EffectScope<UserError>)
+  suspend operator fun invoke(query: String): List<User> =
     userRepository.search(query)
 }
diff --git a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
index 04c43e36..f0111aaa 100644
--- a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
+++ b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
@@ -2,13 +2,13 @@ package com.hoc.flowmvi.ui.add
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
+import arrow.core.continuations.effect
 import arrow.core.orNull
 import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.usecase.AddUserUseCase
 import com.hoc.flowmvi.mvi_base.AbstractMviViewModel
 import com.hoc081098.flowext.flatMapFirst
-import com.hoc081098.flowext.flowFromSuspend
 import com.hoc081098.flowext.mapTo
 import com.hoc081098.flowext.startWith
 import com.hoc081098.flowext.withLatestFrom
@@ -21,6 +21,7 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.merge
@@ -112,11 +113,11 @@ class AddVM(
       .withLatestFrom(userFormFlow) { _, userForm -> userForm }
       .mapNotNull { it?.orNull() }
       .flatMapFirst { user ->
-        flowFromSuspend { addUser(user) }
+        flowOf(effect { addUser(user) })
           .map { result ->
             result.fold(
-              ifLeft = { PartialStateChange.AddUser.AddUserFailure(user, it) },
-              ifRight = { PartialStateChange.AddUser.AddUserSuccess(user) }
+              recover = { PartialStateChange.AddUser.AddUserFailure(user, it) },
+              transform = { PartialStateChange.AddUser.AddUserSuccess(user) }
             )
           }
           .startWith(PartialStateChange.AddUser.Loading)
diff --git a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainVM.kt b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainVM.kt
index 343362de..8b9c0dbc 100644
--- a/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainVM.kt
+++ b/feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainVM.kt
@@ -1,7 +1,7 @@
 package com.hoc.flowmvi.ui.main
 
 import androidx.lifecycle.viewModelScope
-import arrow.core.flatMap
+import arrow.core.continuations.effect
 import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import com.hoc.flowmvi.domain.usecase.GetUsersUseCase
 import com.hoc.flowmvi.domain.usecase.RefreshGetUsersUseCase
@@ -9,20 +9,19 @@ import com.hoc.flowmvi.domain.usecase.RemoveUserUseCase
 import com.hoc.flowmvi.mvi_base.AbstractMviViewModel
 import com.hoc081098.flowext.defer
 import com.hoc081098.flowext.flatMapFirst
-import com.hoc081098.flowext.flowFromSuspend
 import com.hoc081098.flowext.startWith
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.flatMapConcat
 import kotlinx.coroutines.flow.flatMapMerge
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
@@ -97,12 +96,11 @@ class MainVM(
         }
         .startWith(PartialChange.GetUser.Loading)
 
-      val refreshChanges = refreshGetUsers::invoke
-        .asFlow()
+      val refreshChanges = flowOf(effect { refreshGetUsers() })
         .map { result ->
           result.fold(
-            ifLeft = { PartialChange.Refresh.Failure(it) },
-            ifRight = { PartialChange.Refresh.Success }
+            recover = { PartialChange.Refresh.Failure(it) },
+            transform = { PartialChange.Refresh.Success }
           )
         }
         .startWith(PartialChange.Refresh.Loading)
@@ -123,15 +121,16 @@ class MainVM(
           .log("Intent")
           .map { it.user }
           .flatMapMerge { userItem ->
-            flowFromSuspend {
-              userItem
-                .toDomain()
-                .flatMap { removeUser(it) }
-            }
+            flowOf(
+              effect {
+                val user = userItem.toDomain().bind()
+                removeUser(user)
+              }
+            )
               .map { result ->
                 result.fold(
-                  ifLeft = { PartialChange.RemoveUser.Failure(userItem, it) },
-                  ifRight = { PartialChange.RemoveUser.Success(userItem) },
+                  recover = { PartialChange.RemoveUser.Failure(userItem, it) },
+                  transform = { PartialChange.RemoveUser.Success(userItem) },
                 )
               }
           }
diff --git a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
index 3b21094d..056b5d9e 100644
--- a/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
+++ b/feature-search/src/main/java/com/hoc/flowmvi/ui/search/SearchVM.kt
@@ -2,11 +2,11 @@ package com.hoc.flowmvi.ui.search
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
+import arrow.core.continuations.effect
 import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
 import com.hoc.flowmvi.domain.usecase.SearchUsersUseCase
 import com.hoc.flowmvi.mvi_base.AbstractMviViewModel
 import com.hoc081098.flowext.flatMapFirst
-import com.hoc081098.flowext.flowFromSuspend
 import com.hoc081098.flowext.startWith
 import com.hoc081098.flowext.takeUntil
 import kotlin.time.Duration.Companion.milliseconds
@@ -24,6 +24,7 @@ import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
@@ -57,11 +58,11 @@ class SearchVM(
 
   private fun SharedFlow<ViewIntent>.toPartialStateChangesFlow(): Flow<PartialStateChange> {
     val executeSearch: suspend (String) -> Flow<PartialStateChange> = { query: String ->
-      flowFromSuspend { searchUsersUseCase(query) }
+      flowOf(effect { searchUsersUseCase(query) })
         .map { result ->
           result.fold(
-            ifLeft = { PartialStateChange.Failure(it, query) },
-            ifRight = {
+            recover = { PartialStateChange.Failure(it, query) },
+            transform = {
               PartialStateChange.Success(
                 it.map(UserItem::from),
                 query

From 541fcb500a64b1aa090ecb5f5f8db636c3dbc23f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?=
 <hoc081098@gmail.com>
Date: Thu, 22 Sep 2022 10:08:45 +0700
Subject: [PATCH 2/6] arrow-kt 1.1.3

---
 buildSrc/src/main/kotlin/deps.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt
index 5f4fb59e..cbcb7b58 100644
--- a/buildSrc/src/main/kotlin/deps.kt
+++ b/buildSrc/src/main/kotlin/deps.kt
@@ -75,7 +75,7 @@ object deps {
   const val timber = "com.jakewharton.timber:timber:5.0.1"
 
   object arrow {
-    private const val version = "1.1.3-rc.1"
+    private const val version = "1.1.3"
     const val core = "io.arrow-kt:arrow-core:$version"
   }
 

From 70c9bcf91b1f908bfd2f7eee9fa95001410d86d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?=
 <hoc081098@gmail.com>
Date: Thu, 22 Sep 2022 10:46:15 +0700
Subject: [PATCH 3/6] build: migrate from `manifest's package` to `namespace`

---
 app/build.gradle.kts                         | 1 +
 app/src/main/AndroidManifest.xml             | 3 +--
 core-ui/build.gradle.kts                     | 1 +
 core-ui/src/main/AndroidManifest.xml         | 3 +--
 data/build.gradle.kts                        | 1 +
 data/src/main/AndroidManifest.xml            | 4 +---
 feature-add/build.gradle.kts                 | 1 +
 feature-add/src/main/AndroidManifest.xml     | 3 +--
 feature-main/build.gradle.kts                | 1 +
 feature-main/src/main/AndroidManifest.xml    | 3 +--
 feature-search/build.gradle.kts              | 1 +
 feature-search/src/main/AndroidManifest.xml  | 3 +--
 mvi/mvi-base/build.gradle.kts                | 1 +
 mvi/mvi-base/src/main/AndroidManifest.xml    | 4 +---
 mvi/mvi-testing/build.gradle.kts             | 1 +
 mvi/mvi-testing/src/main/AndroidManifest.xml | 4 +---
 16 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c76fa1e4..bede0b8c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9b4ee9ff..187e15fd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.hoc.flowmvi">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/core-ui/build.gradle.kts b/core-ui/build.gradle.kts
index 8d37a5fb..86deb0ec 100644
--- a/core-ui/build.gradle.kts
+++ b/core-ui/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.core_ui"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/core-ui/src/main/AndroidManifest.xml b/core-ui/src/main/AndroidManifest.xml
index 6ae8afba..897cfeca 100644
--- a/core-ui/src/main/AndroidManifest.xml
+++ b/core-ui/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hoc.flowmvi.core_ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 36ab8761..8c000e54 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.data"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
index 72621c55..8072ee00 100644
--- a/data/src/main/AndroidManifest.xml
+++ b/data/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.hoc.flowmvi.data">
-
-</manifest>
+<manifest />
diff --git a/feature-add/build.gradle.kts b/feature-add/build.gradle.kts
index d422dbde..4a8b504a 100644
--- a/feature-add/build.gradle.kts
+++ b/feature-add/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.ui.add"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/feature-add/src/main/AndroidManifest.xml b/feature-add/src/main/AndroidManifest.xml
index 365cc847..1a025618 100644
--- a/feature-add/src/main/AndroidManifest.xml
+++ b/feature-add/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hoc.flowmvi.ui.add">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/feature-main/build.gradle.kts b/feature-main/build.gradle.kts
index e10c33a0..24532e9c 100644
--- a/feature-main/build.gradle.kts
+++ b/feature-main/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.ui.main"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/feature-main/src/main/AndroidManifest.xml b/feature-main/src/main/AndroidManifest.xml
index 1949c3b7..90e7b715 100644
--- a/feature-main/src/main/AndroidManifest.xml
+++ b/feature-main/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hoc.flowmvi.ui.main">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/feature-search/build.gradle.kts b/feature-search/build.gradle.kts
index 006f55dd..5ef372d1 100644
--- a/feature-search/build.gradle.kts
+++ b/feature-search/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.ui.search"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/feature-search/src/main/AndroidManifest.xml b/feature-search/src/main/AndroidManifest.xml
index 2e174979..83d96a00 100644
--- a/feature-search/src/main/AndroidManifest.xml
+++ b/feature-search/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hoc.flowmvi.ui.search">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/mvi/mvi-base/build.gradle.kts b/mvi/mvi-base/build.gradle.kts
index ebf242bb..f7ec0448 100644
--- a/mvi/mvi-base/build.gradle.kts
+++ b/mvi/mvi-base/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.mvi_base"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/mvi/mvi-base/src/main/AndroidManifest.xml b/mvi/mvi-base/src/main/AndroidManifest.xml
index 21977049..8072ee00 100644
--- a/mvi/mvi-base/src/main/AndroidManifest.xml
+++ b/mvi/mvi-base/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.hoc.flowmvi.mvi_base">
-
-</manifest>
+<manifest />
diff --git a/mvi/mvi-testing/build.gradle.kts b/mvi/mvi-testing/build.gradle.kts
index f7d3a528..74c584bf 100644
--- a/mvi/mvi-testing/build.gradle.kts
+++ b/mvi/mvi-testing/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+  namespace = "com.hoc.flowmvi.mvi_testing"
   compileSdk = appConfig.compileSdkVersion
   buildToolsVersion = appConfig.buildToolsVersion
 
diff --git a/mvi/mvi-testing/src/main/AndroidManifest.xml b/mvi/mvi-testing/src/main/AndroidManifest.xml
index 9c3c1498..8072ee00 100644
--- a/mvi/mvi-testing/src/main/AndroidManifest.xml
+++ b/mvi/mvi-testing/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.hoc.flowmvi.mvi_testing">
-
-</manifest>
+<manifest />

From 31d9e98349c9d4cdab919fb5faa322bc2fa8c88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?=
 <hoc081098@gmail.com>
Date: Thu, 22 Sep 2022 13:04:18 +0700
Subject: [PATCH 4/6] wip

---
 .../hoc/flowmvi/data/UserRepositoryImpl.kt    | 58 +++++++++++--------
 .../flowmvi/data/UserRepositoryImplTest.kt    | 23 ++++----
 .../java/com/hoc/flowmvi/test_utils/utils.kt  |  5 ++
 3 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt b/data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt
index 23d1c57a..cf424dcd 100644
--- a/data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt
+++ b/data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt
@@ -6,6 +6,7 @@ import arrow.core.continuations.EffectScope
 import arrow.core.left
 import arrow.core.leftWiden
 import arrow.core.right
+import arrow.core.traverse
 import arrow.core.valueOr
 import com.hoc.flowmvi.core.Mapper
 import com.hoc.flowmvi.core.dispatchers.AppCoroutineDispatchers
@@ -16,6 +17,7 @@ import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.model.UserError
 import com.hoc.flowmvi.domain.model.UserValidationError
 import com.hoc.flowmvi.domain.repository.UserRepository
+import com.hoc081098.flowext.flowFromSuspend
 import com.hoc081098.flowext.retryWithExponentialBackoff
 import java.io.IOException
 import kotlin.time.Duration.Companion.milliseconds
@@ -24,7 +26,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapConcat
@@ -51,34 +52,28 @@ internal class UserRepositoryImpl(
     class Added(val user: User) : Change()
   }
 
-  private val responseToDomainThrows: (UserResponse) -> User = { response ->
-    responseToDomain(response).let { validated ->
-      validated.valueOr {
-        val t = UserError.ValidationFailed(it.toSet())
-        logError(t, "Map $response to user")
-        throw t
-      }
-    }
-  }
-
   private val changesFlow = MutableSharedFlow<Change>(extraBufferCapacity = 64)
-
   private suspend inline fun sendChange(change: Change) = changesFlow.emit(change)
 
-  @Suppress("NOTHING_TO_INLINE")
-  private inline fun logError(t: Throwable, message: String) = Timber.tag(TAG).e(t, message)
-
-  private fun getUsersFromRemote(): Flow<List<User>> = suspend {
+  private fun getUsersFromRemote(): Flow<List<User>> = flowFromSuspend {
     Timber.d("[USER_REPO] getUsersFromRemote ...")
+
     userApiService
       .getUsers()
-      .map(responseToDomainThrows)
-  }.asFlow()
-    .retryWithExponentialBackoff(
-      maxAttempt = 2,
-      initialDelay = 500.milliseconds,
-      factor = 2.0,
-    ) { it is IOException }
+      .let { response ->
+        response
+          .traverse(responseToDomain)
+          .valueOr { validationErrors ->
+            throw UserError.ValidationFailed(validationErrors.toSet()).also {
+              logError(it, "Failed to map $response to user")
+            }
+          }
+      }
+  }.retryWithExponentialBackoff(
+    maxAttempt = 2,
+    initialDelay = 500.milliseconds,
+    factor = 2.0,
+  ) { it is IOException }
 
   override fun getUsers() = getUsersFromRemote()
     .flatMapConcat { initial ->
@@ -143,13 +138,28 @@ internal class UserRepositoryImpl(
 
   context(EffectScope<UserError>)
   override suspend fun search(query: String) = withContext(dispatchers.io) {
-    catchEither { userApiService.search(query).map(responseToDomainThrows) }
+    val userResponses = catchEither { userApiService.search(query) }
       .tapLeft { logError(it, "search query=$query") }
       .mapLeft(errorMapper)
       .bind()
+
+    val users = userResponses.traverse(responseToDomain)
+      .mapLeft { UserError.ValidationFailed(it.toSet()) }
+      .tapInvalid {
+        logError(
+          it,
+          "search query=$query, failed to map $userResponses to List<User>"
+        )
+      }
+      .bind()
+
+    users
   }
 
   private companion object {
     private val TAG = UserRepositoryImpl::class.java.simpleName
+
+    @Suppress("NOTHING_TO_INLINE")
+    private inline fun logError(t: Throwable, message: String) = Timber.tag(TAG).e(t, message)
   }
 }
diff --git a/data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt b/data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt
index cd5fcf78..134aa8fc 100644
--- a/data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt
+++ b/data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt
@@ -14,6 +14,7 @@ import com.hoc.flowmvi.test_utils.TestAppCoroutineDispatchers
 import com.hoc.flowmvi.test_utils.TestCoroutineDispatcherRule
 import com.hoc.flowmvi.test_utils.getOrThrow
 import com.hoc.flowmvi.test_utils.leftOrThrow
+import com.hoc.flowmvi.test_utils.runAsEither
 import com.hoc.flowmvi.test_utils.valueOrThrow
 import io.mockk.clearAllMocks
 import io.mockk.coEvery
@@ -144,7 +145,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.getUsers() } returns USER_RESPONSES
     every { responseToDomain(any()) } returnsMany VALID_NEL_USERS
 
-    val result = repo.refresh()
+    val result = runAsEither { repo.refresh() }
 
     assertTrue(result.isRight())
     assertNotNull(result.orNull())
@@ -163,7 +164,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.getUsers() } throws ioException
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
 
-    val result = repo.refresh()
+    val result = runAsEither { repo.refresh() }
 
     assertTrue(result.isLeft())
     assertEquals(UserError.NetworkError, result.leftOrThrow)
@@ -179,7 +180,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.remove(user.id) } returns userResponse
     every { responseToDomain(userResponse) } returns user.validNel()
 
-    val result = repo.remove(user)
+    val result = runAsEither { repo.remove(user) }
 
     assertTrue(result.isRight())
     assertNotNull(result.orNull())
@@ -194,7 +195,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.remove(user.id) } throws IOException()
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
 
-    val result = repo.remove(user)
+    val result = runAsEither { repo.remove(user) }
 
     assertTrue(result.isLeft())
     assertEquals(UserError.NetworkError, result.leftOrThrow)
@@ -211,7 +212,7 @@ class UserRepositoryImplTest {
     every { domainToBody(user) } returns USER_BODY
     every { responseToDomain(userResponse) } returns user.validNel()
 
-    val result = repo.add(user)
+    val result = runAsEither { repo.add(user) }
 
     assertTrue(result.isRight())
     assertNotNull(result.orNull())
@@ -228,7 +229,7 @@ class UserRepositoryImplTest {
     every { domainToBody(user) } returns USER_BODY
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
 
-    val result = repo.add(user)
+    val result = runAsEither { repo.add(user) }
 
     assertTrue(result.isLeft())
     assertEquals(UserError.NetworkError, result.leftOrThrow)
@@ -244,7 +245,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.search(q) } returns USER_RESPONSES
     every { responseToDomain(any()) } returnsMany VALID_NEL_USERS
 
-    val result = repo.search(q)
+    val result = runAsEither { repo.search(q) }
 
     assertTrue(result.isRight())
     assertNotNull(result.orNull())
@@ -264,7 +265,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.search(q) } throws IOException()
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
 
-    val result = repo.search(q)
+    val result = runAsEither { repo.search(q) }
 
     assertTrue(result.isLeft())
     assertEquals(UserError.NetworkError, result.leftOrThrow)
@@ -337,8 +338,10 @@ class UserRepositoryImplTest {
       val job = launch(start = CoroutineStart.UNDISPATCHED) {
         repo.getUsers().toList(events)
       }
-      repo.add(user)
-      repo.remove(user)
+      runAsEither {
+        repo.add(user)
+        repo.remove(user)
+      }.getOrThrow
       delay(120_000)
       job.cancel()
 
diff --git a/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt b/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt
index 1f09c584..ef19b422 100644
--- a/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt
+++ b/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt
@@ -2,6 +2,8 @@ package com.hoc.flowmvi.test_utils
 
 import arrow.core.Either
 import arrow.core.Validated
+import arrow.core.continuations.EffectScope
+import arrow.core.continuations.effect
 import arrow.core.getOrHandle
 import arrow.core.identity
 import arrow.core.valueOr
@@ -22,3 +24,6 @@ inline val <L, R> Either<L, R>.getOrThrow: R
 internal fun <E> Any.throws(it: E): Nothing =
   if (it is Throwable) throw it
   else error("$this - $it - Should not reach here!")
+
+suspend fun <R, A> runAsEither(operation: suspend EffectScope<R>.() -> A) =
+  effect(operation).toEither()

From 4d5d1c078cfda5b8e1964fb69b5ad80dc61c8460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?=
 <hoc081098@gmail.com>
Date: Tue, 27 Sep 2022 17:32:22 +0700
Subject: [PATCH 5/6] test: fix

---
 .../flowmvi/data/UserRepositoryImplTest.kt    | 20 +++----
 .../com/hoc/flowmvi/domain/UseCaseTest.kt     | 56 ++++++++++---------
 .../java/com/hoc/flowmvi/test_utils/utils.kt  | 14 ++++-
 3 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt b/data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt
index 134aa8fc..7ea5164c 100644
--- a/data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt
+++ b/data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplTest.kt
@@ -2,6 +2,7 @@ package com.hoc.flowmvi.data
 
 import arrow.core.Either
 import arrow.core.ValidatedNel
+import arrow.core.continuations.either
 import arrow.core.validNel
 import com.hoc.flowmvi.core.Mapper
 import com.hoc.flowmvi.data.remote.UserApiService
@@ -14,7 +15,6 @@ import com.hoc.flowmvi.test_utils.TestAppCoroutineDispatchers
 import com.hoc.flowmvi.test_utils.TestCoroutineDispatcherRule
 import com.hoc.flowmvi.test_utils.getOrThrow
 import com.hoc.flowmvi.test_utils.leftOrThrow
-import com.hoc.flowmvi.test_utils.runAsEither
 import com.hoc.flowmvi.test_utils.valueOrThrow
 import io.mockk.clearAllMocks
 import io.mockk.coEvery
@@ -145,7 +145,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.getUsers() } returns USER_RESPONSES
     every { responseToDomain(any()) } returnsMany VALID_NEL_USERS
 
-    val result = runAsEither { repo.refresh() }
+    val result = either { repo.refresh() }
 
     assertTrue(result.isRight())
     assertNotNull(result.orNull())
@@ -164,7 +164,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.getUsers() } throws ioException
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
 
-    val result = runAsEither { repo.refresh() }
+    val result = either { repo.refresh() }
 
     assertTrue(result.isLeft())
     assertEquals(UserError.NetworkError, result.leftOrThrow)
@@ -180,7 +180,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.remove(user.id) } returns userResponse
     every { responseToDomain(userResponse) } returns user.validNel()
 
-    val result = runAsEither { repo.remove(user) }
+    val result = either { repo.remove(user) }
 
     assertTrue(result.isRight())
     assertNotNull(result.orNull())
@@ -195,7 +195,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.remove(user.id) } throws IOException()
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
 
-    val result = runAsEither { repo.remove(user) }
+    val result = either { repo.remove(user) }
 
     assertTrue(result.isLeft())
     assertEquals(UserError.NetworkError, result.leftOrThrow)
@@ -212,7 +212,7 @@ class UserRepositoryImplTest {
     every { domainToBody(user) } returns USER_BODY
     every { responseToDomain(userResponse) } returns user.validNel()
 
-    val result = runAsEither { repo.add(user) }
+    val result = either { repo.add(user) }
 
     assertTrue(result.isRight())
     assertNotNull(result.orNull())
@@ -229,7 +229,7 @@ class UserRepositoryImplTest {
     every { domainToBody(user) } returns USER_BODY
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
 
-    val result = runAsEither { repo.add(user) }
+    val result = either { repo.add(user) }
 
     assertTrue(result.isLeft())
     assertEquals(UserError.NetworkError, result.leftOrThrow)
@@ -245,7 +245,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.search(q) } returns USER_RESPONSES
     every { responseToDomain(any()) } returnsMany VALID_NEL_USERS
 
-    val result = runAsEither { repo.search(q) }
+    val result = either { repo.search(q) }
 
     assertTrue(result.isRight())
     assertNotNull(result.orNull())
@@ -265,7 +265,7 @@ class UserRepositoryImplTest {
     coEvery { userApiService.search(q) } throws IOException()
     every { errorMapper(ofType<IOException>()) } returns UserError.NetworkError
 
-    val result = runAsEither { repo.search(q) }
+    val result = either { repo.search(q) }
 
     assertTrue(result.isLeft())
     assertEquals(UserError.NetworkError, result.leftOrThrow)
@@ -338,7 +338,7 @@ class UserRepositoryImplTest {
       val job = launch(start = CoroutineStart.UNDISPATCHED) {
         repo.getUsers().toList(events)
       }
-      runAsEither {
+      either {
         repo.add(user)
         repo.remove(user)
       }.getOrThrow
diff --git a/domain/src/test/java/com/hoc/flowmvi/domain/UseCaseTest.kt b/domain/src/test/java/com/hoc/flowmvi/domain/UseCaseTest.kt
index a0bbb45e..955cde1c 100644
--- a/domain/src/test/java/com/hoc/flowmvi/domain/UseCaseTest.kt
+++ b/domain/src/test/java/com/hoc/flowmvi/domain/UseCaseTest.kt
@@ -1,5 +1,6 @@
 package com.hoc.flowmvi.domain
 
+import arrow.core.continuations.either
 import arrow.core.left
 import arrow.core.right
 import com.hoc.flowmvi.domain.model.User
@@ -11,12 +12,16 @@ import com.hoc.flowmvi.domain.usecase.RefreshGetUsersUseCase
 import com.hoc.flowmvi.domain.usecase.RemoveUserUseCase
 import com.hoc.flowmvi.domain.usecase.SearchUsersUseCase
 import com.hoc.flowmvi.test_utils.TestCoroutineDispatcherRule
+import com.hoc.flowmvi.test_utils.thenShift
 import com.hoc.flowmvi.test_utils.valueOrThrow
+import com.hoc.flowmvi.test_utils.withAnyEffectScope
+import io.mockk.Runs
 import io.mockk.clearAllMocks
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.confirmVerified
 import io.mockk.every
+import io.mockk.just
 import io.mockk.mockk
 import io.mockk.verify
 import kotlin.test.AfterTest
@@ -65,7 +70,8 @@ class UseCaseTest {
   private lateinit var addUserUseCase: AddUserUseCase
   private lateinit var searchUsersUseCase: SearchUsersUseCase
 
-  private val errorLeft = UserError.NetworkError.left()
+  private val networkError = UserError.NetworkError
+  private val errorLeft = networkError.left()
 
   @BeforeTest
   fun setup() {
@@ -107,83 +113,83 @@ class UseCaseTest {
 
   @Test
   fun test_refreshUseCase_whenSuccess_returnsUnit() = runTest {
-    coEvery { userRepository.refresh() } returns Unit.right()
+    coEvery { withAnyEffectScope { userRepository.refresh() } } just Runs
 
-    val result = refreshUseCase()
+    val result = either { refreshUseCase() }
 
-    coVerify { userRepository.refresh() }
+    coVerify { withAnyEffectScope { userRepository.refresh() } }
     assertEquals(Unit.right(), result)
   }
 
   @Test
   fun test_refreshUseCase_whenError_throwsError() = runTest {
-    coEvery { userRepository.refresh() } returns errorLeft
+    coEvery { withAnyEffectScope { userRepository.refresh() } } thenShift networkError
 
-    val result = refreshUseCase()
+    val result = either { refreshUseCase() }
 
-    coVerify { userRepository.refresh() }
+    coVerify { withAnyEffectScope { userRepository.refresh() } }
     assertEquals(errorLeft, result)
   }
 
   @Test
   fun test_removeUserUseCase_whenSuccess_returnsUnit() = runTest {
-    coEvery { userRepository.remove(any()) } returns Unit.right()
+    coEvery { withAnyEffectScope { userRepository.remove(any()) } } just Runs
 
-    val result = removeUserUseCase(USERS[0])
+    val result = either { removeUserUseCase(USERS[0]) }
 
-    coVerify { userRepository.remove(USERS[0]) }
+    coVerify { withAnyEffectScope { userRepository.remove(USERS[0]) } }
     assertEquals(Unit.right(), result)
   }
 
   @Test
   fun test_removeUserUseCase_whenError_throwsError() = runTest {
-    coEvery { userRepository.remove(any()) } returns errorLeft
+    coEvery { withAnyEffectScope { userRepository.remove(any()) } } thenShift networkError
 
-    val result = removeUserUseCase(USERS[0])
+    val result = either { removeUserUseCase(USERS[0]) }
 
-    coVerify { userRepository.remove(USERS[0]) }
+    coVerify { withAnyEffectScope { userRepository.remove(USERS[0]) } }
     assertEquals(errorLeft, result)
   }
 
   @Test
   fun test_addUserUseCase_whenSuccess_returnsUnit() = runTest {
-    coEvery { userRepository.add(any()) } returns Unit.right()
+    coEvery { withAnyEffectScope { userRepository.add(any()) } } just Runs
 
-    val result = addUserUseCase(USERS[0])
+    val result = either { addUserUseCase(USERS[0]) }
 
-    coVerify { userRepository.add(USERS[0]) }
+    coVerify { withAnyEffectScope { userRepository.add(USERS[0]) } }
     assertEquals(Unit.right(), result)
   }
 
   @Test
   fun test_addUserUseCase_whenError_throwsError() = runTest {
-    coEvery { userRepository.add(any()) } returns errorLeft
+    coEvery { withAnyEffectScope { userRepository.add(any()) } } thenShift networkError
 
-    val result = addUserUseCase(USERS[0])
+    val result = either { addUserUseCase(USERS[0]) }
 
-    coVerify { userRepository.add(USERS[0]) }
+    coVerify { withAnyEffectScope { userRepository.add(USERS[0]) } }
     assertEquals(errorLeft, result)
   }
 
   @Test
   fun test_searchUsersUseCase_whenSuccess_returnsUsers() = runTest {
-    coEvery { userRepository.search(any()) } returns USERS.right()
+    coEvery { withAnyEffectScope { userRepository.search(any()) } } returns USERS
 
     val query = "hoc081098"
-    val result = searchUsersUseCase(query)
+    val result = either { searchUsersUseCase(query) }
 
-    coVerify { userRepository.search(query) }
+    coVerify { withAnyEffectScope { userRepository.search(query) } }
     assertEquals(USERS.right(), result)
   }
 
   @Test
   fun test_searchUsersUseCase_whenError_throwsError() = runTest {
-    coEvery { userRepository.search(any()) } returns errorLeft
+    coEvery { withAnyEffectScope { userRepository.search(any()) } } thenShift networkError
 
     val query = "hoc081098"
-    val result = searchUsersUseCase(query)
+    val result = either { searchUsersUseCase(query) }
 
-    coVerify { userRepository.search(query) }
+    coVerify { withAnyEffectScope { userRepository.search(query) } }
     assertEquals(errorLeft, result)
   }
 }
diff --git a/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt b/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt
index ef19b422..60c2596d 100644
--- a/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt
+++ b/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt
@@ -3,10 +3,12 @@ package com.hoc.flowmvi.test_utils
 import arrow.core.Either
 import arrow.core.Validated
 import arrow.core.continuations.EffectScope
-import arrow.core.continuations.effect
 import arrow.core.getOrHandle
 import arrow.core.identity
 import arrow.core.valueOr
+import com.hoc.flowmvi.core.unit
+import io.mockk.MockKMatcherScope
+import io.mockk.MockKStubScope
 
 inline val <E, A> Validated<E, A>.valueOrThrow: A
   get() = valueOr(this::throws)
@@ -25,5 +27,11 @@ internal fun <E> Any.throws(it: E): Nothing =
   if (it is Throwable) throw it
   else error("$this - $it - Should not reach here!")
 
-suspend fun <R, A> runAsEither(operation: suspend EffectScope<R>.() -> A) =
-  effect(operation).toEither()
+context(MockKMatcherScope)
+inline fun <reified R, RR> withAnyEffectScope(block: EffectScope<R>.() -> RR): RR =
+  with(any<EffectScope<R>>()) {
+    block()
+  }
+
+inline infix fun <reified R> MockKStubScope<*, *>.thenShift(r: R): Unit =
+  coAnswers { arg<EffectScope<R>>(0).shift(r) }.unit

From 3301820acc535d5bcb9a81863cd2526038f860a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?=
 <hoc081098@gmail.com>
Date: Thu, 29 Sep 2022 15:58:35 +0700
Subject: [PATCH 6/6] test: fix

---
 .../com/hoc/flowmvi/domain/UseCaseTest.kt     | 10 +--
 .../main/java/com/hoc/flowmvi/ui/add/AddVM.kt |  6 +-
 .../java/com/hoc/flowmvi/ui/add/AddVMTest.kt  | 12 ++--
 .../com/hoc/flowmvi/ui/main/MainVMTest.kt     | 31 +++++----
 .../com/hoc/flowmvi/ui/search/SearchVMTest.kt | 67 ++++++++++---------
 .../mvi_testing/BaseMviViewModelTest.kt       | 19 +++++-
 .../java/com/hoc/flowmvi/test_utils/utils.kt  |  8 ++-
 7 files changed, 93 insertions(+), 60 deletions(-)

diff --git a/domain/src/test/java/com/hoc/flowmvi/domain/UseCaseTest.kt b/domain/src/test/java/com/hoc/flowmvi/domain/UseCaseTest.kt
index 955cde1c..885dc99c 100644
--- a/domain/src/test/java/com/hoc/flowmvi/domain/UseCaseTest.kt
+++ b/domain/src/test/java/com/hoc/flowmvi/domain/UseCaseTest.kt
@@ -12,7 +12,7 @@ import com.hoc.flowmvi.domain.usecase.RefreshGetUsersUseCase
 import com.hoc.flowmvi.domain.usecase.RemoveUserUseCase
 import com.hoc.flowmvi.domain.usecase.SearchUsersUseCase
 import com.hoc.flowmvi.test_utils.TestCoroutineDispatcherRule
-import com.hoc.flowmvi.test_utils.thenShift
+import com.hoc.flowmvi.test_utils.justShift
 import com.hoc.flowmvi.test_utils.valueOrThrow
 import com.hoc.flowmvi.test_utils.withAnyEffectScope
 import io.mockk.Runs
@@ -123,7 +123,7 @@ class UseCaseTest {
 
   @Test
   fun test_refreshUseCase_whenError_throwsError() = runTest {
-    coEvery { withAnyEffectScope { userRepository.refresh() } } thenShift networkError
+    coEvery { withAnyEffectScope { userRepository.refresh() } } justShift networkError
 
     val result = either { refreshUseCase() }
 
@@ -143,7 +143,7 @@ class UseCaseTest {
 
   @Test
   fun test_removeUserUseCase_whenError_throwsError() = runTest {
-    coEvery { withAnyEffectScope { userRepository.remove(any()) } } thenShift networkError
+    coEvery { withAnyEffectScope { userRepository.remove(any()) } } justShift networkError
 
     val result = either { removeUserUseCase(USERS[0]) }
 
@@ -163,7 +163,7 @@ class UseCaseTest {
 
   @Test
   fun test_addUserUseCase_whenError_throwsError() = runTest {
-    coEvery { withAnyEffectScope { userRepository.add(any()) } } thenShift networkError
+    coEvery { withAnyEffectScope { userRepository.add(any()) } } justShift networkError
 
     val result = either { addUserUseCase(USERS[0]) }
 
@@ -184,7 +184,7 @@ class UseCaseTest {
 
   @Test
   fun test_searchUsersUseCase_whenError_throwsError() = runTest {
-    coEvery { withAnyEffectScope { userRepository.search(any()) } } thenShift networkError
+    coEvery { withAnyEffectScope { userRepository.search(any()) } } justShift networkError
 
     val query = "hoc081098"
     val result = either { searchUsersUseCase(query) }
diff --git a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
index f0111aaa..ebfc61db 100644
--- a/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
+++ b/feature-add/src/main/java/com/hoc/flowmvi/ui/add/AddVM.kt
@@ -113,7 +113,11 @@ class AddVM(
       .withLatestFrom(userFormFlow) { _, userForm -> userForm }
       .mapNotNull { it?.orNull() }
       .flatMapFirst { user ->
-        flowOf(effect { addUser(user) })
+        flowOf(
+          effect {
+            addUser(user)
+          }
+        )
           .map { result ->
             result.fold(
               recover = { PartialStateChange.AddUser.AddUserFailure(user, it) },
diff --git a/feature-add/src/test/java/com/hoc/flowmvi/ui/add/AddVMTest.kt b/feature-add/src/test/java/com/hoc/flowmvi/ui/add/AddVMTest.kt
index 0f03a327..cecc0ab2 100644
--- a/feature-add/src/test/java/com/hoc/flowmvi/ui/add/AddVMTest.kt
+++ b/feature-add/src/test/java/com/hoc/flowmvi/ui/add/AddVMTest.kt
@@ -1,8 +1,6 @@
 package com.hoc.flowmvi.ui.add
 
 import androidx.lifecycle.SavedStateHandle
-import arrow.core.left
-import arrow.core.right
 import com.hoc.flowmvi.domain.model.User
 import com.hoc.flowmvi.domain.model.UserError
 import com.hoc.flowmvi.domain.model.UserValidationError
@@ -10,10 +8,12 @@ import com.hoc.flowmvi.domain.model.UserValidationError.TOO_SHORT_FIRST_NAME
 import com.hoc.flowmvi.domain.model.UserValidationError.TOO_SHORT_LAST_NAME
 import com.hoc.flowmvi.domain.usecase.AddUserUseCase
 import com.hoc.flowmvi.mvi_testing.BaseMviViewModelTest
+import com.hoc.flowmvi.mvi_testing.justShiftWithDelay
 import com.hoc.flowmvi.mvi_testing.mapRight
 import com.hoc.flowmvi.mvi_testing.returnsWithDelay
 import com.hoc.flowmvi.test_utils.TestAppCoroutineDispatchers
 import com.hoc.flowmvi.test_utils.valueOrThrow
+import com.hoc.flowmvi.test_utils.withAnyEffectScope
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.confirmVerified
@@ -279,7 +279,7 @@ class AddVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, AddVM
       avatar = ""
     ).valueOrThrow
 
-    coEvery { addUser(user) } returnsWithDelay Unit.right()
+    coEvery { withAnyEffectScope { addUser(user) } } returnsWithDelay Unit
 
     runVMTest(
       vmProducer = { vm },
@@ -325,7 +325,7 @@ class AddVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, AddVM
         ViewIntent.LastNameChanged(NAME),
       ),
     ) {
-      coVerify { addUser(user) }
+      coVerify { withAnyEffectScope { addUser(user) } }
     }
   }
 
@@ -340,7 +340,7 @@ class AddVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, AddVM
     ).valueOrThrow
     val networkError = UserError.NetworkError
 
-    coEvery { addUser(user) } returnsWithDelay networkError.left()
+    coEvery { withAnyEffectScope { addUser(user) } } justShiftWithDelay networkError
 
     runVMTest(
       vmProducer = { vm },
@@ -386,7 +386,7 @@ class AddVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, AddVM
         ViewIntent.LastNameChanged(NAME),
       ),
     ) {
-      coVerify { addUser(user) }
+      coVerify { withAnyEffectScope { addUser(user) } }
     }
   }
 
diff --git a/feature-main/src/test/java/com/hoc/flowmvi/ui/main/MainVMTest.kt b/feature-main/src/test/java/com/hoc/flowmvi/ui/main/MainVMTest.kt
index c0a295e8..11c2ef7c 100644
--- a/feature-main/src/test/java/com/hoc/flowmvi/ui/main/MainVMTest.kt
+++ b/feature-main/src/test/java/com/hoc/flowmvi/ui/main/MainVMTest.kt
@@ -9,9 +9,12 @@ import com.hoc.flowmvi.domain.usecase.RefreshGetUsersUseCase
 import com.hoc.flowmvi.domain.usecase.RemoveUserUseCase
 import com.hoc.flowmvi.mvi_testing.BaseMviViewModelTest
 import com.hoc.flowmvi.mvi_testing.delayEach
+import com.hoc.flowmvi.mvi_testing.justShiftWithDelay
 import com.hoc.flowmvi.mvi_testing.mapRight
 import com.hoc.flowmvi.mvi_testing.returnsWithDelay
 import com.hoc.flowmvi.test_utils.TestAppCoroutineDispatchers
+import com.hoc.flowmvi.test_utils.justShift
+import com.hoc.flowmvi.test_utils.withAnyEffectScope
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.coVerifySequence
@@ -120,7 +123,7 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
     runVMTest(
       vmProducer = {
         every { getUserUseCase() } returns flowOf(USERS.right()).delayEach()
-        coEvery { refreshGetUsersUseCase() } returnsWithDelay Unit.right()
+        coEvery { withAnyEffectScope { refreshGetUsersUseCase() } } returnsWithDelay Unit
         vm
       },
       intents = flowOf(ViewIntent.Refresh),
@@ -150,7 +153,7 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
       preProcessingIntents = flowOf(ViewIntent.Initial),
     ) {
       coVerify(exactly = 1) { getUserUseCase() }
-      coVerify(exactly = 1) { refreshGetUsersUseCase() }
+      coVerify(exactly = 1) { withAnyEffectScope { refreshGetUsersUseCase() } }
     }
   }
 
@@ -161,7 +164,7 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
     runVMTest(
       vmProducer = {
         every { getUserUseCase() } returns flowOf(USERS.right()).delayEach()
-        coEvery { refreshGetUsersUseCase() } returnsWithDelay userError.left()
+        coEvery { withAnyEffectScope { refreshGetUsersUseCase() } } justShiftWithDelay userError
         vm
       },
       intents = flowOf(ViewIntent.Refresh),
@@ -191,7 +194,7 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
       preProcessingIntents = flowOf(ViewIntent.Initial),
     ) {
       coVerify(exactly = 1) { getUserUseCase() }
-      coVerify(exactly = 1) { refreshGetUsersUseCase() }
+      coVerify(exactly = 1) { withAnyEffectScope { refreshGetUsersUseCase() } }
     }
   }
 
@@ -199,13 +202,13 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
   fun test_withRefreshIntent_ignoredWhenIsLoading() {
     runVMTest(
       vmProducer = {
-        coEvery { refreshGetUsersUseCase() } returns Unit.right()
+        coEvery { withAnyEffectScope { refreshGetUsersUseCase() } } returns Unit
         vm
       },
       intents = flowOf(ViewIntent.Refresh),
       expectedStates = listOf(ViewState.initial()).mapRight(),
       expectedEvents = emptyList(),
-    ) { coVerify(exactly = 0) { refreshGetUsersUseCase() } }
+    ) { coVerify(exactly = 0) { withAnyEffectScope { refreshGetUsersUseCase() } } }
   }
 
   @Test
@@ -215,7 +218,7 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
     runVMTest(
       vmProducer = {
         every { getUserUseCase() } returns flowOf(userError.left())
-        coEvery { refreshGetUsersUseCase() } returns Unit.right()
+        coEvery { withAnyEffectScope { refreshGetUsersUseCase() } } returns Unit
         vm
       },
       intents = flowOf(ViewIntent.Refresh),
@@ -231,7 +234,7 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
       preProcessingIntents = flowOf(ViewIntent.Initial),
     ) {
       coVerify(exactly = 1) { getUserUseCase() }
-      coVerify(exactly = 0) { refreshGetUsersUseCase() }
+      coVerify(exactly = 0) { withAnyEffectScope { refreshGetUsersUseCase() } }
     }
   }
 
@@ -338,10 +341,10 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
     runVMTest(
       vmProducer = {
         every { getUserUseCase() } returns usersFlow
-        coEvery { removeUser(any()) } coAnswers {
+        coEvery { withAnyEffectScope { removeUser(any()) } } coAnswers {
           usersFlow.update { either ->
             either.map { users ->
-              users.filter { it.id != firstArg<User>().id }
+              users.filter { it.id != secondArg<User>().id }
             }
           }
           Unit.right()
@@ -383,8 +386,8 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
     ) {
       coVerify(exactly = 1) { getUserUseCase() }
       coVerifySequence {
-        removeUser(user1)
-        removeUser(user2)
+        withAnyEffectScope { removeUser(user1) }
+        withAnyEffectScope { removeUser(user2) }
       }
     }
   }
@@ -398,7 +401,7 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
     runVMTest(
       vmProducer = {
         every { getUserUseCase() } returns flowOf(USERS.right())
-        coEvery { removeUser(any()) } returns userError.left()
+        coEvery { withAnyEffectScope { removeUser(any()) } } justShift userError
         vm
       },
       intents = flowOf(ViewIntent.RemoveUser(item)),
@@ -421,7 +424,7 @@ class MainVMTest : BaseMviViewModelTest<ViewIntent,
       preProcessingIntents = flowOf(ViewIntent.Initial)
     ) {
       coVerify(exactly = 1) { getUserUseCase() }
-      coVerify(exactly = 1) { removeUser(user) }
+      coVerify(exactly = 1) { withAnyEffectScope { removeUser(user) } }
     }
   }
 }
diff --git a/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchVMTest.kt b/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchVMTest.kt
index 9e29b66b..51aeb77a 100644
--- a/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchVMTest.kt
+++ b/feature-search/src/test/java/com/hoc/flowmvi/ui/search/SearchVMTest.kt
@@ -1,15 +1,15 @@
 package com.hoc.flowmvi.ui.search
 
 import androidx.lifecycle.SavedStateHandle
-import arrow.core.left
-import arrow.core.right
 import com.hoc.flowmvi.domain.model.UserError
 import com.hoc.flowmvi.domain.usecase.SearchUsersUseCase
 import com.hoc.flowmvi.mvi_testing.BaseMviViewModelTest
+import com.hoc.flowmvi.mvi_testing.justShiftWithDelay
 import com.hoc.flowmvi.mvi_testing.mapRight
-import com.hoc.flowmvi.mvi_testing.returnsManyWithDelay
 import com.hoc.flowmvi.mvi_testing.returnsWithDelay
 import com.hoc.flowmvi.test_utils.TestAppCoroutineDispatchers
+import com.hoc.flowmvi.test_utils.shift
+import com.hoc.flowmvi.test_utils.withAnyEffectScope
 import com.hoc.flowmvi.ui.search.SearchVM.Companion.SEARCH_DEBOUNCE_DURATION
 import com.hoc081098.flowext.concatWith
 import com.hoc081098.flowext.timer
@@ -60,7 +60,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
   @Test
   fun test_withSearchIntent_debounceSearchQuery() {
     val query = "d"
-    coEvery { searchUsersUseCase(query) } returnsWithDelay USERS.right()
+    coEvery { withAnyEffectScope { searchUsersUseCase(query) } } returnsWithDelay USERS
 
     runVMTest(
       vmProducer = { vm },
@@ -115,7 +115,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
       ).mapRight(),
       expectedEvents = emptyList(),
     ) {
-      coVerify(exactly = 1) { searchUsersUseCase(query) }
+      coVerify(exactly = 1) { withAnyEffectScope { searchUsersUseCase(query) } }
     }
   }
 
@@ -167,7 +167,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
   @Test
   fun test_withSearchIntent_debounceSearchQueryThenRejectBlankAndDistinctUntilChanged() {
     val query = "#query"
-    coEvery { searchUsersUseCase(query) } returnsWithDelay USERS.right()
+    coEvery { withAnyEffectScope { searchUsersUseCase(query) } } returnsWithDelay USERS
 
     runVMTest(
       vmProducer = { vm },
@@ -224,7 +224,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
       ).mapRight(),
       expectedEvents = emptyList(),
     ) {
-      coVerify(exactly = 1) { searchUsersUseCase(query) }
+      coVerify(exactly = 1) { withAnyEffectScope { searchUsersUseCase(query) } }
     }
   }
 
@@ -232,11 +232,11 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
   fun test_withSearchIntent_debounceSearchQueryThenRejectBlankThenDistinctUntilChangedAndCancelledPreviousExecution() {
     val query1 = "#query#1"
     val query2 = "#query#2"
-    coEvery { searchUsersUseCase(query1) } coAnswers {
+    coEvery { withAnyEffectScope { searchUsersUseCase(query1) } } coAnswers {
       repeat(10) { timeout() } // (1) very long... -> cancelled by (2)
-      USERS.right()
+      USERS
     }
-    coEvery { searchUsersUseCase(query2) } returns USERS.right()
+    coEvery { withAnyEffectScope { searchUsersUseCase(query2) } } returns USERS
 
     runVMTest(
       vmProducer = { vm },
@@ -305,8 +305,8 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
       expectedEvents = emptyList(),
     ) {
       coVerifySequence {
-        searchUsersUseCase(query1)
-        searchUsersUseCase(query2)
+        withAnyEffectScope { searchUsersUseCase(query1) }
+        withAnyEffectScope { searchUsersUseCase(query2) }
       }
     }
   }
@@ -314,7 +314,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
   @Test
   fun test_withSearchIntent_returnsUserItemsWithProperLoadingState() {
     val query = "query"
-    coEvery { searchUsersUseCase(query) } returnsWithDelay USERS.right()
+    coEvery { withAnyEffectScope { searchUsersUseCase(query) } } returnsWithDelay USERS
 
     runVMTest(
       vmProducer = { vm },
@@ -348,7 +348,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
       ).mapRight(),
       expectedEvents = emptyList(),
     ) {
-      coVerify(exactly = 1) { searchUsersUseCase(query) }
+      coVerify(exactly = 1) { withAnyEffectScope { searchUsersUseCase(query) } }
     }
   }
 
@@ -356,7 +356,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
   fun test_withSearchIntent_returnsUserErrorWithProperLoadingState() {
     val query = "query"
     val networkError = UserError.NetworkError
-    coEvery { searchUsersUseCase(query) } returnsWithDelay networkError.left()
+    coEvery { withAnyEffectScope { searchUsersUseCase(query) } } justShiftWithDelay networkError
 
     runVMTest(
       vmProducer = { vm },
@@ -392,7 +392,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
         SingleEvent.SearchFailure(networkError)
       ).mapRight(),
     ) {
-      coVerify(exactly = 1) { searchUsersUseCase(query) }
+      coVerify(exactly = 1) { withAnyEffectScope { searchUsersUseCase(query) } }
     }
   }
 
@@ -412,10 +412,17 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
   fun test_withRetryIntentWhenError_returnsUserItemsWithProperLoadingState() {
     val query = "#hoc081098"
     val networkError = UserError.NetworkError
-    coEvery { searchUsersUseCase(query) } returnsManyWithDelay listOf(
-      networkError.left(),
-      USERS.right(),
-    )
+    var count = 0
+    coEvery { withAnyEffectScope { searchUsersUseCase(query) } } coAnswers {
+      when (count++) {
+        0 -> shift(networkError)
+        1 -> {
+          delay(1)
+          USERS
+        }
+        else -> error("Should not reach here!")
+      }
+    }
 
     runVMTest(
       vmProducer = { vm },
@@ -449,7 +456,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
         timeout()
       },
     ) {
-      coVerify(exactly = 2) { searchUsersUseCase(query) }
+      coVerify(exactly = 2) { withAnyEffectScope { searchUsersUseCase(query) } }
     }
   }
 
@@ -457,7 +464,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
   fun test_withRetryIntentWhenError_returnsUserErrorWithProperLoadingState() {
     val query = "#hoc081098"
     val networkError = UserError.NetworkError
-    coEvery { searchUsersUseCase(query) } returnsWithDelay networkError.left()
+    coEvery { withAnyEffectScope { searchUsersUseCase(query) } } justShiftWithDelay networkError
 
     runVMTest(
       vmProducer = { vm },
@@ -493,7 +500,7 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
         timeout()
       },
     ) {
-      coVerify(exactly = 2) { searchUsersUseCase(query) }
+      coVerify(exactly = 2) { withAnyEffectScope { searchUsersUseCase(query) } }
     }
   }
 
@@ -504,17 +511,17 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
     val networkError = UserError.NetworkError
 
     var count = 0
-    coEvery { searchUsersUseCase(query1) } coAnswers {
+    coEvery { withAnyEffectScope { searchUsersUseCase(query1) } } coAnswers {
       when (count++) {
-        0 -> networkError.left()
+        0 -> shift(networkError)
         1 -> {
           repeat(3) { timeout() } // (1) very long ... -> cancelled by (2)
-          USERS.right()
+          USERS
         }
         else -> error("Should not reach here!")
       }
     }
-    coEvery { searchUsersUseCase(query2) } returns USERS.right()
+    coEvery { withAnyEffectScope { searchUsersUseCase(query2) } } returns USERS
 
     runVMTest(
       vmProducer = { vm },
@@ -562,9 +569,9 @@ class SearchVMTest : BaseMviViewModelTest<ViewIntent, ViewState, SingleEvent, Se
       }
     ) {
       coVerifySequence {
-        searchUsersUseCase(query1)
-        searchUsersUseCase(query1)
-        searchUsersUseCase(query2)
+        withAnyEffectScope { searchUsersUseCase(query1) }
+        withAnyEffectScope { searchUsersUseCase(query1) }
+        withAnyEffectScope { searchUsersUseCase(query2) }
       }
     }
   }
diff --git a/mvi/mvi-testing/src/main/java/com/hoc/flowmvi/mvi_testing/BaseMviViewModelTest.kt b/mvi/mvi-testing/src/main/java/com/hoc/flowmvi/mvi_testing/BaseMviViewModelTest.kt
index b2aed025..eed76450 100644
--- a/mvi/mvi-testing/src/main/java/com/hoc/flowmvi/mvi_testing/BaseMviViewModelTest.kt
+++ b/mvi/mvi-testing/src/main/java/com/hoc/flowmvi/mvi_testing/BaseMviViewModelTest.kt
@@ -8,6 +8,7 @@ import com.hoc.flowmvi.mvi_base.MviSingleEvent
 import com.hoc.flowmvi.mvi_base.MviViewModel
 import com.hoc.flowmvi.mvi_base.MviViewState
 import com.hoc.flowmvi.test_utils.TestCoroutineDispatcherRule
+import com.hoc.flowmvi.test_utils.shift
 import io.mockk.MockKAdditionalAnswerScope
 import io.mockk.MockKStubScope
 import io.mockk.clearAllMocks
@@ -21,6 +22,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
@@ -61,12 +63,25 @@ infix fun <T, B> MockKStubScope<T, B>.returnsManyWithDelay(values: List<T>) {
   }
 }
 
+/**
+ * Workaround for [Kotlin/kotlinx.coroutines/issues/3120](https://github.com/Kotlin/kotlinx.coroutines/issues/3120).
+ * TODO(coroutines): https://github.com/Kotlin/kotlinx.coroutines/issues/3120
+ */
+inline infix fun <reified R> MockKStubScope<*, *>.justShiftWithDelay(r: R) {
+  coAnswers {
+    delay(1)
+    shift(r)
+  }
+}
+
 @ExperimentalTime
 @ExperimentalCoroutinesApi
-abstract class BaseMviViewModelTest<I : MviIntent,
+abstract class BaseMviViewModelTest<
+  I : MviIntent,
   S : MviViewState,
   E : MviSingleEvent,
-  VM : MviViewModel<I, S, E>,> {
+  VM : MviViewModel<I, S, E>,
+  > {
   @get:Rule
   val coroutineRule = TestCoroutineDispatcherRule(
     testDispatcher = UnconfinedTestDispatcher(
diff --git a/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt b/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt
index 60c2596d..1ee512bc 100644
--- a/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt
+++ b/test-utils/src/main/java/com/hoc/flowmvi/test_utils/utils.kt
@@ -7,6 +7,7 @@ import arrow.core.getOrHandle
 import arrow.core.identity
 import arrow.core.valueOr
 import com.hoc.flowmvi.core.unit
+import io.mockk.MockKAnswerScope
 import io.mockk.MockKMatcherScope
 import io.mockk.MockKStubScope
 
@@ -33,5 +34,8 @@ inline fun <reified R, RR> withAnyEffectScope(block: EffectScope<R>.() -> RR): R
     block()
   }
 
-inline infix fun <reified R> MockKStubScope<*, *>.thenShift(r: R): Unit =
-  coAnswers { arg<EffectScope<R>>(0).shift(r) }.unit
+inline infix fun <reified R> MockKStubScope<*, *>.justShift(r: R): Unit =
+  coAnswers { shift(r) }.unit
+
+suspend inline infix fun <reified R> MockKAnswerScope<*, *>.shift(r: R): Nothing =
+  arg<EffectScope<R>>(0).shift(r)