Skip to content
This repository was archived by the owner on Dec 3, 2020. It is now read-only.

Commit ce42b87

Browse files
authored
Merge pull request #23 from codacy/bugfix/FT-6145-coverage-report-generation
Fix file path comparison
2 parents dc57f52 + cc01f07 commit ce42b87

File tree

3 files changed

+45
-1
lines changed

3 files changed

+45
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class CoberturaParser(val language: Language.Value, val rootProject: File, val c
8989
key -> value
9090
}
9191

92-
allFiles.find(f => f.endsWith(sourceFilename)).map {
92+
allFiles.find(f => f.endsWith(sanitiseFilename(sourceFilename))).map {
9393
filename =>
9494
CoverageFileReport(stripRoot(filename), fileHit, lineHitMap)
9595
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<coverage line-rate="0.87">
2+
<packages>
3+
<package line-rate="0.87" name="com.github.theon.coveralls">
4+
<classes>
5+
<class line-rate="0.87" name="TestSourceFile" filename="src\test\resources\TestSourceFile.scala">
6+
<methods/>
7+
<lines>
8+
<line number="3" hits="0"/>
9+
<line number="4" hits="1"/>
10+
<line number="5" hits="1"/>
11+
<line number="6" hits="2"/>
12+
</lines>
13+
</class>
14+
<class line-rate="0.87" name="TestSourceFile" filename="src\test\resources\TestSourceFile.scala">
15+
<methods/>
16+
<lines>
17+
<line number="9" hits="1"/>
18+
<line number="10" hits="1"/>
19+
</lines>
20+
</class>
21+
<class line-rate="0.87" name="TestSourceFile2" filename="src\test\resources\TestSourceFile2.scala">
22+
<methods/>
23+
<lines>
24+
<line number="1" hits="1"/>
25+
<line number="2" hits="1"/>
26+
<line number="3" hits="1"/>
27+
</lines>
28+
</class>
29+
</classes>
30+
</package>
31+
</packages>
32+
</coverage>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@ class CoberturaParserTest extends WordSpec with BeforeAndAfterAll with Matchers
4646
reader.generateReport() shouldEqual testReport
4747
}
4848

49+
"return a valid report with windows file path separator" in {
50+
val reader = new CoberturaParser(Language.Scala, new File("."), new File("src/test/resources/windows_paths_cobertura.xml"))
51+
52+
val testReport = CoverageReport(87, List(
53+
CoverageFileReport("src/test/resources/TestSourceFile.scala", 87,
54+
Map(5 -> 1, 10 -> 1, 6 -> 2, 9 -> 1, 3 -> 0, 4 -> 1)),
55+
CoverageFileReport("src/test/resources/TestSourceFile2.scala", 87,
56+
Map(1 -> 1, 2 -> 1, 3 -> 1))))
57+
58+
reader.generateReport() shouldEqual testReport
59+
}
60+
4961
}
5062

5163
}

0 commit comments

Comments
 (0)