From 66cbc89ef7a6c217bc03b5efd4834d83fab76e36 Mon Sep 17 00:00:00 2001
From: Roland Tritsch <roland@tritsch.email>
Date: Wed, 7 Sep 2022 14:25:09 +0100
Subject: [PATCH 1/3] Make the paths in cobertura.xml relative.

---
 .../reporter/CoberturaXmlWriter.scala         |  2 +-
 .../reporter/ScoverageXmlWriter.scala         |  2 +-
 .../reporter/CoberturaXmlWriterTest.scala     | 74 +++++++++++++++++++
 3 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/reporter/src/main/scala/scoverage/reporter/CoberturaXmlWriter.scala b/reporter/src/main/scala/scoverage/reporter/CoberturaXmlWriter.scala
index 7ad3a775..a743a139 100644
--- a/reporter/src/main/scala/scoverage/reporter/CoberturaXmlWriter.scala
+++ b/reporter/src/main/scala/scoverage/reporter/CoberturaXmlWriter.scala
@@ -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">
diff --git a/reporter/src/main/scala/scoverage/reporter/ScoverageXmlWriter.scala b/reporter/src/main/scala/scoverage/reporter/ScoverageXmlWriter.scala
index bb5f8153..ad09adae 100644
--- a/reporter/src/main/scala/scoverage/reporter/ScoverageXmlWriter.scala
+++ b/reporter/src/main/scala/scoverage/reporter/ScoverageXmlWriter.scala
@@ -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}
diff --git a/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala b/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
index b1c091f3..335a2952 100644
--- a/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
+++ b/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
@@ -34,6 +34,80 @@ 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,
+      "a.scala"
+    )
+
+    assertEquals(
+      ((xml \\ "coverage" \ "packages" \ "package" \ "classes" \ "class")(1) \ "@filename").text,
+      "a/b.scala"
+    )
+  }
+
   test("cobertura output validates") {
 
     val dir = tempDir()

From 53c63a857d6f52ebe79111e280ce6dfb50dcc56d Mon Sep 17 00:00:00 2001
From: Roland Tritsch <roland@tritsch.email>
Date: Wed, 7 Sep 2022 14:30:02 +0100
Subject: [PATCH 2/3] (Re)Format

---
 .../scala/scoverage/reporter/CoberturaXmlWriterTest.scala | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala b/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
index 335a2952..53fe6e43 100644
--- a/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
+++ b/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
@@ -98,12 +98,16 @@ class CoberturaXmlWriterTest extends FunSuite {
     val xml = customXML.loadFile(fileIn(dir))
 
     assertEquals(
-      ((xml \\ "coverage" \ "packages" \ "package" \ "classes" \ "class")(0) \ "@filename").text,
+      ((xml \\ "coverage" \ "packages" \ "package" \ "classes" \ "class")(
+        0
+      ) \ "@filename").text,
       "a.scala"
     )
 
     assertEquals(
-      ((xml \\ "coverage" \ "packages" \ "package" \ "classes" \ "class")(1) \ "@filename").text,
+      ((xml \\ "coverage" \ "packages" \ "package" \ "classes" \ "class")(
+        1
+      ) \ "@filename").text,
       "a/b.scala"
     )
   }

From db085cb6b934456138315085f1324cc62fa61518 Mon Sep 17 00:00:00 2001
From: Roland Tritsch <roland@tritsch.email>
Date: Thu, 8 Sep 2022 05:43:02 +0100
Subject: [PATCH 3/3] Make the windows build work.

---
 .../scala/scoverage/reporter/CoberturaXmlWriterTest.scala     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala b/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
index 53fe6e43..d9dc1ef0 100644
--- a/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
+++ b/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
@@ -101,14 +101,14 @@ class CoberturaXmlWriterTest extends FunSuite {
       ((xml \\ "coverage" \ "packages" \ "package" \ "classes" \ "class")(
         0
       ) \ "@filename").text,
-      "a.scala"
+      new File("a.scala").getPath()
     )
 
     assertEquals(
       ((xml \\ "coverage" \ "packages" \ "package" \ "classes" \ "class")(
         1
       ) \ "@filename").text,
-      "a/b.scala"
+      new File("a", "b.scala").getPath()
     )
   }