Merge pull request #55 from teamtuna/feature/#54

#54 EmotionAddUseCaseTest.kt 에서 테스트 실패 수정
teamtuna · Jul 13, 2021 · 3cfe207 · 3cfe207
2 parents b0f7fba + 88255c0
commit 3cfe207
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/data/src/test/java/com/teamtuna/emotionaldiary/repository/EmotionalRepositoryTest.kt b/data/src/test/java/com/teamtuna/emotionaldiary/repository/EmotionalRepositoryTest.kt
@@ -1,23 +1,21 @@
 package com.teamtuna.emotionaldiary.repository
 
-import com.nhaarman.mockitokotlin2.isA
 import com.nhaarman.mockitokotlin2.whenever
 import com.teamtuna.emotionaldiary.datasource.LocalDataSource
 import com.teamtuna.emotionaldiary.db.EmotionalEntity
 import com.teamtuna.emotionaldiary.entity.DailyEmotion
 import com.teamtuna.emotionaldiary.entity.Emotion
+import com.teamtuna.emotionaldiary.entity.Result
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.junit.jupiter.MockitoExtension
-import com.teamtuna.emotionaldiary.entity.Result
-import org.junit.Assert
-import org.junit.jupiter.api.Assertions.assertTrue
 
 @ExtendWith(MockitoExtension::class)
 internal class EmotionalRepositoryTest {

diff --git a/domain/build.gradle b/domain/build.gradle
@@ -28,4 +28,6 @@ dependencies {
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
 
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
+
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$versions.coroutinesVersion"
 }
diff --git a/domain/src/test/java/com/teamtuna/emotionaldiary/usecase/EmotionAddUseCaseTest.kt b/domain/src/test/java/com/teamtuna/emotionaldiary/usecase/EmotionAddUseCaseTest.kt
@@ -3,6 +3,7 @@ package com.teamtuna.emotionaldiary.usecase
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.whenever
 import com.teamtuna.emotionaldiary.entity.Emotion
+import com.teamtuna.emotionaldiary.entity.Result
 import com.teamtuna.emotionaldiary.repository.EmotionRepository
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
@@ -14,6 +15,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.junit.jupiter.MockitoExtension
+import kotlinx.coroutines.runBlocking
 
 @DisplayName("감정추가에서 ")
 @ExtendWith(MockitoExtension::class)
@@ -23,8 +25,8 @@ internal class EmotionAddUseCaseTest {
     private lateinit var repository: EmotionRepository
 
     @BeforeEach
-    fun setUp() {
-        whenever(repository.add(Emotion.JOY, "기쁨이")).thenReturn(1)
+    fun setUp() = runBlocking {
+        whenever(repository.add(Emotion.JOY, "기쁨이")).thenReturn(Result.Success(1L))
     }
 
     @AfterEach
@@ -33,7 +35,7 @@ internal class EmotionAddUseCaseTest {
 
     @Test
     @DisplayName("기쁨이를 추가 한경우 EmotionalRepository.add가 호출되는지확인")
-    fun addUseCase() {
+    fun addUseCase() = runBlocking {
         //given
         val addUsecase = EmotionAddUseCase(repository)
         //val getUsecase = EmotionalGetUseCase(repository)