Merge pull request #377 from ckipp01/disabled

Ensure reporting and aggregation still works when disabling modules.

Author: ckipp01

Diff for: src/main/scala/scoverage/ScoverageSbtPlugin.scala

@@ -170,9 +170,12 @@ object ScoverageSbtPlugin extends AutoPlugin {
     implicit val log = streams.value.log
     log.info(s"Aggregating coverage from subprojects...")
 
-    val dataDirs = coverageDataDir
-      .all(aggregateFilter)
-      .value map (_ / Constants.DataDir) filter (_.isDirectory)
+    val dataDirs = coverageDataDir.?.all(aggregateFilter).value
+      .collect {
+        case Some(file) if (file / Constants.DataDir).isDirectory =>
+          file / Constants.DataDir
+      }
+
     CoverageAggregator.aggregate(dataDirs) match {
       case Some(cov) =>
         writeReports(

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/a/src/main/scala/a/AdderScala.scala

@@ -0,0 +1,7 @@
+package a
+
+object AdderScala {
+
+  def add(x: Int, y: Int) = x + y
+
+}

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/a/src/test/scala/AdderTestSuite.scala

@@ -0,0 +1,8 @@
+import munit.FunSuite
+import a.AdderScala
+
+class AdderTestSuite extends FunSuite {
+  test("Adder should sum two numbers") {
+    assertEquals(AdderScala.add(1, 2), 3)
+  }
+}

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/b/src/main/scala/b/AdderScala.scala

@@ -0,0 +1,7 @@
+package b
+
+object AdderScala {
+
+  def add(x: Int, y: Int) = x + y
+
+}

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/b/src/test/scala/AdderTestSuite.scala

@@ -0,0 +1,8 @@
+import munit.FunSuite
+import b.AdderScala
+
+class AdderTestSuite extends FunSuite {
+  test("Adder should sum two numbers") {
+    assertEquals(AdderScala.add(1, 2), 3)
+  }
+}

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/build.sbt

@@ -0,0 +1,17 @@
+inThisBuild(
+  List(
+    organization := "org.scoverage",
+    scalaVersion := "2.13.6",
+    libraryDependencies += "org.scalameta" %% "munit" % "0.7.25" % Test
+  )
+)
+
+lazy val a = project
+lazy val b = project
+lazy val c = project.disablePlugins(ScoverageSbtPlugin)
+
+ThisBuild / resolvers ++= {
+  if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
+    Seq(Resolver.sonatypeRepo("snapshots"))
+  else Seq.empty
+}

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/c/src/main/scala/c/AdderScala.scala

@@ -0,0 +1,7 @@
+package c
+
+object AdderScala {
+
+  def add(x: Int, y: Int) = x + y
+
+}

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/c/src/test/scala/AdderTestSuite.scala

@@ -0,0 +1,8 @@
+import munit.FunSuite
+import c.AdderScala
+
+class AdderTestSuite extends FunSuite {
+  test("Adder should sum two numbers") {
+    assertEquals(AdderScala.add(1, 2), 3)
+  }
+}

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.5.5

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/project/plugins.sbt

@@ -0,0 +1,16 @@
+val pluginVersion = sys.props.getOrElse(
+  "plugin.version",
+  throw new RuntimeException(
+    """|The system property 'plugin.version' is not defined.
+       |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
+  )
+)
+
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
+
+resolvers ++= {
+  if (pluginVersion.endsWith("-SNAPSHOT"))
+    Seq(Resolver.sonatypeRepo("snapshots"))
+  else
+    Seq.empty
+}

Diff for: src/sbt-test/scoverage/aggregate-disabled-module/test

@@ -0,0 +1,16 @@
+# run scoverage using the coverage task
+> clean
+> coverage
+> test
+# There should be scoverage-data directory
+$ exists a/target/scala-2.13/scoverage-data
+$ exists b/target/scala-2.13/scoverage-data
+$ absent c/target/scala-2.13/scoverage-data
+> coverageReport
+# There should be scoverage-report directory
+$ exists a/target/scala-2.13/scoverage-report
+$ exists b/target/scala-2.13/scoverage-report
+$ absent c/target/scala-2.13/scoverage-report
+> coverageAggregate
+# There should be a root scoverage-report directory
+$ exists target/scala-2.13/scoverage-report