Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug Fix: sbt-coveralls: Issue 199: Use relative paths in cobertura.xml file #497

Merged
merged 3 commits into from
Sep 10, 2022
Merged

Bug Fix: sbt-coveralls: Issue 199: Use relative paths in cobertura.xml file #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66cbc89
Make the paths in cobertura.xml relative.
rolandtritsch Sep 7, 2022
53c63a8
(Re)Format
rolandtritsch Sep 7, 2022
db085cb
Make the windows build work.
rolandtritsch Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion reporter/src/main/scala/scoverage/reporter/CoberturaXmlWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class CoberturaXmlWriter(

def klass(klass: MeasuredClass): Node = {
<class name={klass.fullClassName}
filename={klass.source}
filename={relativeSource(klass.source)}
line-rate={DoubleFormat.twoFractionDigits(klass.statementCoverage)}
branch-rate={DoubleFormat.twoFractionDigits(klass.branchCoverage)}
complexity="0">
Expand Down
2 changes: 1 addition & 1 deletion reporter/src/main/scala/scoverage/reporter/ScoverageXmlWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class ScoverageXmlWriter(

private def klass(klass: MeasuredClass): Node = {
<class name={klass.fullClassName}
filename={klass.source}
filename={relativeSource(klass.source)}
statement-count={klass.statementCount.toString}
statements-invoked={klass.invokedStatementCount.toString}
statement-rate={klass.statementCoverageFormatted}
Expand Down
78 changes: 78 additions & 0 deletions reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,84 @@ class CoberturaXmlWriterTest extends FunSuite {
private def canonicalPath(fileName: String) =
new File(sourceRoot, fileName).getCanonicalPath

test("cobertura output has relative file path") {

val dir = tempDir()

val coverage = Coverage()
coverage.add(
Statement(
Location(
"com.sksamuel.scoverage",
"A",
"com.sksamuel.scoverage.A",
ClassType.Object,
"create",
canonicalPath("a.scala")
),
1,
2,
3,
12,
"",
"",
"",
false,
3
)
)
coverage.add(
Statement(
Location(
"com.sksamuel.scoverage.A",
"B",
"com.sksamuel.scoverage.A.B",
ClassType.Object,
"create",
canonicalPath("a/b.scala")
),
2,
2,
3,
12,
"",
"",
"",
false,
3
)
)

val writer = new CoberturaXmlWriter(sourceRoot, dir, None)
writer.write(coverage)

// Needed to acount for https://github.com/scala/scala-xml/pull/177
val customXML: XMLLoader[Elem] = XML.withSAXParser {
val factory = SAXParserFactory.newInstance()
factory.setFeature(
"http://apache.org/xml/features/nonvalidating/load-external-dtd",
false
)
factory.newSAXParser()
}

val xml = customXML.loadFile(fileIn(dir))

assertEquals(
((xml \\ "coverage" \ "packages" \ "package" \ "classes" \ "class")(
0
) \ "@filename").text,
new File("a.scala").getPath()
)

assertEquals(
((xml \\ "coverage" \ "packages" \ "package" \ "classes" \ "class")(
1
) \ "@filename").text,
new File("a", "b.scala").getPath()
)
}

test("cobertura output validates") {

val dir = tempDir()
Expand Down