Fix: Source files not included in JaCoCo HTML report (#61)

fixes #60

Author: Rolf-Smit

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

@@ -189,8 +189,7 @@ class RootCoveragePlugin : Plugin<Project> {
                     return
             }
         }
-        baseVariant.forEach {
-            subProject.logger.warn("Name: $name, BaseName: ${it.baseName}")
+        baseVariant.all {
             if(name.contentEquals(it.baseName, ignoreCase = true)) {
                 val sourceFiles = it.getSourceFolders(SourceKind.JAVA).map { file -> file.dir }
                 sourceDirectories.from(subProject.files(sourceFiles))

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

@@ -45,20 +45,22 @@ class IntegrationTest(
         assertThat(result.output).contains("BUILD SUCCESSFUL")
 
         // Assert whether the combined coverage report is what we expected
-        result.assertRootCoverageReport()
+        result.assertRootCoverageReport(File(projectRoot, "build/reports/jacoco.csv"))
 
         // Assert whether the per module coverage reports are what we expect
         result.assertAppCoverageReport()
         result.assertAndroidLibraryCoverageReport()
+
+        assertSourceFilesHaveBeenAddedToReport(File(projectRoot, "build/reports/jacoco"))
     }
 
-    private fun BuildResult.assertRootCoverageReport() {
+    private fun BuildResult.assertRootCoverageReport(file: File) {
         assertEquals(task(":rootCoverageReport")!!.outcome, TaskOutcome.SUCCESS)
 
         // Also check if the old task name is still exe
         assertEquals(task(":rootCodeCoverageReport")!!.outcome, TaskOutcome.SUCCESS)
 
-        val report = CoverageReport.from(File(projectRoot, "build/reports/jacoco.csv"))
+        val report = CoverageReport.from(file)
 
         report.assertCoverage("org.neotech.library.android", "LibraryAndroidJava")
         report.assertCoverage("org.neotech.library.android", "LibraryAndroidKotlin")
@@ -99,6 +101,18 @@ class IntegrationTest(
         )
     }
 
+    private fun assertSourceFilesHaveBeenAddedToReport(htmlReportRoot: File) {
+        htmlReportRoot.walkTopDown()
+            .filter {
+                it.isFile && it.extension == "html"
+            }
+            .forEach { file ->
+                file.forEachLine {
+                    assertThat(it).doesNotContainMatch("Source file ".*" was not found during generation of report\\.")
+                }
+            }
+    }
+
     companion object {
 
         @Suppress("unused") // This method is used by the JVM (Parameterized JUnit Runner)