Merge pull request #43 from Kwestor/tests/separate-tests

Support for tests in separate 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/AcceptanceTestUtils.groovy

@@ -5,11 +5,32 @@ import org.gradle.tooling.GradleConnector
 import org.hamcrest.core.Is
 import org.junit.Assert
 
+enum CoverageType {
+    Line('cobertura.xml', 'line-rate'),
+    Statement('scoverage.xml', 'statement-rate'),
+    Branch('scoverage.xml', 'branch-rate')
+
+    String fileName
+    String paramName
+
+    CoverageType(String fileName, String paramName) {
+        this.fileName = fileName
+        this.paramName = paramName
+    }
+}
+
 /**
  * Some utils for easy acceptance testing.
  */
 class AcceptanceTestUtils {
 
+    XmlParser parser
+
+    AcceptanceTestUtils() {
+        parser = new XmlParser()
+        parser.setFeature('http://apache.org/xml/features/disallow-doctype-decl', false)
+        parser.setFeature('http://apache.org/xml/features/nonvalidating/load-external-dtd', false)
+    }
 
     protected BuildLauncher setupBuild(File projectRoot, boolean useAnt) {
         return GradleConnector.
@@ -28,4 +49,9 @@ class AcceptanceTestUtils {
         return new File(baseDir, 'build/reports/scoverage')
     }
 
+    protected Double coverage(File reportDir, CoverageType coverageType) {
+        File reportFile = new File(reportDir, coverageType.fileName)
+        def xml = parser.parse(reportFile)
+        xml.attribute(coverageType.paramName).toDouble()
+    }
 }

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

@@ -0,0 +1,46 @@
+package org.scoverage
+
+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 {
+        File projectDir = new File('src/test/separate-tests')
+        File subprojectDir = new File(projectDir, 'a')
+        File testsSubprojectDir = new File(projectDir, 'a-tests')
+
+        def build = setupBuild(projectDir, useAnt)
+        build.forTasks('clean', 'reportScoverage').run()
+
+        // ensure report is generated in base project ...
+        def indexHtml = new File(reportDir(subprojectDir), 'index.html')
+        checkFile('an index HTML file', indexHtml, true)
+
+        // ... but not in test project ...
+        def testsIndexHtml = new File(reportDir(testsSubprojectDir), 'index.html')
+        checkFile('an index HTML file', testsIndexHtml, false)
+
+        // ... and 'Hello.scala' is present there ...
+        def helloHtml = new File(reportDir(subprojectDir), 'src/main/scala/hello/Hello.scala.html')
+        checkFile('Hello.scala html file', helloHtml, true)
+
+        // ... and both statement and branch coverage is 100%
+        def branchCoverage = coverage(reportDir(subprojectDir), CoverageType.Branch)
+        def statementCoverage = coverage(reportDir(subprojectDir), CoverageType.Statement)
+        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
+    public void testSeparateTestsWithAnt() throws Exception {
+        testSeparate(true)
+    }
+
+    @Test
+    public void testSeparateTestsWithZinc() throws Exception {
+        testSeparate(false)
+    }
+}

src/test/separate-tests/a-tests/src/main/scala/hello/BaseTest.scala

@@ -0,0 +1,7 @@
+package hello
+
+class BaseTest {
+  def beforeTest() = {
+    println("Running test!")
+  }
+}

src/test/separate-tests/a-tests/src/test/scala/hello/HelloTest.scala

@@ -0,0 +1,13 @@
+package hello
+
+import org.junit.Test
+import org.junit.Assert.assertEquals
+
+class HelloTest extends BaseTest {
+
+  @Test def testText() {
+    beforeTest()
+    assertEquals("Hello World", new Hello().text)
+  }
+
+}

src/test/separate-tests/a/src/main/scala/hello/Hello.scala

@@ -0,0 +1,5 @@
+package hello
+
+class Hello {
+  def text = "Hello World"
+}

src/test/separate-tests/build.gradle

@@ -0,0 +1,64 @@
+description = 'a multi-project with separate tests setup for gradle-scoverage'
+
+buildscript {
+    repositories {
+        // need to get up to the working directory of gradle-plugins build
+        flatDir dir: "${project.projectDir}/../../../build/libs"
+    }
+    dependencies {
+        classpath name: 'gradle-scoverage', version: '+'
+    }
+}
+
+subprojects {
+
+    repositories {
+        mavenCentral()
+    }
+
+    apply plugin: 'scala'
+    apply plugin: 'scoverage'
+
+    dependencies {
+        compile 'org.scala-lang:scala-library:2.11.4'
+        scoverage 'org.scoverage:scalac-scoverage-plugin_2.11:1.0.4',
+            'org.scoverage:scalac-scoverage-runtime_2.11:1.0.4'
+
+        testCompile 'junit:junit:4.11'
+    }
+
+    testScoverage {
+        onlyIf { project.name.endsWith('-tests') }
+    }
+
+    reportScoverage {
+        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
+    }
+    sourceSets {
+        testScoverage {
+            compileClasspath += sourceSets.main.output
+            runtimeClasspath += sourceSets.main.output
+        }
+    }
+    compileScoverageScala {
+        onlyIf { false }
+    }
+}

src/test/separate-tests/settings.gradle

@@ -0,0 +1 @@
+include ':a', ':a-tests'