(#3032) Try to fix code coverage reports

quince-science · Jan 21, 2025 · 292bb18 · 292bb18
1 parent f150ebb
commit 292bb18
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 4 deletions.
diff --git a/.github/workflows/gradle_junit_CalcCoeffEdit.yml b/.github/workflows/gradle_junit_CalcCoeffEdit.yml
@@ -14,7 +14,7 @@ jobs:
       with:
         java-version: 17
     - name: Run CalculationCoefficientsBean multiple edit tests
-      run: ./gradlew calculationCoefficientsBeanEditTest jacocoTestReport
+      run: ./gradlew calculationCoefficientsBeanEditTest calculationCoefficientsBeanEditTestReport
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v4
       with:

diff --git a/.github/workflows/gradle_junit_ExtStdEdit.yml b/.github/workflows/gradle_junit_ExtStdEdit.yml
@@ -14,7 +14,7 @@ jobs:
       with:
         java-version: 17
     - name: Run ExternalStandardsBean multiple edit tests
-      run: ./gradlew externalStandardsBeanEditTest jacocoTestReport
+      run: ./gradlew externalStandardsBeanEditTest externalStandardsBeanEditTestReport
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v4
       with:

diff --git a/.github/workflows/gradle_junit_SensorCalibEdit.yml b/.github/workflows/gradle_junit_SensorCalibEdit.yml
@@ -14,7 +14,7 @@ jobs:
       with:
         java-version: 17
     - name: Run SensorCalibrationsBean multiple edit tests
-      run: ./gradlew sensorCalibrationsBeanEditTest jacocoTestReport
+      run: ./gradlew sensorCalibrationsBeanEditTest sensorCalibrationsBeanEditTestReport
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v4
       with:

diff --git a/.github/workflows/gradle_junit_main.yml b/.github/workflows/gradle_junit_main.yml
@@ -14,7 +14,7 @@ jobs:
       with:
         java-version: 17
     - name: Run small JUnit tests
-      run: ./gradlew testSmall jacocoTestReport 
+      run: ./gradlew testSmall testSmallReport 
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v4
       with:

diff --git a/build.gradle b/build.gradle
@@ -168,27 +168,84 @@ task testSmall(type: Test) {
   }
 }
 
+task testSmallReport(type: JacocoReport) {
+  dependsOn testSmall
+
+  reports {
+    xml.required = true
+    xml.destination = file("${buildDir}/reports/jacoco/report.xml")
+    csv.required = false
+    html.required = false
+  }
+
+  sourceSets sourceSets.main
+  executionData testSmall
+}
+
 task sensorCalibrationsBeanEditTest(type: Test) {
   useJUnitPlatform()
   filter {
     includeTestsMatching "uk.ac.exeter.QuinCe.web.Instrument.SensorCalibrationsBeanMultipleEditTest"
   }
 }
 
+task sensorCalibrationsBeanEditTestReport(type: JacocoReport) {
+  dependsOn sensorCalibrationsBeanEditTest
+
+  reports {
+    xml.required = true
+    xml.destination = file("${buildDir}/reports/jacoco/report.xml")
+    csv.required = false
+    html.required = false
+  }
+
+  sourceSets sourceSets.main
+  executionData sensorCalibrationsBeanEditTest
+}
+
 task calculationCoefficientsBeanEditTest(type: Test) {
   useJUnitPlatform()
   filter {
     includeTestsMatching "uk.ac.exeter.QuinCe.web.Instrument.CalculationCoefficientsBeanMultipleEditTest"
   }
 }
 
+task calculationCoefficientsBeanEditTestReport(type: JacocoReport) {
+  dependsOn calculationCoefficientsBeanEditTest
+
+  reports {
+    xml.required = true
+    xml.destination = file("${buildDir}/reports/jacoco/report.xml")
+    csv.required = false
+    html.required = false
+  }
+
+  sourceSets sourceSets.main
+  executionData calculationCoefficientsBeanEditTest
+}
+
 task externalStandardsBeanEditTest(type: Test) {
   useJUnitPlatform()
   filter {
     includeTestsMatching "uk.ac.exeter.QuinCe.web.Instrument.ExternalStandardsBeanMultipleEditTest"
   }
 }
 
+task externalStandardsBeanEditTestReport(type: JacocoReport) {
+  dependsOn externalStandardsBeanEditTest
+
+  reports {
+    xml.required = true
+    xml.destination = file("${buildDir}/reports/jacoco/report.xml")
+    csv.required = false
+    html.required = false
+  }
+
+  sourceSets sourceSets.main
+  executionData externalStandardsBeanEditTest
+}
+
+
 eclipse {
   wtp {
     facet {