Replace the need to copy Kotlin classes manually (see #29)

Author: mannodermaus

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/Plugin.kt

@@ -1,6 +1,7 @@
 package de.mannodermaus.gradle.plugins.junit5
 
-import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5CopyKotlin
+import de.mannodermaus.gradle.plugins.junit5.providers.KotlinTestRootDirectoryProvider
+import de.mannodermaus.gradle.plugins.junit5.providers.TestRootDirectoryProvider
 import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5JacocoReport
 import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5UnitTest
 import org.gradle.api.Plugin
@@ -97,15 +98,19 @@ class AndroidJUnitPlatformPlugin : Plugin<Project> {
     val isKotlinApplied = projectConfig.kotlinPluginApplied
 
     testVariants.forEach { variant ->
-      val testTask = AndroidJUnit5UnitTest.create(this, variant)
+      // Aggregate non-standard test root directories
+      val rootProviders = mutableSetOf<TestRootDirectoryProvider>()
+      if (isKotlinApplied) {
+        rootProviders += KotlinTestRootDirectoryProvider(this, variant)
+      }
+
+      // Create JUnit 5 test task
+      val testTask = AndroidJUnit5UnitTest.create(this, variant, rootProviders)
 
       if (isJacocoApplied) {
+        // Create a Jacoco friend task
         AndroidJUnit5JacocoReport.create(this, testTask)
       }
-
-      if (isKotlinApplied) {
-        AndroidJUnit5CopyKotlin.create(this, testTask)
-      }
     }
   }
 }

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/providers/Kotlin.kt

@@ -0,0 +1,36 @@
+package de.mannodermaus.gradle.plugins.junit5.providers
+
+import com.android.build.gradle.api.BaseVariant
+import de.mannodermaus.gradle.plugins.junit5.unitTestVariant
+import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.io.File
+
+/**
+ * Provides test root directories for Kotlin sources,
+ * with which a JUnit 5 Task can be enhanced.
+ */
+class KotlinTestRootDirectoryProvider(
+    private val project: Project,
+    private val variant: BaseVariant) : TestRootDirectoryProvider {
+
+  override fun testRootDirectories(): Set<File> {
+    // Hook in the Kotlin destination directories to the JUnit 5 Task.
+    // Note: The resulting Set might be empty for modules powered by AGP2:
+    // The legacy Kotlin integration automatically copies over Kotlin classes
+    // into the Java directories, which renders dedicated Gradle tasks useless.
+    val kotlinTaskNames = listOf(
+        kotlinTaskName(variant),
+        kotlinTaskName(variant.unitTestVariant))
+
+    return kotlinTaskNames
+        .map { project.tasks.findByName(it) }
+        .filter { it != null }
+        .map { it as KotlinCompile }
+        .map { it.destinationDir }
+        .toSet()
+  }
+
+  private fun kotlinTaskName(variant: BaseVariant) =
+      "compile${variant.name.capitalize()}Kotlin"
+}

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/providers/TestRootDirectoryProvider.kt

@@ -0,0 +1,7 @@
+package de.mannodermaus.gradle.plugins.junit5.providers
+
+import java.io.File
+
+interface TestRootDirectoryProvider {
+  fun testRootDirectories(): Set<File>
+}

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/tasks/Jacoco.kt

@@ -8,8 +8,6 @@ import org.gradle.testing.jacoco.tasks.JacocoReport
 
 private const val TASK_NAME_DEFAULT = "jacocoTestReport"
 private const val GROUP_REPORTING = "reporting"
-private const val JACOCO_PLUGIN_EXT = "jacoco"
-private const val JACOCO_TASK_EXT = "jacoco"
 
 /**
  * Jacoco Test Reporting Task connected to a variant-aware JUnit 5 task.

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/tasks/Kotlin.kt

@@ -6,6 +6,7 @@ import com.android.build.gradle.internal.scope.VariantScope
 import com.android.build.gradle.tasks.factory.AndroidUnitTest
 import com.android.builder.core.VariantType
 import de.mannodermaus.gradle.plugins.junit5.AndroidJUnitPlatformExtension
+import de.mannodermaus.gradle.plugins.junit5.providers.TestRootDirectoryProvider
 import de.mannodermaus.gradle.plugins.junit5.engines
 import de.mannodermaus.gradle.plugins.junit5.filters
 import de.mannodermaus.gradle.plugins.junit5.getExcludeClassNamePatterns
@@ -39,8 +40,11 @@ private const val VERIFICATION_GROUP = JavaBasePlugin.VERIFICATION_GROUP
 open class AndroidJUnit5UnitTest : JavaExec() {
 
   companion object {
-    fun create(project: Project, variant: BaseVariant): AndroidJUnit5UnitTest {
-      val configAction = ConfigAction(project, variant)
+    fun create(
+        project: Project,
+        variant: BaseVariant,
+        additionalRoots: Set<TestRootDirectoryProvider>): AndroidJUnit5UnitTest {
+      val configAction = ConfigAction(project, variant, additionalRoots)
       return project.tasks.create(configAction.name, configAction.type, configAction)
     }
   }
@@ -57,12 +61,28 @@ open class AndroidJUnit5UnitTest : JavaExec() {
   @Optional
   var assetsCollection: FileCollection? = null
 
+  /**
+   * Default Provider implementation for test root directories.
+   * This will look up the main & test root directories
+   * of the variant connected to a given JUnit 5 task.
+   */
+  private class DefaultTestRootDirectoryProvider(
+      private val variant: BaseVariant) : TestRootDirectoryProvider {
+    override fun testRootDirectories() = setOf(
+        // e.g. "build/intermediates/classes/debug/..."
+        variant.variantData.scope.javaOutputDir,
+        // e.g. "build/intermediates/classes/test/debug/..."
+        variant.unitTestVariant.variantData.scope.javaOutputDir
+    )
+  }
+
   /**
    * Configuration closure for an Android JUnit5 test task.
    */
   private class ConfigAction(
       val project: Project,
-      val variant: BaseVariant
+      val variant: BaseVariant,
+      val additionalRoots: Set<TestRootDirectoryProvider>
   ) : TaskConfigAction<AndroidJUnit5UnitTest> {
 
     private val scope: VariantScope = variant.variantData.scope
@@ -94,15 +114,11 @@ open class AndroidJUnit5UnitTest : JavaExec() {
       task.classpath = getDefaultUnitTestTask().classpath +
           project.configurations.getByName("junitPlatform")
 
-      // Aggregate the source folders for test cases
-      // (usually, the unit test variant's folders should be enough,
+      // Aggregate test root directories, starting with the default set of folders.
+      // (Usually, the unit test variant's folders should be enough,
       // however we aggregate the main scope's output as well)
-      val testRootDirs = listOf(
-          // e.g. "build/intermediates/classes/debug/..."
-          scope.javaOutputDir,
-          // e.g. "build/intermediates/classes/test/debug/..."
-          variant.unitTestVariant.variantData.scope.javaOutputDir
-      )
+      val defaultProvider = DefaultTestRootDirectoryProvider(variant)
+      val testRootDirs = defaultProvider.testRootDirectories() + additionalRoots.flatMap { it.testRootDirectories() }
 
       project.logInfo("Assembled JUnit 5 Task '$task.name':")
       testRootDirs.forEach { project.logInfo("|__ $it") }
@@ -187,7 +203,7 @@ open class AndroidJUnit5UnitTest : JavaExec() {
     private fun buildArgs(
         junit5: AndroidJUnitPlatformExtension,
         reportsDir: File,
-        testRootDirs: List<File>): List<String> {
+        testRootDirs: Set<File>): List<String> {
       val args = mutableListOf<String>()
 
       // Log Details

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/tasks/UnitTest.kt

@@ -1,5 +1,3 @@
-import com.android.build.gradle.BaseExtension
-
 buildscript {
   repositories {
     jcenter()
@@ -15,20 +13,6 @@ apply plugin: "kotlin-android"
 apply plugin: "de.mannodermaus.android-junit5"
 apply plugin: "jacoco"
 
-project.afterEvaluate {
-
-  def mi = BaseExtension.class.getDeclaredField("extraModelInfo")
-  mi.accessible = true
-
-  def val = mi.get(android)
-  println "Extra Model Info: $val"
-
-  val.class.getDeclaredFields().each {
-    it.accessible = true
-    println " |__ $it --> ${it.get(val)}"
-  }
-}
-
 android {
   // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   // A Note to my forgetful self:
@@ -68,8 +52,3 @@ dependencies {
   testImplementation junit5Params()
   testCompileOnly junit5EmbeddedRuntime()
 }
-
-project.afterEvaluate {
-//  tasks.getByName("copyKotlinUnitTestClassesDebug").enabled = false
-//  tasks.getByName("junitPlatformTestDebug").enabled = false
-}

sample/build.gradle

@@ -135,30 +135,4 @@ class AGP3PluginSpec extends BasePluginSpec {
     project.tasks.findByName("jacocoTestReportDebug") == null
     project.tasks.findByName("jacocoTestReportRelease") == null
   }
-
-  def "Feature: Kotlin Integration"() {
-    when:
-    def project = factory.newProject(rootProject())
-        .asAndroidFeature()
-        .applyJunit5Plugin()
-        .applyKotlinPlugin()
-        .buildAndEvaluate()
-
-    then:
-    project.tasks.getByName("copyKotlinUnitTestClassesDebug")
-    project.tasks.getByName("copyKotlinUnitTestClassesRelease")
-  }
-
-  def "Feature: Kotlin Tasks not added if plugin absent"() {
-    when:
-    def project = factory.newProject(rootProject())
-        .asAndroidFeature()
-        .applyJunit5Plugin()
-        .applyKotlinPlugin(false)
-        .buildAndEvaluate()
-
-    then:
-    project.tasks.findByName("copyKotlinUnitTestClassesDebug") == null
-    project.tasks.findByName("copyKotlinUnitTestClassesRelease") == null
-  }
 }

tests/testAgp3x/src/test/groovy/de/mannodermaus/gradle/plugins/junit5/AGP3PluginSpec.groovy

@@ -281,56 +281,4 @@ abstract class BasePluginSpec extends Specification {
     project.tasks.findByName("jacocoTestReportDebug") == null
     project.tasks.findByName("jacocoTestReportRelease") == null
   }
-
-  def "Application: Kotlin Integration"() {
-    when:
-    def project = factory.newProject(rootProject())
-        .asAndroidApplication()
-        .applyJunit5Plugin()
-        .applyKotlinPlugin()
-        .buildAndEvaluate()
-
-    then:
-    project.tasks.getByName("copyKotlinUnitTestClassesDebug")
-    project.tasks.getByName("copyKotlinUnitTestClassesRelease")
-  }
-
-  def "Library: Kotlin Integration"() {
-    when:
-    def project = factory.newProject(rootProject())
-        .asAndroidLibrary()
-        .applyJunit5Plugin()
-        .applyKotlinPlugin()
-        .buildAndEvaluate()
-
-    then:
-    project.tasks.getByName("copyKotlinUnitTestClassesDebug")
-    project.tasks.getByName("copyKotlinUnitTestClassesRelease")
-  }
-
-  def "Application: Kotlin Tasks not added if plugin absent"() {
-    when:
-    def project = factory.newProject(rootProject())
-        .asAndroidApplication()
-        .applyJunit5Plugin()
-        .applyKotlinPlugin(false)
-        .buildAndEvaluate()
-
-    then:
-    project.tasks.findByName("copyKotlinUnitTestClassesDebug") == null
-    project.tasks.findByName("copyKotlinUnitTestClassesRelease") == null
-  }
-
-  def "Library: Kotlin Tasks not added if plugin absent"() {
-    when:
-    def project = factory.newProject(rootProject())
-        .asAndroidLibrary()
-        .applyJunit5Plugin()
-        .applyKotlinPlugin(false)
-        .buildAndEvaluate()
-
-    then:
-    project.tasks.findByName("copyKotlinUnitTestClassesDebug") == null
-    project.tasks.findByName("copyKotlinUnitTestClassesRelease") == null
-  }
 }