Implemented ability to specify instrumentation include filter

Resolves #673

PR #681

kover-gradle-plugin/api/kover-gradle-plugin.api

@@ -143,6 +143,7 @@ public abstract interface class kotlinx/kover/gradle/plugin/dsl/KoverProjectInst
 	public abstract fun getDisabledForAll ()Lorg/gradle/api/provider/Property;
 	public abstract fun getDisabledForTestTasks ()Lorg/gradle/api/provider/SetProperty;
 	public abstract fun getExcludedClasses ()Lorg/gradle/api/provider/SetProperty;
+	public abstract fun getIncludedClasses ()Lorg/gradle/api/provider/SetProperty;
 }
 
 public abstract interface class kotlinx/kover/gradle/plugin/dsl/KoverReportFilter {

kover-gradle-plugin/src/functionalTest/kotlin/kotlinx/kover/gradle/plugin/test/functional/cases/InstrumentationFilteringTests.kt

@@ -3,7 +3,6 @@
  */
 package kotlinx.kover.gradle.plugin.test.functional.cases
 
-import kotlinx.kover.gradle.plugin.test.functional.framework.checker.defaultTestTaskName
 import kotlinx.kover.gradle.plugin.test.functional.framework.configurator.*
 import kotlinx.kover.gradle.plugin.test.functional.framework.starter.*
 
@@ -31,6 +30,44 @@ internal class InstrumentationFilteringTests {
         }
     }
 
+    @SlicedGeneratedTest(all = true)
+    fun BuildConfigurator.testInclude() {
+        addProjectWithKover {
+            sourcesFrom("simple")
+
+            kover {
+                currentProject {
+                    instrumentation {
+                        includedClasses.add("*.ExampleClass")
+                    }
+                }
+            }
+        }
+    }
+
+    @SlicedGeneratedTest(all = true)
+    fun BuildConfigurator.testMixed() {
+        addProjectWithKover {
+            sourcesFrom("simple")
+
+            kover {
+                currentProject {
+                    instrumentation {
+                        includedClasses.add("*Class")
+                        excludedClasses.add("*.SecondClass")
+                    }
+                }
+            }
+        }
+
+        run("build", "koverXmlReport") {
+            xmlReport {
+                classCounter("org.jetbrains.ExampleClass").assertCovered()
+                classCounter("org.jetbrains.SecondClass").assertFullyMissed()
+            }
+        }
+    }
+
     @SlicedGeneratedTest(allLanguages = true)
     fun BuildConfigurator.testDisableAll() {
         addProjectWithKover {

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/KoverMerge.kt

@@ -106,6 +106,7 @@ private fun KoverProjectInstrumentation.wrap(project: Project): KoverMergingInst
         override val disabledForAll: Property<Boolean> = this@wrap.disabledForAll
         override val disabledForTestTasks: SetProperty<String> = this@wrap.disabledForTestTasks
         override val excludedClasses: SetProperty<String> = this@wrap.excludedClasses
+        override val includedClasses: SetProperty<String> = this@wrap.includedClasses
         override val project: Project = project
     }
 }

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/appliers/instrumentation/JvmTestTaskConfigurator.kt

@@ -64,6 +64,7 @@ internal fun TaskCollection<Test>.instrument(
             koverContext.findAgentJarTask.map { it.agentJar.get().asFile },
             taskInstrumentationDisabled,
             excludedClassesWithAndroid,
+            current.instrumentation.includedClasses,
             binReportProvider
         )
     }
@@ -87,6 +88,9 @@ private class JvmTestTaskArgumentProvider(
     @get:Input
     val excludedClasses: Provider<Set<String>>,
 
+    @get:Input
+    val includedClasses: Provider<Set<String>>,
+
     @get:OutputFile
     val reportProvider: Provider<RegularFile>
 ) : CommandLineArgumentProvider, Named {
@@ -103,8 +107,13 @@ private class JvmTestTaskArgumentProvider(
     override fun asArguments(): MutableIterable<String> {
         return if (!instrumentationDisabled.get()) {
             toolProvider.get()
-                .jvmAgentArgs(agentJar.get(), tempDir, reportProvider.get().asFile, excludedClasses.get())
-                .toMutableList()
+                .jvmAgentArgs(
+                    agentJar.get(),
+                    tempDir,
+                    reportProvider.get().asFile,
+                    excludedClasses.get(),
+                    includedClasses.get()
+                ).toMutableList()
         } else {
             mutableListOf()
         }

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/KoverVariantConfig.kt

@@ -207,8 +207,18 @@ public interface KoverProjectInstrumentation {
 
     /**
      * Disable instrumentation in test tasks of specified classes
+     *
+     * Classes in [excludedClasses] have priority over classes from [includedClasses].
      */
     public val excludedClasses: SetProperty<String>
+
+    /**
+     * Enable instrumentation in test tasks only of specified classes.
+     * All other classes will not be instrumented.
+     *
+     * Classes in [excludedClasses] have priority over classes from [includedClasses].
+     */
+    public val includedClasses: SetProperty<String>
 }
 
 /**

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/dsl/internal/VariantsImpl.kt

@@ -26,6 +26,7 @@ internal abstract class KoverCurrentProjectVariantsConfigImpl @Inject constructo
 
         instrumentation.disabledForAll.convention(false)
         instrumentation.excludedClasses.convention(emptySet())
+        instrumentation.includedClasses.convention(emptySet())
         instrumentation.disabledForTestTasks.convention(emptySet())
     }
 

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/CoverageTool.kt

@@ -93,7 +93,13 @@ internal interface CoverageTool {
     /**
      * Generate additional JVM argument for test task.
      */
-    fun jvmAgentArgs(jarFile: File, tempDir: File, binReportFile: File, excludedClasses: Set<String>): List<String>
+    fun jvmAgentArgs(
+        jarFile: File,
+        tempDir: File,
+        binReportFile: File,
+        excludedClasses: Set<String>,
+        includedClasses: Set<String>
+    ): List<String>
 
     /**
      * Generate XML report.

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoOnlineInstrumentation.kt

@@ -6,10 +6,15 @@ package kotlinx.kover.gradle.plugin.tools.jacoco
 
 import java.io.*
 
-internal fun buildJvmAgentArgs(jarFile: File, binReportFile: File, excludedClasses: Set<String>): List<String> {
+internal fun buildJvmAgentArgs(
+    jarFile: File,
+    binReportFile: File,
+    excludedClasses: Set<String>,
+    includedClasses: Set<String>
+): List<String> {
     val agentArgs = listOfNotNull(
         "destfile=${binReportFile.canonicalPath},append=true,inclnolocationclasses=true,dumponexit=true,output=file,jmx=false",
-        excludedClasses.joinToFilterString("excludes")
+        excludedClasses.joinToFilterString("excludes"), includedClasses.joinToFilterString("includes"),
     ).joinToString(",")
 
     return listOf("-javaagent:${jarFile.canonicalPath}=$agentArgs")

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/jacoco/JacocoTool.kt

@@ -30,9 +30,10 @@ internal class JacocoTool(override val variant: CoverageToolVariant) : CoverageT
         jarFile: File,
         tempDir: File,
         binReportFile: File,
-        excludedClasses: Set<String>
+        excludedClasses: Set<String>,
+        includedClasses: Set<String>
     ): List<String> {
-        return buildJvmAgentArgs(jarFile, binReportFile, excludedClasses)
+        return buildJvmAgentArgs(jarFile, binReportFile, excludedClasses, includedClasses)
     }
 
     override fun xmlReport(xmlFile: File, title: String, context: ReportContext) {

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverOnlineInstrumentation.kt

@@ -10,15 +10,16 @@ internal fun buildJvmAgentArgs(
     jarFile: File,
     tempDir: File,
     binReportFile: File,
-    excludedClasses: Set<String>
+    excludedClasses: Set<String>,
+    includedClasses: Set<String>
 ): List<String> {
     val argsFile = tempDir.resolve("kover-agent.args")
-    argsFile.writeAgentArgs(binReportFile, excludedClasses)
+    argsFile.writeAgentArgs(binReportFile, excludedClasses, includedClasses)
 
     return mutableListOf("-javaagent:${jarFile.canonicalPath}=file:${argsFile.canonicalPath}")
 }
 
-private fun File.writeAgentArgs(binReportFile: File, excludedClasses: Set<String>) {
+private fun File.writeAgentArgs(binReportFile: File, excludedClasses: Set<String>, includedClasses: Set<String>) {
     binReportFile.parentFile.mkdirs()
     val binReportPath = binReportFile.canonicalPath
 
@@ -27,5 +28,8 @@ private fun File.writeAgentArgs(binReportFile: File, excludedClasses: Set<String
         excludedClasses.forEach { e ->
             pw.append("exclude=").appendLine(e)
         }
+        includedClasses.forEach { e ->
+            pw.append("include=").appendLine(e)
+        }
     }
 }

kover-gradle-plugin/src/main/kotlin/kotlinx/kover/gradle/plugin/tools/kover/KoverTool.kt

@@ -36,9 +36,10 @@ internal class KoverTool(override val variant: CoverageToolVariant) : CoverageTo
         jarFile: File,
         tempDir: File,
         binReportFile: File,
-        excludedClasses: Set<String>
+        excludedClasses: Set<String>,
+        includedClasses: Set<String>
     ): List<String> {
-        return buildJvmAgentArgs(jarFile, tempDir, binReportFile, excludedClasses)
+        return buildJvmAgentArgs(jarFile, tempDir, binReportFile, excludedClasses, includedClasses)
     }
 
     override fun xmlReport(xmlFile: File, title: String, context: ReportContext) {