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, OperationCompletionListener { interface Params : BuildServiceParameters { @@ -17,7 +19,8 @@ abstract class BuildOperationService : BuildService> result: ${colorResultType(result.resultType).second}") } - fun colorResultType(resultType: ResultType): Pair { + fun colorResultType(resultType: TestResult.ResultType): Pair { + 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