Merge pull request #193 from monosoul/fix/coverage

fix(test): coverage report
monosoul · Apr 2, 2024 · e8f16ae · e8f16ae
2 parents 68d0fb2 + e67d389
commit e8f16ae
Show file tree

Hide file tree

Showing 32 changed files with 96 additions and 40 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -70,7 +70,9 @@
   "automerge": true,
   "automergeStrategy": "squash",
   "platformAutomerge": true,
-  "ignoreDeps": [],
+  "ignoreDeps": [
+    "gradle"
+  ],
   "reviewers": [
     "monosoul"
   ]

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,6 @@
+import java.lang.Thread.sleep
+import java.time.Duration
+
 plugins {
     `kotlin-dsl`
     `kotlin-convention`
@@ -59,3 +62,75 @@ dependencies {
     testFixturesApi(libs.mockk)
     testFixturesApi(gradleTestKit())
 }
+
+val functionalTestSuiteName = "functionalTest"
+val extraTestSuiteName = "extraTest"
+
+@Suppress("UnstableApiUsage")
+testing {
+    suites {
+        register<JvmTestSuite>(functionalTestSuiteName) {
+            useJUnitJupiter()
+            dependencies {
+                implementation(project())
+                implementation(testFixtures(project()))
+                runtimeOnly(files(tasks.pluginUnderTestMetadata))
+            }
+
+            targets {
+                all {
+                    testTask.configure {
+                        dependsOn(tasks.pluginUnderTestMetadata)
+                        shouldRunAfter(tasks.test)
+                        extensions.configure<JacocoTaskExtension> {
+                            isEnabled = false
+                        }
+
+                        // workaround for https://github.com/gradle/gradle/issues/16603
+                        doLast {
+                            sleep(
+                                Duration.ofSeconds(2).toMillis(),
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+        register<JvmTestSuite>(extraTestSuiteName) {
+            /**
+             * This test suite is required because Gradle doesn't support Java agents
+             * when using TestKit with configuration cache enabled
+             *
+             * https://docs.gradle.org/7.5.1/userguide/configuration_cache.html#config_cache:not_yet_implemented:testkit_build_with_java_agent
+             */
+
+            useJUnitJupiter()
+            dependencies {
+                implementation(project())
+                implementation(testFixtures(project()))
+                runtimeOnly(files(tasks.pluginUnderTestMetadata))
+            }
+
+            targets {
+                all {
+                    testTask.configure {
+                        dependsOn(tasks.pluginUnderTestMetadata)
+                        shouldRunAfter(tasks.test)
+                        extensions.configure<JacocoTaskExtension> {
+                            isEnabled = false
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+jacocoTestKit {
+    applyTo("${functionalTestSuiteName}RuntimeOnly", tasks.named(functionalTestSuiteName))
+}
+
+tasks.check {
+    dependsOn(tasks.named(functionalTestSuiteName), tasks.named(extraTestSuiteName))
+}
diff --git a/buildSrc/src/main/kotlin/coverage-convention.gradle.kts b/buildSrc/src/main/kotlin/coverage-convention.gradle.kts
@@ -1,27 +1,20 @@
-import java.lang.Thread.sleep
-import java.time.Duration
-
 plugins {
     kotlin("jvm")
     jacoco
     id("pl.droidsonroids.jacoco.testkit")
 }
 
 tasks {
+    val testTasks = tasks.withType<Test>()
     jacocoTestReport {
+        executionData.setFrom(
+            testTasks.map { it.extensions.getByType<JacocoTaskExtension>().destinationFile }
+        )
+
         reports {
             xml.required.set(true)
             html.required.set(false)
         }
-        dependsOn(withType<Test>())
-    }
-
-    withType<Test> {
-        // workaround for https://github.com/gradle/gradle/issues/16603
-        doLast {
-            sleep(
-                Duration.ofSeconds(2).toMillis()
-            )
-        }
+        shouldRunAfter(testTasks)
     }
 }
diff --git a/buildSrc/src/main/kotlin/kotlin-convention.gradle.kts b/buildSrc/src/main/kotlin/kotlin-convention.gradle.kts
@@ -18,6 +18,15 @@ java {
     targetCompatibility = targetJava
 }
 
+testing {
+    suites {
+        @Suppress("UnstableApiUsage")
+        named<JvmTestSuite>("test") {
+            useJUnitJupiter()
+        }
+    }
+}
+
 tasks {
     withType<Test> {
         useJUnitPlatform()

diff --git a/extra-tests/build.gradle.kts b/extra-tests/build.gradle.kts
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,6 +1,6 @@
 rootProject.name = "jooq-gradle-plugin"
 
-include("extra-tests", "artifact-tests")
+include("artifact-tests")
 
 dependencyResolutionManagement {
     versionCatalogs {

diff --git a/...ionCacheJooqDockerPluginFunctionalTest.kt → ...ionCacheJooqDockerPluginFunctionalTest.kt b/...ionCacheJooqDockerPluginFunctionalTest.kt → ...ionCacheJooqDockerPluginFunctionalTest.kt
diff --git a/...osoul/jooq/container/PostgresContainer.kt → ...osoul/jooq/container/PostgresContainer.kt b/...osoul/jooq/container/PostgresContainer.kt → ...osoul/jooq/container/PostgresContainer.kt
diff --git a/...al/CacheJooqDockerPluginFunctionalTest.kt → ...al/CacheJooqDockerPluginFunctionalTest.kt b/...al/CacheJooqDockerPluginFunctionalTest.kt → ...al/CacheJooqDockerPluginFunctionalTest.kt
diff --git a/...rabilityJooqDockerPluginFunctionalTest.kt → ...rabilityJooqDockerPluginFunctionalTest.kt b/...rabilityJooqDockerPluginFunctionalTest.kt → ...rabilityJooqDockerPluginFunctionalTest.kt
@@ -6,7 +6,7 @@ import strikt.api.expect
 import strikt.assertions.isEqualTo
 import strikt.java.exists
 
-class ConfigurabilityJooqDockerPluginFunctionalTest : JooqDockerPluginFunctionalTestBase() {
+class ConfigurabilityJooqDockerPluginFunctionalTest : dev.monosoul.jooq.functional.JooqDockerPluginFunctionalTestBase() {
     @Test
     fun `should generate jooq classes for PostgreSQL db with default config for multiple schemas`() {
         // given

diff --git a/...oryTableJooqDockerPluginFunctionalTest.kt → ...oryTableJooqDockerPluginFunctionalTest.kt b/...oryTableJooqDockerPluginFunctionalTest.kt → ...oryTableJooqDockerPluginFunctionalTest.kt
diff --git a/...DatabaseJooqDockerPluginFunctionalTest.kt → ...DatabaseJooqDockerPluginFunctionalTest.kt b/...DatabaseJooqDockerPluginFunctionalTest.kt → ...DatabaseJooqDockerPluginFunctionalTest.kt
diff --git a/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt b/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt
diff --git a/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt b/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt
diff --git a/...ForMySqlJooqDockerPluginFunctionalTest.kt → ...ForMySqlJooqDockerPluginFunctionalTest.kt b/...ForMySqlJooqDockerPluginFunctionalTest.kt → ...ForMySqlJooqDockerPluginFunctionalTest.kt
diff --git a/...ldscriptJooqDockerPluginFunctionalTest.kt → ...ldscriptJooqDockerPluginFunctionalTest.kt b/...ldscriptJooqDockerPluginFunctionalTest.kt → ...ldscriptJooqDockerPluginFunctionalTest.kt
diff --git a/...ueHolderJooqDockerPluginFunctionalTest.kt → ...ueHolderJooqDockerPluginFunctionalTest.kt b/...ueHolderJooqDockerPluginFunctionalTest.kt → ...ueHolderJooqDockerPluginFunctionalTest.kt
diff --git a/...edConfigJooqDockerPluginFunctionalTest.kt → ...edConfigJooqDockerPluginFunctionalTest.kt b/...edConfigJooqDockerPluginFunctionalTest.kt → ...edConfigJooqDockerPluginFunctionalTest.kt
diff --git a/...onal/JavaBasedMigrationsFunctionalTest.kt → ...onal/JavaBasedMigrationsFunctionalTest.kt b/...onal/JavaBasedMigrationsFunctionalTest.kt → ...onal/JavaBasedMigrationsFunctionalTest.kt
diff --git a/...nal/JooqDockerPluginFunctionalTestBase.kt → ...nal/JooqDockerPluginFunctionalTestBase.kt b/...nal/JooqDockerPluginFunctionalTestBase.kt → ...nal/JooqDockerPluginFunctionalTestBase.kt
diff --git a/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt b/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt
diff --git a/...atabasesJooqDockerPluginFunctionalTest.kt → ...atabasesJooqDockerPluginFunctionalTest.kt b/...atabasesJooqDockerPluginFunctionalTest.kt → ...atabasesJooqDockerPluginFunctionalTest.kt
diff --git a/.../functional/NoMigrationsFunctionalTest.kt → .../functional/NoMigrationsFunctionalTest.kt b/.../functional/NoMigrationsFunctionalTest.kt → .../functional/NoMigrationsFunctionalTest.kt
diff --git a/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt b/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt
diff --git a/...hCommandJooqDockerPluginFunctionalTest.kt → ...hCommandJooqDockerPluginFunctionalTest.kt b/...hCommandJooqDockerPluginFunctionalTest.kt → ...hCommandJooqDockerPluginFunctionalTest.kt
diff --git a/...aVersionJooqDockerPluginFunctionalTest.kt → ...aVersionJooqDockerPluginFunctionalTest.kt b/...aVersionJooqDockerPluginFunctionalTest.kt → ...aVersionJooqDockerPluginFunctionalTest.kt
diff --git a/...al/SmokeJooqDockerPluginFunctionalTest.kt → ...al/SmokeJooqDockerPluginFunctionalTest.kt b/...al/SmokeJooqDockerPluginFunctionalTest.kt → ...al/SmokeJooqDockerPluginFunctionalTest.kt
diff --git a/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt b/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt
diff --git a/...teChecksJooqDockerPluginFunctionalTest.kt → ...teChecksJooqDockerPluginFunctionalTest.kt b/...teChecksJooqDockerPluginFunctionalTest.kt → ...teChecksJooqDockerPluginFunctionalTest.kt
diff --git a/...edConfigJooqDockerPluginFunctionalTest.kt → ...edConfigJooqDockerPluginFunctionalTest.kt b/...edConfigJooqDockerPluginFunctionalTest.kt → ...edConfigJooqDockerPluginFunctionalTest.kt
diff --git a/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt b/...gurationJooqDockerPluginFunctionalTest.kt → ...gurationJooqDockerPluginFunctionalTest.kt