Merge pull request #12 from jenkinsci/wrong-cobertura-counters

Parse all digits of a counter before and after the slash

pom.xml

@@ -45,7 +45,7 @@
 
   <properties>
     <scmTag>HEAD</scmTag>
-    <revision>0.23.0</revision>
+    <revision>0.22.2</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <module.name>edu.hm.hafner.coverage</module.name>

src/main/java/edu/hm/hafner/coverage/parser/CoberturaParser.java

@@ -41,7 +41,7 @@ public class CoberturaParser extends CoverageParser {
     private static final QName METHOD = new QName("method");
     private static final QName LINE = new QName("line");
 
-    private static final Pattern BRANCH_PATTERN = Pattern.compile(".*(?<covered>\\d+)/(?<total>\\d+)\\)");
+    private static final Pattern BRANCH_PATTERN = Pattern.compile(".*\\((?<covered>\\d+)/(?<total>\\d+)\\)");
 
     /** Required attributes of the XML elements. */
     private static final QName NAME = new QName("name");

src/test/java/edu/hm/hafner/coverage/parser/CoberturaParserTest.java

@@ -28,6 +28,14 @@ CoberturaParser createParser() {
         return new CoberturaParser();
     }
 
+    @Test
+    void shouldCountCorrectly625() {
+        Node tree = readReport("cobertura-counter-aggregation.xml");
+
+        var expectedValue = new CoverageBuilder().setCovered(31).setMissed(1).setMetric(BRANCH).build();
+        assertThat(tree.getValue(BRANCH)).isPresent().contains(expectedValue);
+    }
+
     @Test
     void shouldReadCoberturaIssue610() {
         Node tree = readReport("coverage-missing-sources.xml");