From 5b31d299ba46922c02e14cf9ed2fe617388e380f Mon Sep 17 00:00:00 2001 From: Martin Ford Date: Tue, 16 Dec 2014 12:53:13 +0000 Subject: [PATCH] Standardise use of CanonicalPath Location.scala uses AbstractFile.canonicalPath while ScoverageHtmlWriter.scala uses java.io.File.getAbsolutePath for file paths. This mean that there is a possibility (esp. Windows environment) that creation of reports will fail because the scoverage.coverage.xml created will contain paths with an upper case drive letter while ScoverageHtmlWriter will be using paths with a lower case drive letter. --- .../src/main/scala/scoverage/report/ScoverageHtmlWriter.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala index 7ac44a23..08125e70 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala @@ -23,7 +23,7 @@ class ScoverageHtmlWriter(sourceDirectory: File, outputDir: File) { coverage.packages.foreach(writePackage) } - private def relativeSource(src: String): String = src.replace(sourceDirectory.getAbsolutePath + File.separator, "") + private def relativeSource(src: String): String = src.replace(sourceDirectory.getCanonicalPath + File.separator, "") private def writePackage(pkg: MeasuredPackage): Unit = { // package overview files are written out using a filename that respects the package name