Fix unit tested code not reported as covered (#19)

 - Fix a few issues with unit test coverage. Code in module A that is touched by unit tests in module B is now correctly reported as covered (fixes #18).
 - Add extra test cases to cover more cases in the Kotlin/Java code and Library/App module matrix.
 - Remove some unnessecary files from the integration test.

Author: Rolf-Smit

plugin/src/main/kotlin/org/neotech/plugin/rootcoverage/RootCoveragePlugin.kt

@@ -8,7 +8,10 @@ import org.gradle.api.DomainObjectSet
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.file.FileTree
+import org.gradle.api.tasks.testing.Test
 import org.gradle.testing.jacoco.plugins.JacocoPlugin
+import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
 
 @Suppress("unused")
 class RootCoveragePlugin : Plugin<Project> {
@@ -60,19 +63,30 @@ class RootCoveragePlugin : Plugin<Project> {
     private fun getBuildVariantFor(project: Project): String =
         rootProjectExtension.buildVariantOverrides[project.path] ?: rootProjectExtension.buildVariant
 
-    private fun getExecutionDataFilePatterns(): List<String> {
-        val list = mutableListOf<String>()
+    private fun getExecutionDataFileTree(project: Project): FileTree {
+        val rootFolderPatterns = mutableListOf<String>()
+        val buildFolderPatterns = mutableListOf<String>()
         if (rootProjectExtension.includeUnitTestResults()) {
-            list.add("jacoco/test*UnitTest.exec")
+            buildFolderPatterns.add("jacoco/test*UnitTest.exec")
+
+            // TODO instead of hardcoding this, obtain the location from the test tasks, something like this:
+            // tasks.withType(Test::class.java).all { testTask ->
+            //     testTask.extensions.findByType(JacocoTaskExtension::class.java)?.apply {
+            //         destinationFile
+            //     }
+            // }
+            rootFolderPatterns.add("jacoco.exec")
         }
         if (rootProjectExtension.includeAndroidTestResults()) {
             // Android Build Tools Plugin 3.2
-            list.add("outputs/code-coverage/connected/*coverage.ec")
+            buildFolderPatterns.add("outputs/code-coverage/connected/*coverage.ec")
 
             // Android Build Tools Plugin 3.3+
-            list.add("outputs/code_coverage/*/connected/*coverage.ec")
+            buildFolderPatterns.add("outputs/code_coverage/*/connected/*coverage.ec")
         }
-        return list
+
+        return project.fileTree(project.buildDir, includes = buildFolderPatterns) +
+                project.fileTree(project.projectDir, includes = rootFolderPatterns)
     }
 
     /**
@@ -142,7 +156,6 @@ class RootCoveragePlugin : Plugin<Project> {
         when (extension) {
             is LibraryExtension -> {
                 extension.libraryVariants.all { variant ->
-
                     if (variant.buildType.isTestCoverageEnabled && variant.name.capitalize() == buildVariant.capitalize()) {
                         if (subProject.plugins.withType(JacocoPlugin::class.java).isEmpty()) {
                             subProject.logger.warn("Warning: Jacoco plugin was not found for project: '${subProject.name}', it has been applied automatically but you should do this manually. Build file: ${subProject.buildFile}")
@@ -201,9 +214,8 @@ class RootCoveragePlugin : Plugin<Project> {
 
             task.sourceDirectories = project.files(sourceFiles)
             task.classDirectories = project.files(javaClassTrees, kotlinClassTree)
-            task.executionData = project.fileTree(project.buildDir, includes = getExecutionDataFilePatterns())
+            task.executionData = getExecutionDataFileTree(project)
         }
-
         return codeCoverageReportTask.get()
     }
 

plugin/src/test/kotlin/org/neotech/plugin/rootcoverage/IntegrationTest.kt

@@ -42,6 +42,8 @@ class IntegrationTest(
 
         report.assertFullCoverage("org.neotech.library.android", "LibraryAndroidJava")
         report.assertFullCoverage("org.neotech.library.android", "LibraryAndroidKotlin")
+        report.assertFullCoverage("org.neotech.app", "AppJava")
+        report.assertFullCoverage("org.neotech.app", "AppKotlin")
     }
 
     companion object {
@@ -54,7 +56,6 @@ class IntegrationTest(
             val testFixtures = File("src/test/test-fixtures").listFiles()?.filter { it.isDirectory }
                     ?: error("Could not list test fixture directories")
             val gradleVersions = arrayOf("5.4.1", "5.5.1", "5.6.4")
-
             return testFixtures.flatMap { file ->
                 gradleVersions.map { gradleVersion ->
                     arrayOf("${file.name}-$gradleVersion", file, gradleVersion)

plugin/src/test/test-fixtures/multi-module/app/src/androidTest/java/org/neotech/app/multimoduleapplication/AppJavaInstrumentedTest.java

@@ -0,0 +1,34 @@
+package org.neotech.app.multimoduleapplication;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.neotech.app.AppJava;
+import org.neotech.app.AppKotlin;
+import org.neotech.library.android.LibraryAndroidJava;
+import org.neotech.library.android.LibraryAndroidKotlin;
+
+@RunWith(AndroidJUnit4.class)
+public class AppJavaInstrumentedTest {
+
+    @Test
+    public void touchJavaCodeInApp() {
+        AppJava.getInstance().touchedByJavaInstrumentedTestInApp();
+    }
+
+    @Test
+    public void touchKotlinCodeInApp() {
+        AppKotlin.touchedByJavaInstrumentedTestInApp();
+    }
+
+    @Test
+    public void touchJavaCodeInLibrary() {
+        LibraryAndroidJava.getInstance().touchedByJavaInstrumentedTestInApp();
+    }
+
+    @Test
+    public void touchKotlinCodeInLibrary() {
+        LibraryAndroidKotlin.touchedByJavaInstrumentedTestInApp();
+    }
+}

plugin/src/test/test-fixtures/multi-module/app/src/androidTest/java/org/neotech/app/multimoduleapplication/AppKotlinInstrumentedTest.kt

@@ -0,0 +1,33 @@
+package org.neotech.app.multimoduleapplication
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.neotech.app.AppJava
+import org.neotech.app.AppKotlin
+import org.neotech.library.android.LibraryAndroidJava
+import org.neotech.library.android.LibraryAndroidKotlin
+
+@RunWith(AndroidJUnit4::class)
+class AppKotlinInstrumentedTest {
+
+    @Test
+    fun touchJavaCodeInApp() {
+        AppJava.getInstance().touchedByKotlinInstrumentedTestInApp()
+    }
+
+    @Test
+    fun touchKotlinCodeInApp() {
+        AppKotlin.touchedByKotlinInstrumentedTestInApp()
+    }
+
+    @Test
+    fun touchJavaCodeInLibrary() {
+        LibraryAndroidJava.getInstance().touchedByKotlinInstrumentedTestInApp()
+    }
+
+    @Test
+    fun touchKotlinCodeInLibrary() {
+        LibraryAndroidKotlin.touchedByKotlinInstrumentedTestInApp()
+    }
+}

plugin/src/test/test-fixtures/multi-module/app/src/androidTest/java/org/neotech/app/multimoduleapplication/TouchLibraryCodeFromJavaAndroidTest.java

@@ -1,21 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.neotech.app">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
+<manifest package="org.neotech.app" />

plugin/src/test/test-fixtures/multi-module/app/src/main/AndroidManifest.xml

@@ -0,0 +1,33 @@
+package org.neotech.app;
+
+public final class AppJava {
+
+    private static AppJava INSTANCE;
+
+    public static synchronized AppJava getInstance() {
+        if (INSTANCE == null) {
+            INSTANCE = new AppJava();
+        }
+        return INSTANCE;
+    }
+
+    private AppJava() {
+
+    }
+
+    public String touchedByJavaInstrumentedTestInApp() {
+        return "touchedByJavaInstrumentedTestInApp";
+    }
+
+    public String touchedByJavaUnitTestInApp() {
+        return "touchedByJavaUnitTestInApp";
+    }
+
+    public String touchedByKotlinInstrumentedTestInApp() {
+        return "touchedByKotlinInstrumentedTestInApp";
+    }
+
+    public String touchedByKotlinUnitTestInApp() {
+        return "touchedByKotlinUnitTestInApp";
+    }
+}

plugin/src/test/test-fixtures/multi-module/app/src/main/java/org/neotech/app/AppJava.java

@@ -0,0 +1,22 @@
+package org.neotech.app
+
+object AppKotlin {
+
+    @JvmStatic
+    fun touchedByJavaInstrumentedTestInApp(): String {
+        return "touchedByJavaInstrumentedTestInApp"
+    }
+
+    @JvmStatic
+    fun touchedByJavaUnitTestInApp(): String {
+        return "touchedByJavaUnitTestInApp"
+    }
+    
+    fun touchedByKotlinInstrumentedTestInApp(): String {
+        return "touchedByKotlinInstrumentedTestInApp"
+    }
+    
+    fun touchedByKotlinUnitTestInApp(): String {
+        return "touchedByKotlinUnitTestInApp"
+    }
+}