From 9df7147c8bf6e83c7a02b664d7e0bb1613570c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 4 Dec 2014 19:58:08 +0100
Subject: Fix jacoco

---
 OpenKeychain-Test/build.gradle | 47 +++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

(limited to 'OpenKeychain-Test')

diff --git a/OpenKeychain-Test/build.gradle b/OpenKeychain-Test/build.gradle
index 83932161f..f621428ed 100644
--- a/OpenKeychain-Test/build.gradle
+++ b/OpenKeychain-Test/build.gradle
@@ -47,30 +47,29 @@ android {
     projectUnderTest ':OpenKeychain'
 }
 
-//jacoco {
-//    //toolVersion = "0.7.0.201403182114"
-//    toolVersion = "0.7.2.201409121644"
-//}
-//
-//
-//coverageSourceDirs = [
-//        '../OpenKeychain/src/main/java',
-//        '../OpenKeychain/src/gen',
-//        '../OpenKeychain/build/source/apt/debug',
-//        '../OpenKeychain/build/source/generated/buildConfig/debug',
-//        '../OpenKeychain/build/source/generated/r/debug'
-//        ]
-
-//jacocoTestReport {
-//    reports {
-//        xml.enabled = true
-//        html.destination "${buildDir}/jacocoHtml"
-//    }
-//    // class R is used, but usage will not be covered, so ignore this class from report
-//    classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
-//    additionalSourceDirs = files(coverageSourceDirs)
-//    executionData = files('build/jacoco/testDebug.exec')
-//}
+jacoco {
+    toolVersion = "0.7.2.201409121644"
+}
+
+
+def coverageSourceDirs = [
+        '../OpenKeychain/src/main/java',
+        '../OpenKeychain/src/gen',
+        '../OpenKeychain/build/source/apt/debug',
+        '../OpenKeychain/build/source/generated/buildConfig/debug',
+        '../OpenKeychain/build/source/generated/r/debug'
+    ]
+
+jacocoTestReport {
+    reports {
+        xml.enabled = true
+        html.destination "${buildDir}/jacocoHtml"
+    }
+    // class R is used, but usage will not be covered, so ignore this class from report
+    classDirectories = fileTree(dir: '../OpenKeychain/build/intermediates/classes/debug/org/sufficientlysecure/keychain', exclude: [ 'R*.class' ])
+    additionalSourceDirs = files(coverageSourceDirs)
+    executionData = files('build/jacoco/testDebug.exec')
+}
 
 // new workaround to force add custom output dirs for android studio
 task addTest {
-- 
cgit v1.2.3