Merge branch 'dev' into feature/dao-test-test

Guri999 · web-flow · commit 15c3aa4ac03e · 2025-01-21T14:14:57.000+09:00
diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml
@@ -1,47 +1,36 @@
 name: Unit Test
-
 on:
   pull_request:
     branches: [ "dev" ]
-
 jobs:
   unit_test:
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
       - name: Get changed files
         id: changed_files
         uses: tj-actions/changed-files@v45
-
       - name: Filter out test files
         id: test_files
         run: |
           echo "Changed files: ${{ steps.changed_files.outputs.all_changed_files }}"
-
           TEST_FILES=$(echo "${{ steps.changed_files.outputs.all_changed_files }}" \
             | tr ' ' '\n' \
             | grep -E '^.+/src/test/(java|kotlin)/.+\.(kt|java)$' || true)
           echo "Filtered by grep: $TEST_FILES"
-
           TEST_FILES=$(echo "$TEST_FILES" \
             | sed -E 's/^(.+)\/src\/test\/(java|kotlin)\/(.+)\.(kt|java)$/\1 \3/' \
             | sed 's/\//./g')
           echo "Processed by sed: $TEST_FILES"
-
           TEST_FILES_SINGLE_LINE=$(echo "$TEST_FILES" | tr '\n' ' ')
           echo "TEST_FILES=$TEST_FILES_SINGLE_LINE" >> $GITHUB_ENV
-
           echo "$TEST_FILES" > test_files.txt
-
           if [ -n "$(cat test_files.txt | xargs)" ]; then
             echo "any_changed=true" >> $GITHUB_ENV
           else
             echo "any_changed=false" >> $GITHUB_ENV
           fi
-
       - name: Debug Changed Files
         run: |
           if [ -f test_files.txt ]; then
@@ -53,35 +42,63 @@ jobs:
           
           # Check the "any_changed" environment variable
           echo "files changed: ${{ env.any_changed }}"
-
       - name: setup JDK
         if: env.any_changed == 'true'
         uses: actions/setup-java@v4
-
         with:
           distribution: 'corretto'
           java-version: '17'
-
       - name: setup Android SDK
         if: env.any_changed == 'true'
         uses: android-actions/setup-android@v3
-
       - name: Run unit tests
         if: env.any_changed == 'true'
         run: |
           chmod +x gradlew
-          cat test_files.txt | while IFS=$'\n' read -r LINE; do
-            MODULE=$(echo "$LINE" | awk '{print $1}')
-            TEST_CLASS=$(echo "$LINE" | awk '{print $2}')
-
-            MODULE=$(echo "$MODULE" | sed 's|\.|:|g')
-
-            echo "MODULE: $MODULE"
-            echo "TEST_CLASS: $TEST_CLASS"
+          while IFS=$'\n' read -r LINE; do
+          
+            # 1) 원본 변수 추출
+            MODULE_RAW=$(echo "$LINE" | awk '{print $1}')      # 예: "core.data"
+            TEST_CLASS_RAW=$(echo "$LINE" | awk '{print $2}')  # 예: "kr.co.data.dummy.DummyInstances"
+            echo "MODULE_RAW: $MODULE_RAW"
+            echo "TEST_CLASS_RAW: $TEST_CLASS_RAW"
+          
+            # 2) Gradle 태스크용 모듈(예: "core.data" -> "core:data")
+            MODULE_GRADLE=$(echo "$MODULE_RAW" | sed 's|\.|:|g')
+          
+            # 3) 파일 경로용 모듈(예: "core.data" -> "core/data")
+            MODULE_PATH=$(echo "$MODULE_RAW" | sed 's|\.|/|g')
+          
+            #    클래스 경로도 마찬가지
+            CLASS_PATH=$(echo "$TEST_CLASS_RAW" | sed 's|\.|/|g')
+          
+            # 4) 실제로 찾을 .kt 파일 경로
+            KT_FILE_JAVA="${MODULE_PATH}/src/test/java/${CLASS_PATH}.kt"
+            KT_FILE_KOTLIN="${MODULE_PATH}/src/test/kotlin/${CLASS_PATH}.kt"
+            echo "KT_FILE_JAVA: $KT_FILE_JAVA"
+            echo "KT_FILE_KOTLIN: $KT_FILE_KOTLIN"
+            if [ -f "$KT_FILE_JAVA" ]; then
+              if ! grep -q '@Test' "$KT_FILE_JAVA"; then
+                echo "No @Test found in $KT_FILE_JAVA. Skipping..."
+                continue
+              fi
+              SELECTED_FILE="$KT_FILE_JAVA"
+            elif [ -f "$KT_FILE_KOTLIN" ]; then
+              if ! grep -q '@Test' "$KT_FILE_KOTLIN"; then
+                echo "No @Test found in $KT_FILE_KOTLIN. Skipping..."
+                continue
+              fi
+              SELECTED_FILE="$KT_FILE_KOTLIN"
+            else
+              echo "No .kt file found in java/kotlin folder. Skipping..."
+              continue
+            fi
+          
+            # 5) @Test가 있는 파일을 찾았다면 Gradle 실행
+            echo "Running: ./gradlew :$MODULE_GRADLE:testDebugUnitTest --tests \"$TEST_CLASS_RAW\""
+            ./gradlew :"$MODULE_GRADLE":testDebugUnitTest --tests "$TEST_CLASS_RAW" --scan || exit 1
+          done < test_files.txt
 
-            echo "Running: ./gradlew :$MODULE:testDebugUnitTest --tests \"$TEST_CLASS\""
-            ./gradlew :$MODULE:testDebugUnitTest --tests "$TEST_CLASS" --scan || exit 1
-          done
 
       - name: Test Result
         uses: EnricoMi/publish-unit-test-result-action@v2
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -4,9 +4,7 @@ plugins {
     alias(libs.plugins.seedocs.library)
 }
 
-android {
-    setNamespace("core.data")
-}
+setNamespace("core.data")
 
 dependencies {
     api(projects.core.model)
diff --git a/core/data/src/main/java/kr/co/data/di/RepositoryModule.kt b/core/data/src/main/java/kr/co/data/di/RepositoryModule.kt
@@ -1,6 +1,6 @@
 package kr.co.data.di
 
-import kr.co.data.mapper.BookmarkMapper
+import kr.co.data.mapper.BookmarkFileMapper
 import kr.co.data.mapper.FileInfoMapper
 import kr.co.data.mapper.RecentFileMapper
 import kr.co.data.repository.BookmarkRepository
@@ -13,7 +13,7 @@ val repositoryModule =
     module {
 
         factory { RecentFileMapper() }
-        factory { BookmarkMapper() }
+        factory { BookmarkFileMapper() }
         factory { FileInfoMapper() }
 
         single<RecentRepository> {
@@ -27,7 +27,7 @@ val repositoryModule =
         single<BookmarkRepository> {
             BookmarkRepositoryImpl(
                 dao = get(),
-                toBookmark = get<BookmarkMapper>(),
+                toBookmark = get<BookmarkFileMapper>(),
                 toFileInfo = get<FileInfoMapper>()
             )
         }
diff --git a/core/data/src/main/java/kr/co/data/mapper/BookmarkFileMapper.kt b/core/data/src/main/java/kr/co/data/mapper/BookmarkFileMapper.kt
@@ -5,7 +5,7 @@ import kr.co.database.model.BookmarkFile
 import kr.co.database.model.FileType
 import kr.co.model.FileInfo
 
-internal class BookmarkMapper : Mapper<FileInfo, BookmarkFile> {
+internal class BookmarkFileMapper : Mapper<FileInfo, BookmarkFile> {
     override fun invoke(from: FileInfo): BookmarkFile =
         BookmarkFile(
             name = from.name,
diff --git a/core/data/src/main/java/kr/co/data/repository/BookmarkRepositoryImpl.kt b/core/data/src/main/java/kr/co/data/repository/BookmarkRepositoryImpl.kt
@@ -2,14 +2,14 @@ package kr.co.data.repository
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import kr.co.data.mapper.BookmarkMapper
+import kr.co.data.mapper.BookmarkFileMapper
 import kr.co.data.mapper.FileInfoMapper
 import kr.co.database.dao.BookmarkFileDao
 import kr.co.model.FileInfo
 
 internal class BookmarkRepositoryImpl(
     private val dao: BookmarkFileDao,
-    private val toBookmark: BookmarkMapper,
+    private val toBookmark: BookmarkFileMapper,
     private val toFileInfo: FileInfoMapper,
 ) : BookmarkRepository {
     override suspend fun insert(bookmarkFile: FileInfo) =
diff --git a/core/data/src/test/kotlin/kr/co/data/dummy/DummyInstances.kt b/core/data/src/test/kotlin/kr/co/data/dummy/DummyInstances.kt
@@ -0,0 +1,40 @@
+package kr.co.data.dummy
+
+import kr.co.database.model.BookmarkFile
+import kr.co.database.model.FileType
+import kr.co.database.model.RecentFile
+import kr.co.model.FileInfo
+import org.junit.Ignore
+import java.time.LocalDateTime
+
+@Ignore("test instance")
+internal object DummyInstances {
+    val PDF_DUMMY = FileInfo(
+        name = "DUMMY.pdf",
+        path = "",
+        type = FileInfo.Type.PDF,
+        isDirectory = false,
+        isHidden = false,
+        size = 0,
+        createdAt = LocalDateTime.of(2024,6,2,2,0),
+        lastModified = LocalDateTime.of(2024,6,2,2,0)
+    )
+
+    val RECENT_DUMMY = RecentFile(
+        name = "DUMMY.pdf",
+        path = "",
+        type = FileType.PDF,
+        size = 0,
+        createdAt = LocalDateTime.of(2024,6,2,2,0),
+        lastModified = LocalDateTime.of(2024,6,2,2,0)
+    )
+
+    val BOOKMARK_DUMMY = BookmarkFile(
+        name = "DUMMY.pdf",
+        path = "",
+        type = FileType.PDF,
+        size = 0,
+        createdAt = LocalDateTime.of(2024,6,2,2,0),
+        lastModified = LocalDateTime.of(2024,6,2,2,0)
+    )
+}
diff --git a/core/data/src/test/kotlin/kr/co/data/mapper/MapperTest.kt b/core/data/src/test/kotlin/kr/co/data/mapper/MapperTest.kt
@@ -0,0 +1,48 @@
+package kr.co.data.mapper
+
+import junit.framework.TestCase.assertEquals
+import kr.co.data.dummy.DummyInstances
+import kr.co.testing.util.assertsEquals
+import org.junit.Test
+
+internal class MapperTest {
+
+    private val bookmarkFileMapper = BookmarkFileMapper()
+    private val recentFileMapper = RecentFileMapper()
+    private val fileInfoMapper = FileInfoMapper()
+
+    @Test
+    fun `Given a file when invoke is called then bookmark file is returned`() {
+        val file = DummyInstances.PDF_DUMMY
+        val bookmarkFile = DummyInstances.BOOKMARK_DUMMY
+
+        val result = bookmarkFileMapper(file)
+
+        assertEquals(bookmarkFile.copy(updatedAt = result.updatedAt), result)
+    }
+
+    @Test
+    fun `Given a file when invoke is called then recent file is returned`() {
+        val file = DummyInstances.PDF_DUMMY
+        val recentFile = DummyInstances.RECENT_DUMMY
+
+        val result = recentFileMapper(file)
+
+        assertEquals(recentFile.copy(updatedAt = result.updatedAt), result)
+    }
+
+    @Test
+    fun `Given a file when invoke is called then file info is returned`() {
+        val bookmarkFile = DummyInstances.BOOKMARK_DUMMY
+        val recentFile = DummyInstances.RECENT_DUMMY
+        val file = DummyInstances.PDF_DUMMY
+
+        val result = fileInfoMapper(bookmarkFile)
+        val result2 = fileInfoMapper(recentFile)
+
+        assertsEquals(
+            file to result,
+            file to result2
+        )
+    }
+}
diff --git a/core/data/src/test/kotlin/kr/co/data/repository/BookmarkRepositoryImplTest.kt b/core/data/src/test/kotlin/kr/co/data/repository/BookmarkRepositoryImplTest.kt
@@ -4,20 +4,19 @@ import io.mockk.MockKAnnotations
 import io.mockk.Runs
 import io.mockk.coEvery
 import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.just
+import io.mockk.verify
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
-import kr.co.data.mapper.BookmarkMapper
+import kr.co.data.dummy.DummyInstances
+import kr.co.data.mapper.BookmarkFileMapper
 import kr.co.data.mapper.FileInfoMapper
 import kr.co.database.dao.BookmarkFileDao
-import kr.co.database.model.BookmarkFile
-import kr.co.database.model.FileType
-import kr.co.model.FileInfo
 import kr.co.testing.util.testWithItem
 import org.junit.Before
 import org.junit.Test
-import java.time.LocalDateTime
 import kotlin.test.assertEquals
 
 internal class BookmarkRepositoryImplTest {
@@ -26,7 +25,7 @@ internal class BookmarkRepositoryImplTest {
     private lateinit var dao: BookmarkFileDao
 
     @MockK
-    private lateinit var toBookmark : BookmarkMapper
+    private lateinit var toBookmark : BookmarkFileMapper
 
     @MockK
     private lateinit var toFileInfo : FileInfoMapper
@@ -41,10 +40,10 @@ internal class BookmarkRepositoryImplTest {
 
     @Test
     fun `Given a file when insert is called then dao insert is called`() = runTest {
-        val file = PDF_DUMMY
-        val bookmarkFile = BOOKMARK_DUMMY
+        val file = DummyInstances.PDF_DUMMY
+        val bookmarkFile = DummyInstances.BOOKMARK_DUMMY
 
-        coEvery { toBookmark(file) } returns bookmarkFile
+        every { toBookmark(file) } returns bookmarkFile
         coEvery { dao.insert(bookmarkFile) } just Runs
 
         repository.insert(file)
@@ -54,51 +53,29 @@ internal class BookmarkRepositoryImplTest {
 
     @Test
     fun `Given a unit when get is called then dao get is called`() = runTest {
-        val bookmarkFiles = listOf(BOOKMARK_DUMMY)
-        val files = listOf(PDF_DUMMY)
+        val bookmarkFiles = listOf(DummyInstances.BOOKMARK_DUMMY)
+        val files = listOf(DummyInstances.PDF_DUMMY)
 
         coEvery { dao.get() } returns flowOf(bookmarkFiles)
-        coEvery { toFileInfo(BOOKMARK_DUMMY) } returns PDF_DUMMY
+        coEvery { toFileInfo(DummyInstances.BOOKMARK_DUMMY) } returns DummyInstances.PDF_DUMMY
 
         repository.get().testWithItem {
             assertEquals(files, this)
         }
 
-        coVerify { dao.get() }
+        verify { dao.get() }
     }
 
     @Test
     fun `Given a file when delete is called then dao delete is called`() = runTest {
-        val file = PDF_DUMMY
-        val bookmarkFile = BOOKMARK_DUMMY
+        val file = DummyInstances.PDF_DUMMY
+        val bookmarkFile = DummyInstances.BOOKMARK_DUMMY
 
-        coEvery { toBookmark(file) } returns bookmarkFile
+        every { toBookmark(file) } returns bookmarkFile
         coEvery { dao.delete(bookmarkFile) } just Runs
 
         repository.delete(file)
 
         coVerify { dao.delete(bookmarkFile) }
     }
-
-    private companion object {
-        val PDF_DUMMY = FileInfo(
-            name = "DUMMY.pdf",
-            path = "",
-            type = FileInfo.Type.PDF,
-            isDirectory = false,
-            isHidden = false,
-            size = 0,
-            createdAt = LocalDateTime.of(2024,6,2,2,0),
-            lastModified = LocalDateTime.of(2024,6,2,2,0)
-        )
-
-        val BOOKMARK_DUMMY = BookmarkFile(
-            name = "DUMMY.pdf",
-            path = "",
-            type = FileType.PDF,
-            size = 0,
-            createdAt = LocalDateTime.of(2024,6,2,2,0),
-            lastModified = LocalDateTime.of(2024,6,2,2,0)
-        )
-    }
 }
diff --git a/core/data/src/test/kotlin/kr/co/data/repository/RecentRepositoryImplTest.kt b/core/data/src/test/kotlin/kr/co/data/repository/RecentRepositoryImplTest.kt

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,7 @@ plugins {`
`4`	`4`	`alias(libs.plugins.seedocs.library)`
`5`	`5`	`}`
`6`	`6`
`7`		`-android {`
`8`		`- setNamespace("core.data")`
`9`		`-}`
	`7`	`+setNamespace("core.data")`
`10`	`8`
`11`	`9`	`dependencies {`
`12`	`10`	`api(projects.core.model)`