Exclude test code from jacoco coverage

open-toast · Mar 25, 2024 · a483988 · a483988
1 parent a0e4407
commit a483988
Show file tree

Hide file tree

Showing 29 changed files with 11 additions and 7 deletions.
diff --git a/tests/base/build.gradle.kts b/tests/base/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
     `kotlin-conventions`
+    `java-test-fixtures`
 }
 
diff --git a/.../com/toasttab/expediter/test/BaseFoo.java → .../com/toasttab/expediter/test/BaseFoo.java b/.../com/toasttab/expediter/test/BaseFoo.java → .../com/toasttab/expediter/test/BaseFoo.java
diff --git a/...va/com/toasttab/expediter/test/Param.java → ...va/com/toasttab/expediter/test/Param.java b/...va/com/toasttab/expediter/test/Param.java → ...va/com/toasttab/expediter/test/Param.java
diff --git a/...m/toasttab/expediter/test/ParamParam.java → ...m/toasttab/expediter/test/ParamParam.java b/...m/toasttab/expediter/test/ParamParam.java → ...m/toasttab/expediter/test/ParamParam.java
diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     `kotlin-conventions`
+    `java-test-fixtures`
 }
 
 configurations.create("lib2") {
@@ -8,18 +9,18 @@ configurations.create("lib2") {
 
 tasks {
     test {
-        val files = configurations.getByName("lib2").files.map { it.path } + sourceSets.main.get().java.classesDirectory.get().asFile.path
+        val files = configurations.getByName("lib2").files.map { it.path } + sourceSets.testFixtures.get().java.classesDirectory.get().asFile.path
 
         systemProperty("test-classpath", files.joinToString(separator = ":"))
 
-        dependsOn("lib2:jar")
+        dependsOn("lib2:testFixturesJar")
     }
 }
 
 dependencies {
-    implementation(projects.tests.lib1)
+    testFixturesImplementation(testFixtures(projects.tests.lib1))
 
-    add("lib2", projects.tests.lib2)
+    add("lib2", testFixtures(projects.tests.lib2))
 
     testImplementation(projects.core)
 }
diff --git a/tests/lib1/build.gradle.kts b/tests/lib1/build.gradle.kts
@@ -1,7 +1,8 @@
 plugins {
     `kotlin-conventions`
+    `java-test-fixtures`
 }
 
 dependencies {
-    api(projects.tests.base)
+    testFixturesApi(testFixtures(projects.tests.base))
 }
diff --git a/...java/com/toasttab/expediter/test/Bar.java → ...java/com/toasttab/expediter/test/Bar.java b/...java/com/toasttab/expediter/test/Bar.java → ...java/com/toasttab/expediter/test/Bar.java
diff --git a/...ava/com/toasttab/expediter/test/Base.java → ...ava/com/toasttab/expediter/test/Base.java b/...ava/com/toasttab/expediter/test/Base.java → ...ava/com/toasttab/expediter/test/Base.java
diff --git a/.../com/toasttab/expediter/test/BaseBar.java → .../com/toasttab/expediter/test/BaseBar.java b/.../com/toasttab/expediter/test/BaseBar.java → .../com/toasttab/expediter/test/BaseBar.java
diff --git a/...com/toasttab/expediter/test/BaseBase.java → ...com/toasttab/expediter/test/BaseBase.java b/...com/toasttab/expediter/test/BaseBase.java → ...com/toasttab/expediter/test/BaseBase.java
diff --git a/...java/com/toasttab/expediter/test/Baz.java → ...java/com/toasttab/expediter/test/Baz.java b/...java/com/toasttab/expediter/test/Baz.java → ...java/com/toasttab/expediter/test/Baz.java
diff --git a/.../java/com/toasttab/expediter/test/Ex.java → .../java/com/toasttab/expediter/test/Ex.java b/.../java/com/toasttab/expediter/test/Ex.java → .../java/com/toasttab/expediter/test/Ex.java
diff --git a/...java/com/toasttab/expediter/test/Foo.java → ...java/com/toasttab/expediter/test/Foo.java b/...java/com/toasttab/expediter/test/Foo.java → ...java/com/toasttab/expediter/test/Foo.java
diff --git a/...a/com/toasttab/expediter/test/Lambda.java → ...a/com/toasttab/expediter/test/Lambda.java b/...a/com/toasttab/expediter/test/Lambda.java → ...a/com/toasttab/expediter/test/Lambda.java
diff --git a/...java/com/toasttab/expediter/test/Var.java → ...java/com/toasttab/expediter/test/Var.java b/...java/com/toasttab/expediter/test/Var.java → ...java/com/toasttab/expediter/test/Var.java
diff --git a/tests/lib2/build.gradle.kts b/tests/lib2/build.gradle.kts
@@ -1,7 +1,8 @@
 plugins {
     `kotlin-conventions`
+    `java-test-fixtures`
 }
 
 dependencies {
-    api(projects.tests.base)
+    testFixturesApi(testFixtures(projects.tests.base))
 }
diff --git a/...java/com/toasttab/expediter/test/Bar.java → ...java/com/toasttab/expediter/test/Bar.java b/...java/com/toasttab/expediter/test/Bar.java → ...java/com/toasttab/expediter/test/Bar.java
diff --git a/...ava/com/toasttab/expediter/test/Base.java → ...ava/com/toasttab/expediter/test/Base.java b/...ava/com/toasttab/expediter/test/Base.java → ...ava/com/toasttab/expediter/test/Base.java
diff --git a/.../com/toasttab/expediter/test/BaseBar.java → .../com/toasttab/expediter/test/BaseBar.java b/.../com/toasttab/expediter/test/BaseBar.java → .../com/toasttab/expediter/test/BaseBar.java
diff --git a/...com/toasttab/expediter/test/BaseBase.java → ...com/toasttab/expediter/test/BaseBase.java b/...com/toasttab/expediter/test/BaseBase.java → ...com/toasttab/expediter/test/BaseBase.java
diff --git a/...java/com/toasttab/expediter/test/Baz.java → ...java/com/toasttab/expediter/test/Baz.java b/...java/com/toasttab/expediter/test/Baz.java → ...java/com/toasttab/expediter/test/Baz.java
diff --git a/...ava/com/toasttab/expediter/test/Dupe.java → ...ava/com/toasttab/expediter/test/Dupe.java b/...ava/com/toasttab/expediter/test/Dupe.java → ...ava/com/toasttab/expediter/test/Dupe.java
diff --git a/...java/com/toasttab/expediter/test/Foo.java → ...java/com/toasttab/expediter/test/Foo.java b/...java/com/toasttab/expediter/test/Foo.java → ...java/com/toasttab/expediter/test/Foo.java
diff --git a/tests/src/test/kotlin/com/toasttab/expediter/test/ExpediterIntegrationTest.kt b/tests/src/test/kotlin/com/toasttab/expediter/test/ExpediterIntegrationTest.kt
@@ -159,7 +159,7 @@ class ExpediterIntegrationTest {
 
             Issue.DuplicateType(
                 "com/toasttab/expediter/test/Dupe",
-                listOf("main", "lib2.jar")
+                listOf("testFixtures", "lib2-test-fixtures.jar")
             ),
 
             Issue.FinalApplicationSuperType(

diff --git a/...ava/com/toasttab/expediter/test/Dupe.java → ...ava/com/toasttab/expediter/test/Dupe.java b/...ava/com/toasttab/expediter/test/Dupe.java → ...ava/com/toasttab/expediter/test/Dupe.java
diff --git a/...oasttab/expediter/test/caller/Caller.java → ...oasttab/expediter/test/caller/Caller.java b/...oasttab/expediter/test/caller/Caller.java → ...oasttab/expediter/test/caller/Caller.java
diff --git a/...expediter/test/caller/CallerNegative.java → ...expediter/test/caller/CallerNegative.java b/...expediter/test/caller/CallerNegative.java → ...expediter/test/caller/CallerNegative.java
diff --git a/...oasttab/expediter/test/caller/Clones.java → ...oasttab/expediter/test/caller/Clones.java b/...oasttab/expediter/test/caller/Clones.java → ...oasttab/expediter/test/caller/Clones.java
diff --git a/...oasttab/expediter/test/caller/VarVar.java → ...oasttab/expediter/test/caller/VarVar.java b/...oasttab/expediter/test/caller/VarVar.java → ...oasttab/expediter/test/caller/VarVar.java