Fix tests in separate projects

Provide an instrumented jar for dependent projects.

Use closeTo to verify coverage.

Let 'a-test' address the published scoverage artifacts directly.

checkScoverage should also only be run on the a-test project.

Author: maiflai

build.gradle

@@ -43,6 +43,7 @@ dependencies {
     compile gradleApi()
     compile localGroovy()
     scoverage 'org.scoverage:scalac-scoverage-plugin_2.11:1.0.2'
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
 }
 
 task groovydocJar(type: Jar, dependsOn: groovydoc) {

src/main/groovy/org/scoverage/ScoverageExtension.groovy

@@ -9,6 +9,7 @@ import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.scala.ScalaPlugin
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.testing.Test
 import org.gradle.util.GFileUtils
 
@@ -88,6 +89,15 @@ class ScoverageExtension {
             runtimeClasspath = it.output + mainSourceSet.output + project.configurations.scoverage + project.configurations.testRuntime
         }
 
+        def scoverageJar = project.tasks.create('jarScoverage', Jar.class) {
+            dependsOn('scoverageClasses')
+            classifier = ScoveragePlugin.CONFIGURATION_NAME
+            from mainSourceSet.output
+        }
+        project.artifacts {
+            scoverage project.tasks.jarScoverage
+        }
+
         project.tasks.create(ScoveragePlugin.TEST_NAME, Test.class) {
             conventionMapping.map("testClassesDir", new Callable<Object>() {
                 public Object call() throws Exception {

src/test/groovy/org/scoverage/SeparateTestsAcceptanceTest.groovy

@@ -1,9 +1,10 @@
 package org.scoverage
 
-import org.hamcrest.core.Is
-import org.junit.Assert
+import static org.hamcrest.number.IsCloseTo.closeTo
 import org.junit.Test
 
+import static org.junit.Assert.assertThat
+
 class SeparateTestsAcceptanceTest extends AcceptanceTestUtils {
 
     private void testSeparate(boolean useAnt) throws Exception {
@@ -25,8 +26,8 @@ class SeparateTestsAcceptanceTest extends AcceptanceTestUtils {
         // ... and both statement and branch coverage is 100%
         def branchCoverage = coverage(reportDir(subprojectDir), CoverageType.Branch)
         def statementCoverage = coverage(reportDir(subprojectDir), CoverageType.Statement)
-        Assert.assertThat('Branch coverage should be 100%, was ' + branchCoverage, branchCoverage, Is.is(100.0))
-        Assert.assertThat('Statement coverage should be 100%, was ' + statementCoverage, statementCoverage, Is.is(100.0))
+        assertThat('Branch coverage should be 100%, was ' + branchCoverage, branchCoverage, closeTo(100.0, 1.0))
+        assertThat('Statement coverage should be 100%, was ' + statementCoverage, statementCoverage, closeTo(100.0, 1.0))
     }
 
     @Test

src/test/separate-tests/build.gradle

@@ -35,19 +35,21 @@ subprojects {
         onlyIf { project.name.endsWith('-tests') }
     }
 
+    checkScoverage {
+        onlyIf { project.name.endsWith('-tests') }
+    }
+
 }
 
 configure(subprojects.findAll { it.name.endsWith('-tests') }) {
     def mainProject = project(":${project.name.minus('-tests')}")
     dependencies {
         testCompile mainProject
+        scoverage mainProject.configurations.scoverage.artifacts.files
     }
     scoverage {
         sources = mainProject.extensions.scoverage.sources
         dataDir = mainProject.extensions.scoverage.dataDir
         reportDir = mainProject.extensions.scoverage.reportDir
     }
-    testScoverage {
-        classpath = mainProject.sourceSets.scoverage.runtimeClasspath + sourceSets.test.runtimeClasspath
-    }
 }