From 8bae2da14ab03e91659fa9383b4fbd89e8817cc1 Mon Sep 17 00:00:00 2001
From: Hanbin Lee <lhb1025@gmail.com>
Date: Wed, 25 Jan 2023 02:02:58 +0900
Subject: [PATCH] =?UTF-8?q?[#31]=20feat:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20colorMode=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- buildSrc plugin 내용 클래스 패키지 분리
- colorMode 적용(추후 profile에 따라 처리 필요)
---
 Jenkinsfile-service                           |  2 +-
 build.gradle.kts                              |  9 +++----
 .../kotlin/plugin/BuildOperationService.kt    |  5 +++-
 .../main/kotlin/task/test/TestContainer.kt    |  8 +++++++
 .../test/TestLoggingUtils.kt}                 | 24 +++++++++----------
 .../{plugin => task/test}/TestSummary.kt      |  2 +-
 6 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/task/test/TestContainer.kt
 rename buildSrc/src/main/kotlin/{plugin/TestContainer.kt => task/test/TestLoggingUtils.kt} (68%)
 rename buildSrc/src/main/kotlin/{plugin => task/test}/TestSummary.kt (97%)

diff --git a/Jenkinsfile-service b/Jenkinsfile-service
index 238e7b2..2797aad 100644
--- a/Jenkinsfile-service
+++ b/Jenkinsfile-service
@@ -19,7 +19,7 @@ pipeline {
 
         stage('Test') {
             steps {
-                sh './gradlew clean :dongne-service-api:test --stacktrace'
+                sh './gradlew clean :dongne-service-api:test'
             }
         }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 7fe50cd..64fb392 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,8 +3,9 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.bundling.BootJar
 import plugin.BuildLifecyclePlugin
-import plugin.TestContainer
-import plugin.TestSummary
+import task.test.TestContainer
+import task.test.TestLoggingUtils
+import task.test.TestSummary
 
 val bootJar: BootJar by tasks
 bootJar.enabled = false
@@ -99,7 +100,7 @@ subprojects {
             showStackTraces = true
         }
 
-        ignoreFailures = true
+//        ignoreFailures = true
 
         addTestListener(object : TestListener {
             override fun beforeSuite(desc: TestDescriptor) {}
@@ -119,7 +120,7 @@ subprojects {
             override fun beforeTest(desc: TestDescriptor) {}
             // handling after each test finished
             override fun afterTest(desc: TestDescriptor, result: TestResult) {
-                TestContainer.printEachResult(desc, result)
+                TestLoggingUtils.printEachResult(desc, result)
             }
         })
     }
diff --git a/buildSrc/src/main/kotlin/plugin/BuildOperationService.kt b/buildSrc/src/main/kotlin/plugin/BuildOperationService.kt
index 027409f..7c4edb4 100644
--- a/buildSrc/src/main/kotlin/plugin/BuildOperationService.kt
+++ b/buildSrc/src/main/kotlin/plugin/BuildOperationService.kt
@@ -5,6 +5,8 @@ import org.gradle.api.services.BuildServiceParameters
 import org.gradle.tooling.events.FinishEvent
 import org.gradle.tooling.events.OperationCompletionListener
 import org.gradle.tooling.events.task.TaskFinishEvent
+import task.test.TestContainer
+import task.test.TestLoggingUtils
 
 abstract class BuildOperationService : BuildService<BuildOperationService.Params>, OperationCompletionListener {
     interface Params : BuildServiceParameters {
@@ -17,7 +19,8 @@ abstract class BuildOperationService : BuildService<BuildOperationService.Params
         }
 
         if (event.descriptor.taskPath == parameters.lastTaskPath) {
-            TestContainer.printTotalResult(TestContainer.testResults)
+            TestLoggingUtils.printTotalResult(TestContainer.testResults)
+            TestContainer.testResults = null
         }
     }
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/task/test/TestContainer.kt b/buildSrc/src/main/kotlin/task/test/TestContainer.kt
new file mode 100644
index 0000000..6520003
--- /dev/null
+++ b/buildSrc/src/main/kotlin/task/test/TestContainer.kt
@@ -0,0 +1,8 @@
+package task.test
+
+class TestContainer {
+    companion object {
+        var testResults: TestSummary? = null
+        const val colorMode: Boolean = false
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/plugin/TestContainer.kt b/buildSrc/src/main/kotlin/task/test/TestLoggingUtils.kt
similarity index 68%
rename from buildSrc/src/main/kotlin/plugin/TestContainer.kt
rename to buildSrc/src/main/kotlin/task/test/TestLoggingUtils.kt
index 93cd0f1..7e604ba 100644
--- a/buildSrc/src/main/kotlin/plugin/TestContainer.kt
+++ b/buildSrc/src/main/kotlin/task/test/TestLoggingUtils.kt
@@ -1,13 +1,10 @@
-package plugin
+package task.test
 
 import org.gradle.api.tasks.testing.TestDescriptor
 import org.gradle.api.tasks.testing.TestResult
-import org.gradle.api.tasks.testing.TestResult.*
 
-class TestContainer {
+class TestLoggingUtils {
     companion object {
-        var testResults: TestSummary? = null
-
         const val ANSI_RESET = "\u001B[0m"
         const val ANSI_GREEN = "\u001B[32m"
         const val ANSI_RED = "\u001B[31m"
@@ -23,12 +20,11 @@ class TestContainer {
                 |${
                     summary.toLogList().joinToString("│\n│", "│", "│") {
                         val coloredResult = colorResultType(summary.result.resultType)
-                        val str = "$it${" ".repeat(maxLength - it.length)}"
+                        "$it${" ".repeat(maxLength - it.length)}"
                             .replace(
                                 oldValue = coloredResult.first.toString(),
                                 newValue = coloredResult.second
                             )
-                        str
                     }
                 }
                 |└${"─".repeat(maxLength)}┘
@@ -37,18 +33,22 @@ class TestContainer {
         }
 
         fun printEachResult(desc: TestDescriptor, result: TestResult) {
-            println("[${desc.className}] ${desc.displayName} result: ${colorResultType(result.resultType).second}")
+            println("[${desc.className}] ${desc.displayName} >> result: ${colorResultType(result.resultType).second}")
         }
 
-        fun colorResultType(resultType: ResultType): Pair<ResultType, String> {
+        fun colorResultType(resultType: TestResult.ResultType): Pair<TestResult.ResultType, String> {
+            if (TestContainer.colorMode.not()) {
+                return resultType to "${resultType}"
+            }
+
             val color = when (resultType) {
-                ResultType.SUCCESS -> ANSI_GREEN
-                ResultType.FAILURE -> ANSI_RED
+                TestResult.ResultType.SUCCESS -> ANSI_GREEN
+                TestResult.ResultType.FAILURE -> ANSI_RED
                 else -> ""
             }
 
             return resultType to if (color.isNotEmpty()) {
-                "${color}${resultType}${ANSI_RESET}"
+                "${color}${resultType}$ANSI_RESET"
             } else "${resultType}"
         }
     }
diff --git a/buildSrc/src/main/kotlin/plugin/TestSummary.kt b/buildSrc/src/main/kotlin/task/test/TestSummary.kt
similarity index 97%
rename from buildSrc/src/main/kotlin/plugin/TestSummary.kt
rename to buildSrc/src/main/kotlin/task/test/TestSummary.kt
index 8efab7c..9db03a0 100644
--- a/buildSrc/src/main/kotlin/plugin/TestSummary.kt
+++ b/buildSrc/src/main/kotlin/task/test/TestSummary.kt
@@ -1,4 +1,4 @@
-package plugin
+package task.test
 
 import org.gradle.api.tasks.testing.TestResult