try jacocoTestReport

Signed-off-by: BAStos525 <[email protected]>
hyperledger-iroha · Nov 11, 2024 · 0bedf05 · 0bedf05
1 parent fab0f89
commit 0bedf05
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 47 deletions.
diff --git a/.github/workflows/iroha2-pr.yml b/.github/workflows/iroha2-pr.yml
@@ -29,11 +29,11 @@ jobs:
         run: |
           ./gradlew build --info
           ./gradlew test --info
-          ./gradlew testCoverage --info
+          ./gradlew jacocoTestReport --info
           ./gradlew sonar -Dsonar.token=${{ secrets.SONAR_TOKEN }} --info
       - name: Show dirs
         run: |
-          ls /home/vzyabkin/actions-runner/_work/iroha-java/iroha-java/modules/admin-client/build/reports/testCoverage/
+          ls /home/vzyabkin/actions-runner/_work/iroha-java/iroha-java/modules/admin-client/build/reports/jacocoTestReport/
       - name: DefectDojo
         if: always()
         uses: C4tWithShell/[email protected]

diff --git a/build.gradle b/build.gradle
@@ -96,30 +96,40 @@ subprojects {
     // it is disabled by default to publish original version by CI, not a fat jar
     tasks.shadowJar.enabled = false
 
-    task testCoverage(type: JacocoReport) {
-        executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
+    // task jacocoTestReport(type: JacocoReport) {
+    //     executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec")
+
+    //     def sourceDirs = [
+    //             "${project.projectDir}/src/main/java",
+    //             "${project.projectDir}/src/main/kotlin",
+    //             "${project.projectDir}/src/debug/java",
+    //             "${project.projectDir}/src/debug/kotlin"
+    //     ]
+    //     sourceDirectories.from = files(sourceDirs)
+
+    //     reports {
+    //         xml.required = true
+    //         html.required = true
+    //     }
+    // }
 
-        def sourceDirs = [
-                "${project.projectDir}/src/main/java",
-                "${project.projectDir}/src/main/kotlin",
-                "${project.projectDir}/src/debug/java",
-                "${project.projectDir}/src/debug/kotlin"
-        ]
-        sourceDirectories.from = files(sourceDirs)
+    test {
+        useJUnitPlatform()
+    }
+
+    // jacoco {
+    //     toolVersion = "0.8.8"
+    //     reportsDirectory = file("$buildDir/reports/")
+    // }
 
+    jacocoTestReport {
         reports {
             xml.required = true
-            html.required = true
         }
     }
 
-    test {
-        useJUnitPlatform()
-    }
-
-    jacoco {
-        toolVersion = "0.8.8"
-        reportsDirectory = file("$buildDir/reports/")
+    plugins.withType(JacocoPlugin) {
+        tasks["test"].finalizedBy 'jacocoTestReport'
     }
 
     sonar {
@@ -135,7 +145,7 @@ subprojects {
             }
             property "sonar.java.test.binaries", "${project.projectDir}/build/test-results/test/binary"
             property "sonar.junit.reportPaths", "${project.projectDir}/build/test-results/test/"
-            property "sonar.coverage.jacoco.xmlReportPaths", "${project.projectDir}/build/reports/testCoverage/*.xml"
+            //property "sonar.coverage.jacoco.xmlReportPaths", "${project.projectDir}/build/reports/jacocoTestReport/*.xml"
         }
     }
 }

diff --git a/examples/tutorial/build.gradle.kts b/examples/tutorial/build.gradle.kts
@@ -11,11 +11,11 @@ dependencies {
     api(project(":admin-client"))
 }
 
-tasks.testCoverage {
-    mustRunAfter(":admin-client:testCoverage")
-    mustRunAfter(":block:testCoverage")
-    mustRunAfter(":client:testCoverage")
-    mustRunAfter(":codegen:testCoverage")
-    mustRunAfter(":model:testCoverage")
-    mustRunAfter(":test-tools:testCoverage")
+tasks.jacocoTestReport {
+    mustRunAfter(":admin-client:jacocoTestReport")
+    mustRunAfter(":block:jacocoTestReport")
+    mustRunAfter(":client:jacocoTestReport")
+    mustRunAfter(":codegen:jacocoTestReport")
+    mustRunAfter(":model:jacocoTestReport")
+    mustRunAfter(":test-tools:jacocoTestReport")
 }
diff --git a/modules/block/build.gradle b/modules/block/build.gradle
@@ -8,6 +8,6 @@ dependencies {
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVer"
 }
 
-testCoverage {
-    mustRunAfter(":admin-client:testCoverage")
+jacocoTestReport {
+    mustRunAfter(":admin-client:jacocoTestReport")
 }
diff --git a/modules/client/build.gradle b/modules/client/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     testApi project(":test-tools")
 }
 
-testCoverage {
-    mustRunAfter(":admin-client:testCoverage")
-    mustRunAfter(":block:testCoverage")
+jacocoTestReport {
+    mustRunAfter(":admin-client:jacocoTestReport")
+    mustRunAfter(":block:jacocoTestReport")
 }
diff --git a/modules/codegen/build.gradle b/modules/codegen/build.gradle
@@ -21,8 +21,8 @@ task generate(type: JavaExec) {
     finalizedBy ':model:formatKotlin'
 }
 
-testCoverage {
-    mustRunAfter(":admin-client:testCoverage")
-    mustRunAfter(":block:testCoverage")
-    mustRunAfter(":client:testCoverage")
+jacocoTestReport {
+    mustRunAfter(":admin-client:jacocoTestReport")
+    mustRunAfter(":block:jacocoTestReport")
+    mustRunAfter(":client:jacocoTestReport")
 }
diff --git a/modules/model/build.gradle b/modules/model/build.gradle
@@ -1,6 +1,6 @@
-testCoverage {
-    mustRunAfter(":admin-client:testCoverage")
-    mustRunAfter(":block:testCoverage")
-    mustRunAfter(":client:testCoverage")
-    mustRunAfter(":codegen:testCoverage")
+jacocoTestReport {
+    mustRunAfter(":admin-client:jacocoTestReport")
+    mustRunAfter(":block:jacocoTestReport")
+    mustRunAfter(":client:jacocoTestReport")
+    mustRunAfter(":codegen:jacocoTestReport")
 }
diff --git a/modules/test-tools/build.gradle b/modules/test-tools/build.gradle
@@ -18,10 +18,10 @@ dependencies {
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlinVer"
 }
 
-testCoverage {
-    mustRunAfter(":admin-client:testCoverage")
-    mustRunAfter(":block:testCoverage")
-    mustRunAfter(":client:testCoverage")
-    mustRunAfter(":codegen:testCoverage")
-    mustRunAfter(":model:testCoverage")
+jacocoTestReport {
+    mustRunAfter(":admin-client:jacocoTestReport")
+    mustRunAfter(":block:jacocoTestReport")
+    mustRunAfter(":client:jacocoTestReport")
+    mustRunAfter(":codegen:jacocoTestReport")
+    mustRunAfter(":model:jacocoTestReport")
 }