Add conventions config

ExoQuery · Sep 11, 2024 · b33734b · b33734b
1 parent 594aa5c
commit b33734b
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 55 deletions.
diff --git a/build-logic/src/main/kotlin/conventions.gradle.kts b/build-logic/src/main/kotlin/conventions.gradle.kts
@@ -15,58 +15,58 @@ version = "1.9.22-0.3.0"
 check("$version".isNotBlank() && version != "unspecified")
     { "invalid version $version" }
 
-//tasks.withType<Test> {
-//    testLogging {
-//        lifecycle {
-//            events = mutableSetOf(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED)
-//            exceptionFormat = TestExceptionFormat.FULL
-//
-//            showExceptions = true
-//            showCauses = true
-//            showStackTraces = false
-//            showStandardStreams = false
-//        }
-//        info.events = lifecycle.events
-//        info.exceptionFormat = lifecycle.exceptionFormat
-//    }
-//
-//    val failedTests = mutableListOf<TestDescriptor>()
-//    val skippedTests = mutableListOf<TestDescriptor>()
-//
-//    addTestListener(object : TestListener {
-//        override fun beforeSuite(suite: TestDescriptor) {}
-//
-//        override fun beforeTest(testDescriptor: TestDescriptor) {}
-//
-//        override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) {
-//            when (result.resultType) {
-//                TestResult.ResultType.FAILURE -> failedTests.add(testDescriptor)
-//                TestResult.ResultType.SKIPPED -> skippedTests.add(testDescriptor)
-//                else -> Unit
-//            }
-//        }
-//
-//        override fun afterSuite(suite: TestDescriptor, result: TestResult) {
-//            if (suite.parent == null) {
-//                logger.lifecycle("################ Summary::Start ################")
-//                logger.lifecycle("Test result: ${result.resultType}")
-//                logger.lifecycle(
-//                    "Test summary: ${result.testCount} tests, " +
-//                      "${result.successfulTestCount} succeeded, " +
-//                      "${result.failedTestCount} failed, " +
-//                      "${result.skippedTestCount} skipped")
-//                failedTests.takeIf { it.isNotEmpty() }?.prefixedSummary("\tFailed Tests")
-//                skippedTests.takeIf { it.isNotEmpty() }?.prefixedSummary("\tSkipped Tests:")
-//                logger.lifecycle("################ Summary::End ##################")
-//            }
-//        }
-//
-//        private infix fun List<TestDescriptor>.prefixedSummary(subject: String) {
-//            logger.lifecycle(subject)
-//            forEach { test -> logger.lifecycle("\t\t${test.displayName()}") }
-//        }
-//
-//        private fun TestDescriptor.displayName() = parent?.let { "${it.name} - $name" } ?: "$name"
-//
-//    })
-//}
+tasks.withType<Test> {
+    testLogging {
+        lifecycle {
+            events = mutableSetOf(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED)
+            exceptionFormat = TestExceptionFormat.FULL
+
+            showExceptions = true
+            showCauses = true
+            showStackTraces = false
+            showStandardStreams = false
+        }
+        info.events = lifecycle.events
+        info.exceptionFormat = lifecycle.exceptionFormat
+    }
+
+    val failedTests = mutableListOf<TestDescriptor>()
+    val skippedTests = mutableListOf<TestDescriptor>()
+
+    addTestListener(object : TestListener {
+        override fun beforeSuite(suite: TestDescriptor) {}
+
+        override fun beforeTest(testDescriptor: TestDescriptor) {}
+
+        override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) {
+            when (result.resultType) {
+                TestResult.ResultType.FAILURE -> failedTests.add(testDescriptor)
+                TestResult.ResultType.SKIPPED -> skippedTests.add(testDescriptor)
+                else -> Unit
+            }
+        }
+
+        override fun afterSuite(suite: TestDescriptor, result: TestResult) {
+            if (suite.parent == null) {
+                logger.lifecycle("################ Summary::Start ################")
+                logger.lifecycle("Test result: ${result.resultType}")
+                logger.lifecycle(
+                    "Test summary: ${result.testCount} tests, " +
+                      "${result.successfulTestCount} succeeded, " +
+                      "${result.failedTestCount} failed, " +
+                      "${result.skippedTestCount} skipped")
+                failedTests.takeIf { it.isNotEmpty() }?.prefixedSummary("\tFailed Tests")
+                skippedTests.takeIf { it.isNotEmpty() }?.prefixedSummary("\tSkipped Tests:")
+                logger.lifecycle("################ Summary::End ##################")
+            }
+        }
+
+        private infix fun List<TestDescriptor>.prefixedSummary(subject: String) {
+            logger.lifecycle(subject)
+            forEach { test -> logger.lifecycle("\t\t${test.displayName()}") }
+        }
+
+        private fun TestDescriptor.displayName() = parent?.let { "${it.name} - $name" } ?: "$name"
+
+    })
+}
diff --git a/terpal-sql-android/build.gradle.kts b/terpal-sql-android/build.gradle.kts
@@ -5,6 +5,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
+  id("conventions")
   kotlin("multiplatform")
   id("com.android.library")
   id("io.exoquery.terpal-plugin") version "1.9.22-1.0.0-RC3"