Update test naming schema

close #48
isuPatches · Jul 2, 2017 · 2924875 · 2924875
1 parent 5495cf9
commit 2924875
Show file tree

Hide file tree

Showing 4 changed files with 203 additions and 185 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,4 +21,4 @@ before_script:
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
 
-script: ./gradlew clean connectedAndroidTest -PdisablePreDex --stacktrace
+script: ./gradlew clean connectedAndroidTest -PdisablePreDex --debug --stacktrace
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
@@ -16,17 +16,28 @@ def classDirs = fileTree(
                    '**/*Factory*.class',
                    '**/*$Builder*'])
 
-task jacocoDebugTestReport(type: JacocoReport, dependsOn: ["connectedDebugAndroidTest"]) {
+task jacocoDebugTestReport(type: JacocoReport) {
+    dependsOn = ["connectedDebugAndroidTest"]
     group = "Reporting"
-    description = "Generate Jacoco coverage report for debug tests"
+    description = "Run tests and generate Jacoco coverage report for debug"
     classDirectories = classDirs
     additionalSourceDirs = files(coverageSourceDirs)
     sourceDirectories = files(coverageSourceDirs)
     executionData = files([fileTree(dir: 'build/outputs/code-coverage/connected', include: '**/*.ec')])
 
-    onlyIf = {
-        true
+    reports {
+        xml.enabled = true
+        html.enabled = true
     }
+}
+
+task jacocoDebugReport(type: JacocoReport) {
+    group = "Reporting"
+    description = "Generate Jacoco coverage report for debug"
+    classDirectories = classDirs
+    additionalSourceDirs = files(coverageSourceDirs)
+    sourceDirectories = files(coverageSourceDirs)
+    executionData = files([fileTree(dir: 'build/outputs/code-coverage/connected', include: '**/*.ec')])
 
     reports {
         xml.enabled = true