#163 Fix deprecation warning from Gradle 7.1.1 about undeclared dependency between report task and test tasks outputs

eyalroth · eyalroth · commit 73bd170e48fe · 2021-08-28T20:55:21.000+03:00
diff --git a/src/crossScalaVersionTest/java/org/scoverage/ScalaCrossVersionAggregationTest.java b/src/crossScalaVersionTest/java/org/scoverage/ScalaCrossVersionAggregationTest.java
@@ -30,7 +30,7 @@ public void checkAndAggregateAll() throws Exception {
     private void assertAggregationFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "2_12/src/main/scala/org/hello/World2_12.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "2_13/src/main/scala/org/hello/World2_13.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World2_12.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World2_13.scala.html").exists());
     }
 }
diff --git a/src/crossScalaVersionTest/java/org/scoverage/ScalaVersionTest.java b/src/crossScalaVersionTest/java/org/scoverage/ScalaVersionTest.java
@@ -27,6 +27,6 @@ public void report() throws Exception {
 
         File reportDir = reportDir(projectDir().toPath().resolve(scalaVersion).toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/World" + scalaVersion + ".scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/World" + scalaVersion + ".scala.html").exists());
     }
-}
+}
diff --git a/src/functionalTest/java/org/scoverage/ScalaJavaAnnotationProcessorTest.java b/src/functionalTest/java/org/scoverage/ScalaJavaAnnotationProcessorTest.java
@@ -44,13 +44,13 @@ private void assertAllReportFilesExist() {
 
     private void assertAggregationFilesExist() {
 
-        Assert.assertTrue(resolve(reportDir(), "mixed_scala_java/src/main/scala/org/hello/WorldScala.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/WorldScala.scala.html").exists());
     }
 
     private void assertMixedScalaJavaReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("mixed_scala_java").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/WorldScala.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/WorldScala.scala.html").exists());
     }
 }
diff --git a/src/functionalTest/java/org/scoverage/ScalaJavaMultiModuleTest.java b/src/functionalTest/java/org/scoverage/ScalaJavaMultiModuleTest.java
@@ -46,21 +46,21 @@ private void assertAllReportFilesExist() {
 
     private void assertAggregationFilesExist() {
 
-        Assert.assertTrue(resolve(reportDir(), "scala_only/src/main/scala/org/hello/WorldScalaOnly.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "mixed_scala_java/src/main/scala/org/hello/WorldScala.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/WorldScalaOnly.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/WorldScala.scala.html").exists());
     }
 
     private void assertScalaOnlyReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("scala_only").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/WorldScalaOnly.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/WorldScalaOnly.scala.html").exists());
     }
 
     private void assertMixedScalaJavaReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("mixed_scala_java").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/WorldScala.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/WorldScala.scala.html").exists());
     }
 }
diff --git a/src/functionalTest/java/org/scoverage/ScalaMultiModuleTest.java b/src/functionalTest/java/org/scoverage/ScalaMultiModuleTest.java
@@ -297,35 +297,35 @@ private void assertAllReportFilesExist() {
 
     private void assertAggregationFilesExist() {
 
-        Assert.assertTrue(resolve(reportDir(), "a/src/main/scala/org/hello/a/WorldA.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "b/src/main/scala/org/hello/b/WorldB.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "common/src/main/scala/org/hello/common/WorldCommon.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/a/WorldA.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/b/WorldB.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/common/WorldCommon.scala.html").exists());
     }
 
     private void assertRootReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
     }
 
     private void assertAReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("a").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/a/WorldA.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/a/WorldA.scala.html").exists());
     }
 
     private void assertBReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("b").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/b/WorldB.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/b/WorldB.scala.html").exists());
     }
 
     private void assertCommonReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("common").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/common/WorldCommon.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/common/WorldCommon.scala.html").exists());
     }
 }
diff --git a/src/functionalTest/java/org/scoverage/ScalaMultiModuleWithMultipleTestTasksTest.java b/src/functionalTest/java/org/scoverage/ScalaMultiModuleWithMultipleTestTasksTest.java
@@ -294,35 +294,35 @@ private void assertAllReportFilesExist() {
 
     private void assertAggregationFilesExist() {
 
-        Assert.assertTrue(resolve(reportDir(), "a/src/main/scala/org/hello/a/WorldA.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "b/src/main/scala/org/hello/b/WorldB.scala.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "common/src/main/scala/org/hello/common/WorldCommon.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/a/WorldA.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/b/WorldB.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/common/WorldCommon.scala.html").exists());
     }
 
     private void assertRootReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
     }
 
     private void assertAReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("a").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/a/WorldA.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/a/WorldA.scala.html").exists());
     }
 
     private void assertBReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("b").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/b/WorldB.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/b/WorldB.scala.html").exists());
     }
 
     private void assertCommonReportFilesExist() {
 
         File reportDir = reportDir(projectDir().toPath().resolve("common").toFile());
         Assert.assertTrue(resolve(reportDir, "index.html").exists());
-        Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/common/WorldCommon.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir, "org/hello/common/WorldCommon.scala.html").exists());
     }
 }
diff --git a/src/functionalTest/java/org/scoverage/ScalaSingleModuleTest.java b/src/functionalTest/java/org/scoverage/ScalaSingleModuleTest.java
@@ -91,7 +91,7 @@ public void reportScoverageWithExcludedClasses() throws Exception {
         result.assertTaskDoesntExist(ScoveragePlugin.getAGGREGATE_NAME());
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertFalse(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertFalse(resolve(reportDir(), "org/hello/World.scala.html").exists());
         assertCoverage(100.0); // coverage is 100 since no classes are covered
 
         // compiled class should exist in the default classes directory, but not in scoverage
@@ -125,7 +125,7 @@ public void reportScoverageWithoutNormalCompilationAndWithExcludedClasses() thro
                 "-PexcludedFile=.*", "-P" + ScoveragePlugin.getSCOVERAGE_COMPILE_ONLY_PROPERTY());
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertFalse(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertFalse(resolve(reportDir(), "org/hello/World.scala.html").exists());
         assertCoverage(100.0); // coverage is 100 since no classes are covered
 
         // compiled class should exist in the default classes directory, but not in scoverage
@@ -136,6 +136,6 @@ public void reportScoverageWithoutNormalCompilationAndWithExcludedClasses() thro
     private void assertReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
     }
 }
diff --git a/src/functionalTest/java/org/scoverage/ScalaSingleModuleWithDependencyManagerTest.java b/src/functionalTest/java/org/scoverage/ScalaSingleModuleWithDependencyManagerTest.java
@@ -26,6 +26,6 @@ public void checkScoverage() throws Exception {
     private void assertReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
     }
-}
+}
diff --git a/src/functionalTest/java/org/scoverage/ScalaSingleModuleWithMultipleTestTasksTest.java b/src/functionalTest/java/org/scoverage/ScalaSingleModuleWithMultipleTestTasksTest.java
@@ -109,7 +109,7 @@ public void reportScoverageWithExcludedClasses() throws Exception {
         result.assertTaskDoesntExist(ScoveragePlugin.getAGGREGATE_NAME());
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertFalse(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertFalse(resolve(reportDir(), "org/hello/World.scala.html").exists());
         assertCoverage(100.0); // coverage is 100 since no classes are covered
 
         // compiled class should exist in the default classes directory, but not in scoverage
@@ -143,7 +143,7 @@ public void reportScoverageWithoutNormalCompilationAndWithExcludedClasses() thro
                 "-PexcludedFile=.*", "-P" + ScoveragePlugin.getSCOVERAGE_COMPILE_ONLY_PROPERTY());
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertFalse(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertFalse(resolve(reportDir(), "org/hello/World.scala.html").exists());
         assertCoverage(100.0); // coverage is 100 since no classes are covered
 
         // compiled class should exist in the default classes directory, but not in scoverage
@@ -155,6 +155,6 @@ public void reportScoverageWithoutNormalCompilationAndWithExcludedClasses() thro
     private void assertReportFilesExist() {
 
         Assert.assertTrue(resolve(reportDir(), "index.html").exists());
-        Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());
+        Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());
     }
 }
diff --git a/src/main/groovy/org/scoverage/ScoverageAggregate.groovy b/src/main/groovy/org/scoverage/ScoverageAggregate.groovy
@@ -1,19 +1,28 @@
 package org.scoverage
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.TaskAction
 import scoverage.report.CoverageAggregator
 
+import static org.gradle.api.tasks.PathSensitivity.RELATIVE
+
 class ScoverageAggregate extends DefaultTask {
 
     @Nested
     ScoverageRunner runner
 
+    @InputFiles
+    @PathSensitive(RELATIVE)
+    final Property<FileCollection> sources = project.objects.property(FileCollection)
+
     @OutputDirectory
     final Property<File> reportDir = project.objects.property(File)
 
@@ -52,7 +61,7 @@ class ScoverageAggregate extends DefaultTask {
 
             if (coverage.nonEmpty()) {
                 new ScoverageWriter(project.logger).write(
-                        project.projectDir,
+                        sources.get().getFiles(),
                         reportDir.get(),
                         coverage.get(),
                         sourceEncoding.get(),
diff --git a/src/main/groovy/org/scoverage/ScoverageExtension.groovy b/src/main/groovy/org/scoverage/ScoverageExtension.groovy
@@ -28,8 +28,6 @@ class ScoverageExtension {
     final Property<File> dataDir
     /** a directory to write final output to */
     final Property<File> reportDir
-    /** sources to highlight */
-    final Property<File> sources
     /** range positioning for highlighting */
     final Property<Boolean> highlighting
     /** regex for each excluded package */
@@ -61,9 +59,6 @@ class ScoverageExtension {
 
         scoverageScalaVersion = project.objects.property(String)
 
-        sources = project.objects.property(File)
-        sources.set(project.projectDir)
-
         dataDir = project.objects.property(File)
         dataDir.set(new File(project.buildDir, 'scoverage'))
 
diff --git a/src/main/groovy/org/scoverage/ScoveragePlugin.groovy b/src/main/groovy/org/scoverage/ScoveragePlugin.groovy
@@ -124,7 +124,7 @@ class ScoveragePlugin implements Plugin<PluginAware> {
                     group = 'verification'
                     runner = scoverageRunner
                     reportDir = taskReportDir
-                    sources = extension.sources
+                    sources = originalSourceSet.scala.getSourceDirectories()
                     dataDir = extension.dataDir
                     sourceEncoding.set(detectedSourceEncoding)
                     coverageOutputCobertura = extension.coverageOutputCobertura
@@ -143,6 +143,7 @@ class ScoveragePlugin implements Plugin<PluginAware> {
                 group = 'verification'
                 runner = scoverageRunner
                 reportDir = extension.reportDir
+                sources = originalSourceSet.scala.getSourceDirectories()
                 dirsToAggregateFrom = dataDirs
                 sourceEncoding.set(detectedSourceEncoding)
                 deleteReportsOnAggregation = false
@@ -299,6 +300,10 @@ class ScoveragePlugin implements Plugin<PluginAware> {
                         }
                     }
                     def allReportTasks = childReportTasks + globalReportTask.get()
+                    def allSources = project.objects.fileCollection()
+                    allReportTasks.each {
+                        allSources = allSources.plus(it.sources.get())
+                    }
                     def aggregationTask = project.tasks.create(AGGREGATE_NAME, ScoverageAggregate) {
                         def dataDirs = allReportTasks.findResults { it.dirsToAggregateFrom.get() }.flatten()
                         onlyIf {
@@ -308,6 +313,7 @@ class ScoveragePlugin implements Plugin<PluginAware> {
                         group = 'verification'
                         runner = scoverageRunner
                         reportDir = extension.reportDir
+                        sources = allSources
                         sourceEncoding.set(detectedSourceEncoding)
                         dirsToAggregateFrom = dataDirs
                         deleteReportsOnAggregation = extension.deleteReportsOnAggregation
diff --git a/src/main/groovy/org/scoverage/ScoverageReport.groovy b/src/main/groovy/org/scoverage/ScoverageReport.groovy
@@ -1,10 +1,12 @@
 package org.scoverage
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.file.FileCollection
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Nested
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.PathSensitive
@@ -23,9 +25,9 @@ class ScoverageReport extends DefaultTask {
     @PathSensitive(RELATIVE)
     final Property<File> dataDir = project.objects.property(File)
 
-    @InputDirectory
+    @InputFiles
     @PathSensitive(RELATIVE)
-    final Property<File> sources = project.objects.property(File)
+    final Property<FileCollection> sources = project.objects.property(FileCollection)
 
     @OutputDirectory
     final Property<File> reportDir = project.objects.property(File)
@@ -54,7 +56,7 @@ class ScoverageReport extends DefaultTask {
                 project.logger.info("[scoverage] Could not find coverage file, skipping...")
             } else {
                 new ScoverageWriter(project.logger).write(
-                        sources.get(),
+                        sources.get().getFiles(),
                         reportDir.get(),
                         coverage.get(),
                         sourceEncoding.get(),
diff --git a/src/main/groovy/org/scoverage/ScoverageWriter.java b/src/main/groovy/org/scoverage/ScoverageWriter.java

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public void checkAndAggregateAll() throws Exception {`
`30`	`30`	`private void assertAggregationFilesExist() {`
`31`	`31`
`32`	`32`	`Assert.assertTrue(resolve(reportDir(), "index.html").exists());`
`33`		`- Assert.assertTrue(resolve(reportDir(), "2_12/src/main/scala/org/hello/World2_12.scala.html").exists());`
`34`		`- Assert.assertTrue(resolve(reportDir(), "2_13/src/main/scala/org/hello/World2_13.scala.html").exists());`
	`33`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/World2_12.scala.html").exists());`
	`34`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/World2_13.scala.html").exists());`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ public void report() throws Exception {`
`27`	`27`
`28`	`28`	`File reportDir = reportDir(projectDir().toPath().resolve(scalaVersion).toFile());`
`29`	`29`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`30`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/World" + scalaVersion + ".scala.html").exists());`
	`30`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/World" + scalaVersion + ".scala.html").exists());`
`31`	`31`	`}`
`32`		`-}`
	`32`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,13 @@ private void assertAllReportFilesExist() {`
`44`	`44`
`45`	`45`	`private void assertAggregationFilesExist() {`
`46`	`46`
`47`		`- Assert.assertTrue(resolve(reportDir(), "mixed_scala_java/src/main/scala/org/hello/WorldScala.scala.html").exists());`
	`47`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/WorldScala.scala.html").exists());`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private void assertMixedScalaJavaReportFilesExist() {`
`51`	`51`
`52`	`52`	`File reportDir = reportDir(projectDir().toPath().resolve("mixed_scala_java").toFile());`
`53`	`53`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`54`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/WorldScala.scala.html").exists());`
	`54`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/WorldScala.scala.html").exists());`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,21 +46,21 @@ private void assertAllReportFilesExist() {`
`46`	`46`
`47`	`47`	`private void assertAggregationFilesExist() {`
`48`	`48`
`49`		`- Assert.assertTrue(resolve(reportDir(), "scala_only/src/main/scala/org/hello/WorldScalaOnly.scala.html").exists());`
`50`		`- Assert.assertTrue(resolve(reportDir(), "mixed_scala_java/src/main/scala/org/hello/WorldScala.scala.html").exists());`
	`49`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/WorldScalaOnly.scala.html").exists());`
	`50`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/WorldScala.scala.html").exists());`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private void assertScalaOnlyReportFilesExist() {`
`54`	`54`
`55`	`55`	`File reportDir = reportDir(projectDir().toPath().resolve("scala_only").toFile());`
`56`	`56`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`57`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/WorldScalaOnly.scala.html").exists());`
	`57`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/WorldScalaOnly.scala.html").exists());`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`private void assertMixedScalaJavaReportFilesExist() {`
`61`	`61`
`62`	`62`	`File reportDir = reportDir(projectDir().toPath().resolve("mixed_scala_java").toFile());`
`63`	`63`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`64`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/WorldScala.scala.html").exists());`
	`64`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/WorldScala.scala.html").exists());`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -297,35 +297,35 @@ private void assertAllReportFilesExist() {`
`297`	`297`
`298`	`298`	`private void assertAggregationFilesExist() {`
`299`	`299`
`300`		`- Assert.assertTrue(resolve(reportDir(), "a/src/main/scala/org/hello/a/WorldA.scala.html").exists());`
`301`		`- Assert.assertTrue(resolve(reportDir(), "b/src/main/scala/org/hello/b/WorldB.scala.html").exists());`
`302`		`- Assert.assertTrue(resolve(reportDir(), "common/src/main/scala/org/hello/common/WorldCommon.scala.html").exists());`
	`300`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/a/WorldA.scala.html").exists());`
	`301`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/b/WorldB.scala.html").exists());`
	`302`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/common/WorldCommon.scala.html").exists());`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`private void assertRootReportFilesExist() {`
`306`	`306`
`307`	`307`	`Assert.assertTrue(resolve(reportDir(), "index.html").exists());`
`308`		`- Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());`
	`308`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`private void assertAReportFilesExist() {`
`312`	`312`
`313`	`313`	`File reportDir = reportDir(projectDir().toPath().resolve("a").toFile());`
`314`	`314`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`315`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/a/WorldA.scala.html").exists());`
	`315`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/a/WorldA.scala.html").exists());`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`private void assertBReportFilesExist() {`
`319`	`319`
`320`	`320`	`File reportDir = reportDir(projectDir().toPath().resolve("b").toFile());`
`321`	`321`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`322`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/b/WorldB.scala.html").exists());`
	`322`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/b/WorldB.scala.html").exists());`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`private void assertCommonReportFilesExist() {`
`326`	`326`
`327`	`327`	`File reportDir = reportDir(projectDir().toPath().resolve("common").toFile());`
`328`	`328`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`329`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/common/WorldCommon.scala.html").exists());`
	`329`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/common/WorldCommon.scala.html").exists());`
`330`	`330`	`}`
`331`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,35 +294,35 @@ private void assertAllReportFilesExist() {`
`294`	`294`
`295`	`295`	`private void assertAggregationFilesExist() {`
`296`	`296`
`297`		`- Assert.assertTrue(resolve(reportDir(), "a/src/main/scala/org/hello/a/WorldA.scala.html").exists());`
`298`		`- Assert.assertTrue(resolve(reportDir(), "b/src/main/scala/org/hello/b/WorldB.scala.html").exists());`
`299`		`- Assert.assertTrue(resolve(reportDir(), "common/src/main/scala/org/hello/common/WorldCommon.scala.html").exists());`
	`297`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/a/WorldA.scala.html").exists());`
	`298`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/b/WorldB.scala.html").exists());`
	`299`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/common/WorldCommon.scala.html").exists());`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`private void assertRootReportFilesExist() {`
`303`	`303`
`304`	`304`	`Assert.assertTrue(resolve(reportDir(), "index.html").exists());`
`305`		`- Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());`
	`305`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`private void assertAReportFilesExist() {`
`309`	`309`
`310`	`310`	`File reportDir = reportDir(projectDir().toPath().resolve("a").toFile());`
`311`	`311`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`312`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/a/WorldA.scala.html").exists());`
	`312`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/a/WorldA.scala.html").exists());`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`private void assertBReportFilesExist() {`
`316`	`316`
`317`	`317`	`File reportDir = reportDir(projectDir().toPath().resolve("b").toFile());`
`318`	`318`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`319`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/b/WorldB.scala.html").exists());`
	`319`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/b/WorldB.scala.html").exists());`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`private void assertCommonReportFilesExist() {`
`323`	`323`
`324`	`324`	`File reportDir = reportDir(projectDir().toPath().resolve("common").toFile());`
`325`	`325`	`Assert.assertTrue(resolve(reportDir, "index.html").exists());`
`326`		`- Assert.assertTrue(resolve(reportDir, "src/main/scala/org/hello/common/WorldCommon.scala.html").exists());`
	`326`	`+ Assert.assertTrue(resolve(reportDir, "org/hello/common/WorldCommon.scala.html").exists());`
`327`	`327`	`}`
`328`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ public void checkScoverage() throws Exception {`
`26`	`26`	`private void assertReportFilesExist() {`
`27`	`27`
`28`	`28`	`Assert.assertTrue(resolve(reportDir(), "index.html").exists());`
`29`		`- Assert.assertTrue(resolve(reportDir(), "src/main/scala/org/hello/World.scala.html").exists());`
	`29`	`+ Assert.assertTrue(resolve(reportDir(), "org/hello/World.scala.html").exists());`
`30`	`30`	`}`
`31`		`-}`
	`31`	`+}`