Skip to content

fix: Some more small fixes on relative paths in the writers #403

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

Merged
merged 1 commit into from
Oct 23, 2021
Merged

fix: Some more small fixes on relative paths in the writers #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion scalac-scoverage-plugin/src/main/scala/scoverage/report/BaseReportWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ class BaseReportWriter(

// Source paths in canonical form WITH trailing file separator
private val formattedSourcePaths: Seq[String] =
sourceDirectories filter (_.isDirectory) map (_.getCanonicalPath + File.separator)
sourceDirectories
.filter(_.isDirectory)
.map(_.getCanonicalPath + File.separator)

/** Converts absolute path to relative one if any of the source directories is it's parent.
* If there is no parent directory, the path is returned unchanged (absolute).
Expand Down
2 changes: 1 addition & 1 deletion scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class CoberturaXmlWriter(

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

private def klass(klass: MeasuredClass): Node = {
<class name={klass.fullClassName}
filename={relativeSource(klass.source)}
filename={klass.source}
statement-count={klass.statementCount.toString}
statements-invoked={klass.invokedStatementCount.toString}
statement-rate={klass.statementCoverageFormatted}
Expand Down