Merge pull request #475 from codacy/fix-cobertura

fix: [Cobertura] Merge results on the same line instead of replacing
codacy · Oct 31, 2023 · 590a6cb · 590a6cb
2 parents 5f6caf9 + 05a7290
commit 590a6cb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/coverage-parser/src/main/scala/com/codacy/parsers/implementation/CoberturaParser.scala b/coverage-parser/src/main/scala/com/codacy/parsers/implementation/CoberturaParser.scala
@@ -7,6 +7,7 @@ import com.codacy.parsers.util.MathUtils._
 import com.codacy.parsers.util.TextUtils
 import com.codacy.parsers.{CoverageParser, XmlReportParser}
 
+import scala.collection.mutable
 import scala.xml.{Elem, NodeSeq}
 
 object CoberturaParser extends CoverageParser with XmlReportParser {
@@ -50,12 +51,18 @@ object CoberturaParser extends CoverageParser with XmlReportParser {
     }
     val fileHit = if (classHit.nonEmpty) { classHit.sum / classHit.length } else 0
 
-    val lineHitMap: Map[Int, Int] =
-      (for {
-        xClass <- classes
-        line <- xClass \\ "line"
-      } yield (line \@ "number").toInt -> (line \@ "hits").toIntOrMaxValue).toMap
+    val map = mutable.Map.empty[Int, Int]
 
-    CoverageFileReport(sourceFilename, fileHit, lineHitMap)
+    for {
+      xClass <- classes
+      line <- xClass \\ "line"
+    } {
+      val key = (line \@ "number").toInt
+      val value = (line \@ "hits").toIntOrMaxValue
+
+      map(key) = map.get(key).getOrElse(0) + value
+    }
+
+    CoverageFileReport(sourceFilename, fileHit, map.toMap)
   }
 }
diff --git a/coverage-parser/src/test/resources/test_cobertura.xml b/coverage-parser/src/test/resources/test_cobertura.xml
@@ -9,6 +9,10 @@
                         <line number="4" hits="1"/>
                         <line number="5" hits="1"/>
                         <line number="6" hits="2"/>
+                        <line number="7" hits="1"/>
+                        <line number="7" hits="0"/>
+                        <line number="8" hits="1"/>
+                        <line number="8" hits="2"/>
                     </lines>
                 </class>
                 <class line-rate="0.87" name="TestSourceFile" filename="coverage-parser/src/test/resources/TestSourceFile.scala">

diff --git a/coverage-parser/src/test/scala/com/codacy/parsers/CoberturaParserTest.scala b/coverage-parser/src/test/scala/com/codacy/parsers/CoberturaParserTest.scala
@@ -36,7 +36,7 @@ class CoberturaParserTest extends WordSpec with BeforeAndAfterAll with Matchers
           CoverageFileReport(
             "coverage-parser/src/test/resources/TestSourceFile.scala",
             87,
-            Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 3 -> 0, 4 -> 1)
+            Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 3 -> 0, 4 -> 1, 7 -> 1, 8 -> 3)
           )
         )
       )

diff --git a/coverage-parser/src/test/scala/com/codacy/parsers/CoverageParserFactoryTest.scala b/coverage-parser/src/test/scala/com/codacy/parsers/CoverageParserFactoryTest.scala
@@ -21,7 +21,7 @@ class CoverageParserFactoryTest extends WordSpec with BeforeAndAfterAll with Mat
           CoverageFileReport(
             "coverage-parser/src/test/resources/TestSourceFile.scala",
             87,
-            Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 3 -> 0, 4 -> 1)
+            Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 3 -> 0, 4 -> 1, 7 -> 1, 8 -> 3)
           )
         )
       )

diff --git a/graalvm/build-deps.sh b/graalvm/build-deps.sh
@@ -12,7 +12,7 @@ export CC=$TOOLCHAIN_DIR/bin/gcc
 
 zlib='zlib-1.2.13'
 zlibtargz=$zlib.tar.gz
-curl https://zlib.net/$zlibtargz --output $zlibtargz
+curl https://zlib.net/fossils/$zlibtargz --output $zlibtargz
 tar -xf $zlibtargz
 
 (