Added support for TRACE32 parser and metrics

README.md

@@ -14,6 +14,7 @@ It has support for the following report formats:
 - [JaCoCo](https://www.jacoco.org/) code coverage results
 - [OpenCover](https://github.com/OpenCover/opencover) code coverage results
 - [VectorCAST](https://www.vector.com/int/en/products/products-a-z/software/vectorcast) code coverage results including MC/DC, Function, Function Call coverages
+- [TRACE32](https://www.lauterbach.com) code coverage results
 - [PIT](https://pitest.org/) mutation coverage results
 - [JUnit](https://junit.org/junit5/) test results
 - [NUnit](https://nunit.org) test results
@@ -113,6 +114,7 @@ The Coverage Plug-in supports the following report formats:
 - [Cobertura](https://cobertura.github.io/cobertura/): Code Coverage
 - [OpenCover](https://github.com/OpenCover/opencover): Code Coverage
 - [VectorCAST](https://www.vector.com/int/en/products/products-a-z/software/vectorcast) Code Coverage including MC/DC, Function, Function Call coverages
+- [TRACE32](https://www.lauterbach.com) Code Coverage
 - [PIT](https://pitest.org/): Mutation Coverage
 - [JUnit](https://ant.apache.org/manual/Tasks/junitreport.html): Test Results
 - [NUnit](https://nunit.org/): Test Results

plugin/pom.xml

@@ -13,7 +13,7 @@
 
   <name>Coverage Plugin</name>
   <description>Collects reports of code coverage or mutation coverage tools and visualizes the results. It has support
-    for the following report formats: JaCoCo, Cobertura, and PIT.</description>
+    for the following report formats: JaCoCo, Cobertura, PIT and TRACE32.</description>
   <url>https://github.com/jenkinsci/coverage-plugin</url>
 
   <licenses>
@@ -35,7 +35,7 @@
     <maven.deploy.skip>false</maven.deploy.skip>
 
     <!-- Library Dependencies Versions -->
-    <coverage-model.version>0.66.0</coverage-model.version>
+    <coverage-model.version>0.67.0-rc1288.7c1e4750a_8b_a_</coverage-model.version>
 
     <!-- Test Library Dependencies Versions -->
     <xmlunit.version>2.11.0</xmlunit.version>

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/charts/CoverageTrendChart.java

@@ -63,6 +63,11 @@ public LinesChartModel create(final Iterable<BuildResult<CoverageStatistics>> re
             addSeriesIfAvailable(dataSet, model, Metric.MCDC_PAIR, JenkinsPalette.RED.light());
             addSeriesIfAvailable(dataSet, model, Metric.FUNCTION_CALL, JenkinsPalette.RED.dark());
 
+            /* TRACE32 metrics */
+            addSeriesIfAvailable(dataSet, model, Metric.STMT_DC, JenkinsPalette.RED.light());
+            addSeriesIfAvailable(dataSet, model, Metric.STMT_CC, JenkinsPalette.RED.light());
+            addSeriesIfAvailable(dataSet, model, Metric.CONDITION, JenkinsPalette.RED.normal());
+
             model.useContinuousRangeAxis();
             model.computeVisibleRange();
             model.setRangeMax(100); // Restrict the range to 100%

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageBuildAction.java

@@ -649,7 +649,10 @@ NavigableSet<Metric> getMetricsForSummary() {
                         // software metrics
                         Metric.LOC, Metric.NCSS, Metric.TESTS,
                         Metric.CYCLOMATIC_COMPLEXITY, Metric.COGNITIVE_COMPLEXITY, Metric.NPATH_COMPLEXITY,
-                        Metric.MCDC_PAIR, Metric.FUNCTION_CALL));
+                        Metric.MCDC_PAIR, Metric.FUNCTION_CALL,
+                        // TRACE32 metrics
+                        Metric.STMT_CC, Metric.STMT_DC, Metric.CONDITION, Metric.BYTES
+                ));
     }
 
     /**

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageChecksPublisher.java

@@ -540,9 +540,10 @@ NavigableSet<Metric> getTitleMetrics() {
 
         NavigableSet<Metric> getOverviewMetrics() {
             return new TreeSet<>(
-                    Set.of(Metric.LINE, Metric.LOC, Metric.BRANCH, Metric.CYCLOMATIC_COMPLEXITY,
-                            Metric.MUTATION, Metric.TEST_STRENGTH, Metric.TESTS,
-                            Metric.MCDC_PAIR, Metric.FUNCTION_CALL));
+                    Set.of(Metric.LINE, Metric.LOC, Metric.BRANCH, Metric.INSTRUCTION,
+                            Metric.CYCLOMATIC_COMPLEXITY, Metric.MUTATION, Metric.TEST_STRENGTH,
+                            Metric.TESTS, Metric.MCDC_PAIR, Metric.FUNCTION_CALL,
+                            Metric.STMT_DC, Metric.STMT_CC, Metric.CONDITION, Metric.BYTES));
         }
     }
 

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageTableModel.java

@@ -117,6 +117,8 @@
                 Messages.Column_DeltaLineCoverage("Δ"), columns);
         configureValueColumn("branchCoverage", Metric.BRANCH, Messages.Column_BranchCoverage(),
                 Messages.Column_DeltaBranchCoverage("Δ"), columns);
+        configureValueColumn("instructionCoverage", Metric.INSTRUCTION, Messages.Column_InstructionCoverage(),
+                Messages.Column_DeltaInstructionCoverage("Δ"), columns);
 
         /* VectorCAST metrics */
         configureValueColumn("mcdcPairCoverage", Metric.MCDC_PAIR, Messages.Column_MCDCPairs(),
@@ -129,6 +131,12 @@
         configureValueColumn("testStrength", Metric.TEST_STRENGTH, Messages.Column_TestStrength(),
                 Messages.Column_DeltaTestStrength("Δ"), columns);
 
+        /* TRACE32 metrics */
+        configureValueColumn("stmtDcCoverage", Metric.STMT_DC, Metric.STMT_DC.getDisplayName(), SKIP_DELTA, columns);
+        configureValueColumn("stmtCcCoverage", Metric.STMT_CC, Metric.STMT_CC.getDisplayName(), SKIP_DELTA, columns);
+        configureValueColumn("conditionCoverage", Metric.CONDITION, Metric.CONDITION.getDisplayName(), SKIP_DELTA, columns);
+        configureValueColumn("bytesCoverage", Metric.BYTES, Metric.BYTES.getDisplayName(), SKIP_DELTA, columns);
+
         var entries = new EnumMap<>(Map.of(
                 Metric.LOC, 200,
                 Metric.TESTS, 500,
@@ -247,38 +255,62 @@
             return createColoredCoverageColumn(getCoverageOfNode(Metric.BRANCH));
         }
 
+        public DetailedCell<?> getInstructionCoverage() {
+            return createColoredCoverageColumn(getCoverageOfNode(Metric.INSTRUCTION));
+        }
+
         public DetailedCell<?> getMethodCoverage() {
             return createColoredCoverageColumn(getCoverageOfNode(Metric.METHOD));
         }
 
         public DetailedCell<?> getMcdcPairCoverage() {
             return createColoredCoverageColumn(getCoverageOfNode(Metric.MCDC_PAIR));
         }
 
         public DetailedCell<?> getFunctionCallCoverage() {
             return createColoredCoverageColumn(getCoverageOfNode(Metric.FUNCTION_CALL));
         }
 
         public DetailedCell<?> getMutationCoverage() {
             return createColoredCoverageColumn(getCoverageOfNode(Metric.MUTATION));
         }
 
         public DetailedCell<?> getTestStrength() {
             return createColoredCoverageColumn(getCoverageOfNode(Metric.TEST_STRENGTH));
         }
 
+        public DetailedCell<?> getStmtDcCoverage() {
+            return createColoredCoverageColumn(getCoverageOfNode(Metric.STMT_DC));
+        }
+
+        public DetailedCell<?> getStmtCcCoverage() {
+            return createColoredCoverageColumn(getCoverageOfNode(Metric.STMT_CC));
+        }
+
+        public DetailedCell<?> getConditionCoverage() {
+            return createColoredCoverageColumn(getCoverageOfNode(Metric.CONDITION));
+        }
+
+        public DetailedCell<?> getBytesCoverage() {
+            return createColoredCoverageColumn(getCoverageOfNode(Metric.BYTES));
+        }
+
         Coverage getCoverageOfNode(final Metric metric) {
             return file.getTypedValue(metric, Coverage.nullObject(metric));
         }
 
         public DetailedCell<?> getLineCoverageDelta() {
             return createColoredFileCoverageDeltaColumn(Metric.LINE);
         }
 
         public DetailedCell<?> getBranchCoverageDelta() {
             return createColoredFileCoverageDeltaColumn(Metric.BRANCH);
         }
 
+        public DetailedCell<?> getInstructionCoverageDelta() {
+            return createColoredFileCoverageDeltaColumn(Metric.INSTRUCTION);
+        }
+
         public DetailedCell<?> getMutationCoverageDelta() {
             return createColoredFileCoverageDeltaColumn(Metric.MUTATION);
         }

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageTool.java

@@ -250,7 +250,10 @@ public enum Parser {
                 "symbol-footsteps-outline plugin-ionicons-api"),
         XUNIT(Messages._Parser_Xunit(), ParserType.TEST,
                 "**/xunit.xml,**/TestResult.xml",
-                "symbol-solid/list-check plugin-font-awesome-api");
+                "symbol-solid/list-check plugin-font-awesome-api"),
+        TRACE32(Messages._Parser_TRACE32(), ParserType.COVERAGE,
+                "**/index.xml",
+                "symbol-footsteps-outline plugin-ionicons-api");
 
         private final Localizable displayName;
         private final ParserType parserType;

plugin/src/main/java/io/jenkins/plugins/coverage/metrics/steps/CoverageViewModel.java

@@ -81,8 +81,9 @@ public class CoverageViewModel extends DefaultAsyncTableContentProvider implemen
 
     private static final ElementFormatter FORMATTER = new ElementFormatter();
     private static final Set<Metric> TREE_METRICS = Set.of(
-            Metric.LINE, Metric.BRANCH, Metric.MUTATION, Metric.TEST_STRENGTH, Metric.CYCLOMATIC_COMPLEXITY, Metric.TESTS,
-            Metric.MCDC_PAIR, Metric.FUNCTION_CALL, Metric.COGNITIVE_COMPLEXITY, Metric.NCSS, Metric.NPATH_COMPLEXITY);
+            Metric.LINE, Metric.BRANCH, Metric.INSTRUCTION, Metric.MUTATION, Metric.TEST_STRENGTH, Metric.CYCLOMATIC_COMPLEXITY,
+            Metric.TESTS, Metric.MCDC_PAIR, Metric.FUNCTION_CALL, Metric.COGNITIVE_COMPLEXITY, Metric.NCSS, Metric.NPATH_COMPLEXITY,
+            Metric.STMT_DC, Metric.STMT_CC, Metric.CONDITION, Metric.BYTES);
     private final Run<?, ?> owner;
     private final String displayName;
     private final CoverageStatistics statistics;

plugin/src/main/resources/io/jenkins/plugins/coverage/metrics/model/Messages.properties

@@ -19,6 +19,10 @@ Metric.FUNCTION_CALL=Function Call Coverage
 Metric.NCSS=NCSS
 Metric.COGNITIVE_COMPLEXITY=Cognitive Complexity
 Metric.NPATH=NPath Complexity
+Metric.STMT_DC=Statement + Decision Coverage
+Metric.STMT_CC=Statement + Condition Coverage
+Metric.CONDITION=Condition Coverage
+Metric.BYTES=Bytes Coverage
 
 Metric.Short.CONTAINER=Container
 Metric.Short.MODULE=Module
@@ -41,6 +45,10 @@ Metric.Short.FUNCTION_CALL=Function Call
 Metric.Short.NCSS=NCSS
 Metric.Short.COGNITIVE_COMPLEXITY=Cognitive Complexity
 Metric.Short.NPATH=NPath Complexity
+Metric.Short.STMT_DC=Statement + DC
+Metric.Short.STMT_CC=Statement + CC
+Metric.Short.CONDITION=Condition
+Metric.Short.BYTES=Bytes
 
 Metric.MUTATION.Killed=Killed
 Metric.MUTATION.Survived=Survived

plugin/src/main/resources/io/jenkins/plugins/coverage/metrics/steps/Messages.properties

@@ -12,6 +12,7 @@ Parser.OpenCover=OpenCover Coverage Reports
 Parser.PIT=PIT Mutation Testing Reports
 Parser.VectorCAST=VectorCAST Coverage Results
 Parser.Xunit=XUnit Test Results
+Parser.TRACE32=TRACE32 Coverage Reports
 
 Coverage.Not.Available=N/A
 Coverage.Permission.Denied=You do not have Jenkins' WORKSPACE permission to view the source code
@@ -32,6 +33,8 @@ Column.LineCoverage=Line
 Column.DeltaLineCoverage=Line {0}
 Column.BranchCoverage=Branch
 Column.DeltaBranchCoverage=Branch {0}
+Column.InstructionCoverage=Instruction
+Column.DeltaInstructionCoverage=Instruction {0}
 Column.MutationCoverage=Mutation
 Column.TestStrength=Test Strength
 Column.DeltaMutationCoverage=Mutation {0}

plugin/src/test/java/io/jenkins/plugins/coverage/metrics/steps/CoveragePluginITest.java

@@ -181,6 +181,7 @@ private void verifyJaCoCoAction(final CoverageBuildAction coverageResult) {
                         "Package",
                         "Line",
                         "Branch",
+                        "Instruction",
                         "LOC",
                         "Complexity");
         assertThat(tableModel.getRows())

plugin/src/test/resources/io/jenkins/plugins/coverage/metrics/steps/coverage-publisher-overview.checks-expected-result

@@ -3,5 +3,6 @@
 No changes detected, that affect the code coverage.
 * Line Coverage: 91.02% (294/323)
 * Branch Coverage: 93.97% (109/116)
+* Instruction Coverage: 93.33% (1260/1350)
 * Lines of Code: 323
 * Cyclomatic Complexity: 160

plugin/src/test/resources/io/jenkins/plugins/coverage/metrics/steps/coverage-publisher-summary.checks-expected-result

@@ -9,6 +9,7 @@
 * **[Overall project (difference to reference job)](http://127.0.0.1:8080/job/pipeline-coding-style/job/5/coverage#overview)**
   * Line Coverage: 91.02% (294/323) - Delta: +50.00%
   * Branch Coverage: 93.97% (109/116)
+  * Instruction Coverage: 93.33% (1260/1350)
   * Lines of Code: 323
   * Cyclomatic Complexity: 160
 * **[Modified files (difference to reference job)](http://127.0.0.1:8080/job/pipeline-coding-style/job/5/coverage#modifiedFilesCoverage)**