Merge pull request #14 from codacy/AddZeroLinesToCoverage

Add zero lines to coverage reports

Author: rtfpessoa

src/main/scala/com/codacy/parsers/implementation/CoberturaParser.scala

@@ -78,7 +78,7 @@ class CoberturaParser(val language: Language.Value, val rootProject: File, val c
             (line \ "@number").text.toInt -> (line \ "@hits").text.toInt
         }
     }.toMap.collect {
-      case (key, value) if value > 0 =>
+      case (key, value) =>
         key -> value
     }
 

src/main/scala/com/codacy/parsers/implementation/JacocoParser.scala

@@ -7,6 +7,8 @@ import com.codacy.parsers.XMLCoverageParser
 
 import scala.xml.Node
 
+private case class LineCoverage(missedInstructions: Int, coveredInstructions: Int)
+
 class JacocoParser(val language: Language.Value, val rootProject: File, val coverageReport: File) extends XMLCoverageParser {
 
   val rootProjectDir = rootProject.getAbsolutePath + File.separator
@@ -48,10 +50,11 @@ class JacocoParser(val language: Language.Value, val rootProject: File, val cove
 
     val lineHitMap = (file \\ "line").map {
       line =>
-        (line \ "@nr").text.toInt -> (line \ "@ci").text.toInt
+        (line \ "@nr").text.toInt -> LineCoverage((line \ "@mi").text.toInt, (line \ "@ci").text.toInt)
     }.toMap.collect {
-      case (key, value) if value > 0 =>
-        key -> 1
+      case (key, lineCoverage) if lineCoverage.missedInstructions+ lineCoverage.coveredInstructions > 0 =>
+
+        key -> (if(lineCoverage.coveredInstructions > 0) 1 else 0)
     }
 
     CoverageFileReport(sourceFilename.stripPrefix(rootProjectDir), fileHit, lineHitMap)

src/test/resources/test_cobertura.xml

@@ -5,6 +5,7 @@
                 <class line-rate="0.87" name="TestSourceFile" filename="src/test/resources/TestSourceFile.scala">
                     <methods/>
                     <lines>
+                        <line number="3" hits="0"/>
                         <line number="4" hits="1"/>
                         <line number="5" hits="1"/>
                         <line number="6" hits="2"/>

src/test/resources/thousand_sep_cobertura.xml

@@ -13,7 +13,8 @@
                 <class line-rate="0,87" name="TestSourceFile" filename="src/test/resources/TestSourceFile.scala">
                     <methods/>
                     <lines>
-                        <line number="9" hits="1"/>
+                        <line number="8" hits="1"/>
+                        <line number="9" hits="0"/>
                         <line number="10" hits="1"/>
                     </lines>
                 </class>

src/test/scala/com/codacy/parsers/CoberturaParserTest.scala

@@ -27,7 +27,7 @@ class CoberturaParserTest extends WordSpec with BeforeAndAfterAll with Matchers
 
       val testReport = CoverageReport(87, List(
         CoverageFileReport("src/test/resources/TestSourceFile.scala", 87,
-          Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 4 -> 1)),
+          Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 3 -> 0, 4 -> 1)),
         CoverageFileReport("src/test/resources/TestSourceFile2.scala", 87,
           Map(1 -> 1, 2 -> 1, 3 -> 1))))
 
@@ -39,7 +39,7 @@ class CoberturaParserTest extends WordSpec with BeforeAndAfterAll with Matchers
 
       val testReport = CoverageReport(87, List(
         CoverageFileReport("src/test/resources/TestSourceFile.scala", 87,
-          Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 4 -> 1)),
+          Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 9-> 0, 8 -> 1, 4 -> 1)),
         CoverageFileReport("src/test/resources/TestSourceFile2.scala", 87,
           Map(1 -> 1, 2 -> 1, 3 -> 1))))
 

src/test/scala/com/codacy/parsers/JacocoParserTest.scala

@@ -27,9 +27,9 @@ class JacocoParserTest extends WordSpec with BeforeAndAfterAll with Matchers {
 
       val testReport = CoverageReport(73, List(
         CoverageFileReport("org/eluder/coverage/sample/InnerClassCoverage.java", 81,
-          Map(10 -> 1, 6 -> 1, 9 -> 1, 13 -> 1, 22 -> 1, 12 -> 1, 3 -> 1, 16 -> 1, 19 -> 1)),
+          Map(10 -> 1, 6 -> 1, 9 -> 1, 13 -> 1, 22 -> 1, 27 -> 0, 12 -> 1, 3 -> 1, 16 -> 1, 26 -> 0, 19 -> 1)),
         CoverageFileReport("org/eluder/coverage/sample/SimpleCoverage.java", 50,
-          Map(3 -> 1, 6 -> 1))))
+          Map(3 -> 1, 6 -> 1, 10 -> 0, 11 -> 0))))
 
       reader.generateReport() shouldEqual testReport
     }