From 6f6e2470d89206730f3e2c2218cdd68df90750ee Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 26 Jun 2018 21:54:26 +0200 Subject: [PATCH] Enable jacoco coverage for subsonic-api-image-loader module. Signed-off-by: Yahor Berdnikau --- gradle_scripts/jacoco.gradle | 13 ++++++++-- subsonic-api-image-loader/build.gradle | 35 ++++++++------------------ 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/gradle_scripts/jacoco.gradle b/gradle_scripts/jacoco.gradle index 5be89860..c8209068 100644 --- a/gradle_scripts/jacoco.gradle +++ b/gradle_scripts/jacoco.gradle @@ -21,6 +21,7 @@ def createJacocoFullReportTask() { description = "Generate full Jacoco coverage report including all modules." def subsonicApi = project.findProject("subsonic-api") + def subsonicApiImageLoader = project.findProject("subsonic-api-image-loader") def ultrasonicApp = project.findProject("ultrasonic") def cache = project.findProject("cache") @@ -29,6 +30,10 @@ def createJacocoFullReportTask() { dir: "${subsonicApi.buildDir}/classes/main", excludes: subsonicApi.jacocoExclude ), + fileTree( + dir: "${subsonicApiImageLoader.buildDir}/intermediates/classes/debug/org", + excludes: subsonicApiImageLoader.jacocoExclude + ), fileTree( dir: "${ultrasonicApp.buildDir}/intermediates/classes/debug/org", excludes: ultrasonicApp.jacocoExclude @@ -38,8 +43,12 @@ def createJacocoFullReportTask() { excludes: cache.jacocoExclude ) ) - sourceDirectories = files(subsonicApi.sourceSets.main.getAllSource(), - ultrasonicApp.extensions.getByName('android').sourceSets.main.java.sourceFiles) + sourceDirectories = files( + subsonicApi.sourceSets.main.getAllSource(), + subsonicApiImageLoader.extensions.getByName('android').sourceSets.main.java.sourceFiles, + ultrasonicApp.extensions.getByName('android').sourceSets.main.java.sourceFiles, + cache.sourceSets.main.getAllSource(), + ) executionData = files("${buildDir}/jacoco/jacoco.exec") reports { diff --git a/subsonic-api-image-loader/build.gradle b/subsonic-api-image-loader/build.gradle index 7fc23d69..cd7ead54 100644 --- a/subsonic-api-image-loader/build.gradle +++ b/subsonic-api-image-loader/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -//apply plugin: 'jacoco' +apply plugin: 'jacoco-android' apply from: '../gradle_scripts/code_quality.gradle' android { @@ -40,27 +40,14 @@ jacoco { toolVersion(versions.jacoco) } -//ext { -// jacocoExclude = [] -//} +ext { + jacocoExclude = [] +} -//jacocoTestReport { -// reports { -// html.enabled true -// csv.enabled false -// xml.enabled true -// } -// -// afterEvaluate { -// classDirectories = files(classDirectories.files.collect { -// fileTree(dir: it, excludes: jacocoExclude) -// }) -// } -//} -// -//test.finalizedBy jacocoTestReport -//test { -// jacoco { -// excludes += jacocoExclude -// } -//} +jacocoAndroidUnitTestReport { + excludes += jacocoExclude +} + +afterEvaluate { + testDebugUnitTest.finalizedBy jacocoTestDebugUnitTestReport +} \ No newline at end of file