From 5902c6b262195fea1737668d277993932ef62fae Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 24 Aug 2010 18:27:44 +0100
Subject: [PATCH] Adjustments to coverage generation (enable debug logging when
 coverage on).

---
 .gitignore         |  1 +
 build.gradle       |  4 ++++
 gradle/emma.gradle | 16 ++++++++++------
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2285f14a44..7ab06b3337 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ target/
 .DS_Store
 .settings/
 out/
+intellij/
 build/
 *.log
 *.iml
diff --git a/build.gradle b/build.gradle
index dfc5f38131..2a360befe3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,10 @@ configure(coreModuleProjects) {
     sourceSets.main.classesDir = new File(buildDir, "classes/" + project.name.substring("spring-security".length() + 1))
 }
 
+task coreBuild {
+    dependsOn coreModuleProjects*.tasks*.matching { task -> task.name == 'build' }
+}
+
 configure (aspectjProjects) {
     apply from: "$rootDir/gradle/aspectj.gradle"
 }
diff --git a/gradle/emma.gradle b/gradle/emma.gradle
index 5fa1ee3c19..fbc2950f8e 100644
--- a/gradle/emma.gradle
+++ b/gradle/emma.gradle
@@ -8,10 +8,11 @@ dependencies{
     emma "emma:emma_ant:2.0.5312"
 }
 
-def emmaMetaDataFile = "${rootProject.buildDir}/emma/metadata.emma"
+def emmaMetaDataFile = "${rootProject.buildDir}/emma/coverage.em"
+def emmaCoverageFile = "${rootProject.buildDir}/emma/coverage.ec"
 
 task emmaInstrument {
-    dependsOn compileJava
+    dependsOn classes
     doFirst {
         ant.taskdef(resource:"emma_ant.properties", classpath: configurations.emma.asPath)
         ant.path(id: "emmarun.classpath") {
@@ -33,10 +34,10 @@ afterEvaluate {
         tasks.withType(Test.class).each { task ->
             task.dependsOn emmaInstrument
             task.configure() {
-                jvmArgs "-Demma.coverage.out.file=$emmaMetaDataFile", "-Demma.coverage.out.merge=true"
+                jvmArgs '-Dsec.log.level=DEBUG', "-Demma.coverage.out.file=$emmaCoverageFile"
             }
             task.doFirst {
-                setClasspath(files("$buildDir/emma/classes") + configurations.emma + getClasspath())
+                classpath = files("$buildDir/emma/classes") + configurations.emma + classpath
             }
         }
     }
@@ -52,9 +53,12 @@ if (rootProject.getTasksByName('coverageReport', false).isEmpty()) {
                 }
             }
         }
-        ant.emma(enabled: "true", verbosity: "info") { // use "verbose, trace1, trace2, trace3 for more info"
+        ant.emma(enabled: "true", verbosity: "trace1") { // use "verbose, trace1, trace2, trace3 for more info"
             report(sourcepathref:"src.path") {
-                fileset(file: "$emmaMetaDataFile")
+                fileset(dir: rootProject.buildDir) {
+                    include: '*.ec'
+                    include: '*.emma'
+                }
                 txt(outfile: "$rootProject.buildDir/emma/coverage.txt")
                 html(outfile: "$rootProject.buildDir/emma/coverage.html")
 //              xml(outfile: "$rootProject.buildDir/emma/coverage.xml")