Added integrated view of test coverage. Turn retro lambda off temporarily

mperry · mperry · commit cf074892be69 · 2015-08-30T23:53:27.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -32,6 +32,12 @@ if (JavaVersion.current().isJava8Compatible()) {
 
 allprojects {
 
+    apply plugin: "jacoco"
+
+    jacoco {
+        toolVersion = "0.7.1.201405082137"
+    }
+
 	defaultTasks "build"
 
 	ext {
@@ -43,7 +49,7 @@ allprojects {
         fjConsumeVersion = "4.4"
 
         signModule = false
-        useRetroLambda = true
+        useRetroLambda = false
 
         projectTitle = "Functional Java"
 		projectName = "functionaljava"
@@ -70,6 +76,10 @@ allprojects {
         retroLambdaTarget = JavaVersion.VERSION_1_7
     }
 
+    repositories {
+        jcenter()
+    }
+
 	version = fjVersion
 	group = "org.functionaljava"
 
@@ -96,6 +106,28 @@ subprojects {
 			options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 		}
 	}
+
+    jacocoTestReport {
+        reports {
+            html.enabled = true
+            xml.enabled = true
+            csv.enabled = false
+//        html.destination "${buildDir}/jacocoHtml"
+        }
+    }
+
+}
+
+task coverageRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
+    dependsOn = subprojects.test
+    sourceDirectories = files(subprojects.sourceSets.main.allSource.srcDirs)
+    classDirectories =  files(subprojects.sourceSets.main.output)
+    executionData = files(subprojects.jacocoTestReport.executionData)
+    reports {
+        html.enabled = true
+        xml.enabled = true
+        csv.enabled = false
+    }
 }
 
 configure(subprojects.findAll { it.name != "props-core" }) {
diff --git a/consume/build.gradle b/consume/build.gradle
@@ -3,4 +3,6 @@ archivesBaseName = "${project.projectName}-${project.name}"
 
 dependencies {
     compile("$group:$projectName:$fjConsumeVersion")
+
+    testCompile dependencyJunit
 }
diff --git a/consume/src/test/java/fj/EmptyTest.java b/consume/src/test/java/fj/EmptyTest.java
@@ -0,0 +1,18 @@
+package fj;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import org.junit.Assert;
+
+/**
+ * Created by MarkPerry on 30/08/2015.
+ */
+public class EmptyTest {
+
+    @Ignore @Test
+    public void missing() {
+        Assert.fail("not implemented");
+
+    }
+}
diff --git a/core/build.gradle b/core/build.gradle
@@ -1,6 +1,4 @@
 
-apply plugin: "jacoco"
-
 ext {
     signModule = true
 }
@@ -18,18 +16,6 @@ uploadArchives.enabled = true
 
 configureAllRetroLambda()
 
-jacoco {
-    toolVersion = "0.7.1.201405082137"
-}
-
-jacocoTestReport {
-    reports {
-        xml.enabled false
-        csv.enabled false
-        html.destination "${buildDir}/jacocoHtml"
-    }
-}
-
 task coverage(dependsOn: ["test", "jacocoTestReport"]) << {
 
 }
diff --git a/demo/src/test/java/fj/EmptyTest.java b/demo/src/test/java/fj/EmptyTest.java
@@ -0,0 +1,18 @@
+package fj;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import org.junit.Assert;
+
+/**
+ * Created by MarkPerry on 30/08/2015.
+ */
+public class EmptyTest {
+
+    @Ignore @Test
+    public void missing() {
+        Assert.fail("not implemented");
+
+    }
+}
diff --git a/java-core/src/test/java/fj/EmptyTest.java b/java-core/src/test/java/fj/EmptyTest.java
@@ -0,0 +1,17 @@
+package fj;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.Assert;
+
+/**
+ * Created by MarkPerry on 30/08/2015.
+ */
+public class EmptyTest {
+
+    @Ignore @Test
+    public void missing() {
+        Assert.fail("not implemented");
+
+    }
+}
diff --git a/java8/src/test/java/fj/EmptyTest.java b/java8/src/test/java/fj/EmptyTest.java
@@ -0,0 +1,17 @@
+package fj;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Created by MarkPerry on 30/08/2015.
+ */
+public class EmptyTest {
+
+    @Ignore @Test
+    public void missing() {
+        Assert.fail("not implemented");
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,6 @@ archivesBaseName = "${project.projectName}-${project.name}"`
`3`	`3`
`4`	`4`	`dependencies {`
`5`	`5`	`compile("$group:$projectName:$fjConsumeVersion")`
	`6`	`+`
	`7`	`+ testCompile dependencyJunit`
`6`	`8`	`}`