Merge pull request #207 from swm-standard/seyeon/swm-170

Test: jacoco test coverage에 맞게 테스트 코드 작성

.github/workflows/develop-ci.yml

@@ -34,7 +34,7 @@ jobs:
               run: chmod +x gradlew
 
             - name: Test with Gradle
-              run: ./gradlew clean build test
+              run: ./gradlew clean build jacocoTestReport
 
             - name: Publish Unit Test Results
               uses: EnricoMi/publish-unit-test-result-action@v1

build.gradle.kts

@@ -65,6 +65,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.9.0-RC")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
+    testImplementation("com.navercorp.fixturemonkey:fixture-monkey-kotlin:1.0.23")
 
     // querydsl
     implementation("com.querydsl:querydsl-jpa:5.0.0:jakarta")
@@ -90,7 +91,6 @@ kotlin {
 
 tasks.withType<Test> {
     useJUnitPlatform()
-    finalizedBy("jacocoTestReport")
 }
 
 tasks.test {
@@ -160,6 +160,7 @@ tasks.jacocoTestReport {
             "**/repository/*",
             "**/common/*",
             "**/*PhoteApplication*",
+            "**/entity/*RefreshToken*",
         ) + qDomains
 
     classDirectories.setFrom(
@@ -179,13 +180,13 @@ tasks.jacocoTestCoverageVerification {
             limit {
                 counter = "BRANCH"
                 value = "COVEREDRATIO"
-                minimum = 0.00.toBigDecimal()
+                minimum = 0.50.toBigDecimal()
             }
 
             limit {
                 counter = "METHOD"
                 value = "COVEREDRATIO"
-                minimum = 0.00.toBigDecimal()
+                minimum = 0.40.toBigDecimal()
             }
 
             val qDomains = emptyList<String>().toMutableList()
@@ -204,6 +205,7 @@ tasks.jacocoTestCoverageVerification {
                     "**.repository.*",
                     "**.common.*",
                     "**.*PhoteApplication*",
+                    "**.entity.*RefreshToken*",
                 ) + qDomains
         }
     }

src/main/kotlin/com/swm_standard/phote/common/module/Qualifier.kt

@@ -0,0 +1,8 @@
+package com.swm_standard.phote.common.module
+
+class Qualifier {
+    @MustBeDocumented
+    @Retention(AnnotationRetention.RUNTIME)
+    @Target(AnnotationTarget.TYPE, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER)
+    annotation class Generated
+}

src/main/kotlin/com/swm_standard/phote/entity/QuestionSet.kt

@@ -33,7 +33,7 @@ data class QuestionSet(
     }
 
     companion object {
-        fun createSequence(
+        fun createQuestionSet(
             question: Question,
             workbook: Workbook,
             nextSequence: Int,

src/main/kotlin/com/swm_standard/phote/service/WorkbookService.kt

@@ -237,7 +237,7 @@ class WorkbookService(
     ): Int {
         if (!questionSetRepository.existsByQuestionIdAndWorkbookId(question.id, workbook.id)
         ) {
-            questionSetRepository.save(QuestionSet.createSequence(question, workbook, sequence))
+            questionSetRepository.save(QuestionSet.createQuestionSet(question, workbook, sequence))
             return sequence + 1
         }
 

src/test/kotlin/com/swm_standard/phote/entity/AnswerTest.kt

@@ -1,10 +1,19 @@
 package com.swm_standard.phote.entity
 
-import org.junit.jupiter.api.Assertions
+import com.navercorp.fixturemonkey.FixtureMonkey
+import com.navercorp.fixturemonkey.kotlin.KotlinPlugin
+import com.navercorp.fixturemonkey.kotlin.giveMeOne
+import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Test
 import java.util.UUID
 
 class AnswerTest {
+    private val fixtureMonkey: FixtureMonkey =
+        FixtureMonkey
+            .builder()
+            .plugin(KotlinPlugin())
+            .build()
+
     @Test
     fun `문제가 객관식이면 정오답 체크한다`() {
         val category = Category.MULTIPLE
@@ -14,29 +23,41 @@ class AnswerTest {
 
         answer.checkMultipleAnswer()
 
-        Assertions.assertEquals(submittedAnswer == correctAnswer, answer.isCorrect)
-        Assertions.assertFalse(answer.isCorrect)
+        Assertions.assertThat(submittedAnswer == correctAnswer).isEqualTo(answer.isCorrect)
+        Assertions.assertThat(answer.isCorrect).isFalse()
+    }
+
+    @Test
+    fun `제출한 답안을 생성한다`() {
+        val exam = createExam()
+        val submittedAnswer = "1"
+        val question = createQuestion(answer = submittedAnswer)
+        val sequence = 2
+
+        val createAnswer =
+            Answer.createAnswer(
+                question = question,
+                exam = exam,
+                submittedAnswer = submittedAnswer,
+                sequence = sequence,
+            )
+
+        Assertions.assertThat(createAnswer.submittedAnswer).isEqualTo(submittedAnswer)
+        Assertions.assertThat(createAnswer.exam).isEqualTo(exam)
+        Assertions.assertThat(createAnswer.sequence).isEqualTo(sequence)
     }
 
     fun createWorkbook(): Workbook =
         Workbook(
             title = "hinc",
             description = null,
-            member = createMember(),
+            member = fixtureMonkey.giveMeOne(),
             emoji = "📚",
         )
 
-    fun createMember(): Member =
-        Member(
-            name = "Mayra Payne",
-            email = "[email protected]",
-            image = "dicant",
-            provider = Provider.APPLE,
-        )
-
     fun createExam() =
         Exam(
-            member = createMember(),
+            member = fixtureMonkey.giveMeOne(),
             workbook = createWorkbook(),
             sequence = 4282,
             time = 40,
@@ -69,4 +90,24 @@ class AnswerTest {
         submittedAnswer = submittedAnswer,
         sequence = 2017,
     )
+
+    private fun createQuestion(answer: String) =
+        Question(
+            id = UUID.randomUUID(),
+            member =
+            Member(
+                name = "Charmaine Joseph",
+                email = "[email protected]",
+                image = "maiorum",
+                provider = Provider.APPLE,
+            ),
+            statement = "Missouri",
+            options = null,
+            image = null,
+            answer = answer,
+            category = Category.MULTIPLE,
+            questionSet = listOf(),
+            tags = mutableListOf(),
+            memo = null,
+        )
 }

src/test/kotlin/com/swm_standard/phote/entity/ExamTest.kt

@@ -63,7 +63,7 @@ class ExamTest {
         val exam = Exam.createExam(member, workbook, sequence, time)
 
         Assertions.assertThat(exam.workbook).isEqualTo(workbook)
-        Assertions.assertThat(exam.member).isEqualTo(member)
+        Assertions.assertThat(exam.member.name).isEqualTo(member.name)
         Assertions.assertThat(exam.sequence).isEqualTo(sequence)
     }
 

src/test/kotlin/com/swm_standard/phote/entity/QuestionSetTest.kt

@@ -0,0 +1,52 @@
+package com.swm_standard.phote.entity
+
+import com.navercorp.fixturemonkey.FixtureMonkey
+import com.navercorp.fixturemonkey.api.introspector.ConstructorPropertiesArbitraryIntrospector
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class QuestionSetTest {
+    private val fixtureMonkey: FixtureMonkey =
+        FixtureMonkey
+            .builder()
+            .objectIntrospector(ConstructorPropertiesArbitraryIntrospector.INSTANCE)
+            .build()
+
+    @Test
+    fun `questionSet의 순서를 변경하는데 성공한다`() {
+        val questionSet = fixtureMonkey.giveMeOne(QuestionSet::class.java)
+        val newSequence = 4
+
+        questionSet.updateSequence(newSequence)
+
+        assertEquals(newSequence, questionSet.sequence)
+    }
+
+    @Test
+    fun `questionSet을 생성하는데 성공한다`() {
+        val question = createQuestion()
+        val workbook = fixtureMonkey.giveMeOne(Workbook::class.java)
+        val newSequence = 1
+
+        val questionSet =
+            QuestionSet.createQuestionSet(
+                question = question,
+                workbook = workbook,
+                nextSequence = newSequence,
+            )
+
+        assertEquals(newSequence, questionSet.sequence)
+        assertEquals(workbook, questionSet.workbook)
+        assertEquals(question, questionSet.question)
+    }
+
+    private fun createQuestion(): Question =
+        Question(
+            member = Member("phote", "[email protected]", "image", Provider.KAKAO),
+            statement = "모든 각이 동일한 삼각형은?",
+            image = "http://example.com/image.jpg",
+            answer = "정삼각형",
+            category = Category.ESSAY,
+            memo = "삼각형 내각의 합은 180도이다.",
+        )
+}

src/test/kotlin/com/swm_standard/phote/entity/QuestionTest.kt

@@ -2,10 +2,20 @@ package com.swm_standard.phote.entity
 
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.navercorp.fixturemonkey.FixtureMonkey
+import com.navercorp.fixturemonkey.kotlin.KotlinPlugin
+import com.navercorp.fixturemonkey.kotlin.giveMeOne
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
+import java.util.UUID
 
 class QuestionTest {
+    private val fixtureMonkey: FixtureMonkey =
+        FixtureMonkey
+            .builder()
+            .plugin(KotlinPlugin())
+            .build()
+
     private fun createQuestion(): Question {
         val objectMapper = ObjectMapper()
         val jsonString = """
@@ -27,6 +37,32 @@ class QuestionTest {
             answer = "1",
             category = Category.MULTIPLE,
             memo = "삼각형은 꼭짓점이 3개다",
+            tags =
+            mutableListOf(
+                Tag(
+                    id = 1,
+                    name = "수학",
+                    question =
+                    Question(
+                        id = UUID.randomUUID(),
+                        member =
+                        Member(
+                            name = "Luella Kline",
+                            email = "[email protected]",
+                            image = "et",
+                            provider = Provider.APPLE,
+                        ),
+                        statement = "Louisiana",
+                        options = null,
+                        image = null,
+                        answer = "hac",
+                        category = Category.MULTIPLE,
+                        questionSet = listOf(),
+                        tags = mutableListOf(),
+                        memo = null,
+                    ),
+                ),
+            ),
         )
     }
 
@@ -42,4 +78,19 @@ class QuestionTest {
         val expectedList = listOf("삼각형", "사각형", "마름모", "평행사변형", "원")
         assertEquals(expectedList, deserializedOptions)
     }
+
+    @Test
+    fun `공유받은 문제를 복사해서 저장한다`() {
+        val questions = listOf(createQuestion(), createQuestion(), createQuestion())
+        // val questions = fixtureMonkey.giveMeBuilder<Question>().size(Question::tags, 0).sampleList(5)
+        val member: Member = fixtureMonkey.giveMeOne()
+
+        val sharedQuestions = Question.createSharedQuestions(questions, member)
+
+        assertEquals(sharedQuestions.size, questions.size)
+        assertEquals(sharedQuestions[0].member, member)
+        assertEquals(sharedQuestions[2].answer, questions[2].answer)
+        assertEquals(sharedQuestions[1].tags[0].name, questions[1].tags[0].name)
+        assertEquals(sharedQuestions[1].tags[0].id, questions[1].tags[0].id)
+    }
 }

src/test/kotlin/com/swm_standard/phote/entity/WorkbookTest.kt

@@ -14,6 +14,7 @@ class WorkbookTest {
 
         Assertions.assertThat(workbook.title).isEqualTo(testTitle)
         Assertions.assertThat(workbook.emoji).isEqualTo("➗")
+        Assertions.assertThat(workbook.member.email).isEqualTo(member.email)
     }
 
     @Test