Fix Cobertura unit test (#510)

dalbani · web-flow · commit 0e9dde473ec0 · 2022-10-18T13:09:08.000+02:00
diff --git a/reporter/src/main/scala/scoverage/reporter/CoberturaXmlWriter.scala b/reporter/src/main/scala/scoverage/reporter/CoberturaXmlWriter.scala
@@ -26,7 +26,7 @@ class CoberturaXmlWriter(
     val file = new File(outputDir, "cobertura.xml")
     IOUtils.writeToFile(
       file,
-      "<?xml version=\"1.0\"?>\n<!DOCTYPE coverage SYSTEM \"http://cobertura.sourceforge.net/xml/coverage-04.dtd\">\n" +
+      "<?xml version=\"1.0\"?>\n<!DOCTYPE coverage SYSTEM \"https://cobertura.sourceforge.net/xml/coverage-04.dtd\">\n" +
         new PrettyPrinter(120, 4).format(xml(coverage)),
       sourceEncoding
     )
diff --git a/reporter/src/test/resources/scoverage/reporter/cobertura.sample.xml b/reporter/src/test/resources/scoverage/reporter/cobertura.sample.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
+<!DOCTYPE coverage SYSTEM "https://cobertura.sourceforge.net/xml/coverage-04.dtd">
 
 <coverage line-rate="0.9" branch-rate="0.75" version="1.9" timestamp="1187350905008">
     <sources>
diff --git a/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala b/reporter/src/test/scala/scoverage/reporter/CoberturaXmlWriterTest.scala
@@ -112,7 +112,7 @@ class CoberturaXmlWriterTest extends FunSuite {
     )
   }
 
-  test("cobertura output validates".ignore) {
+  test("cobertura output validates") {
 
     val dir = tempDir()
 
@@ -298,8 +298,6 @@ class CoberturaXmlWriterTest extends FunSuite {
     writer.write(coverage)
 
     val domFactory = DocumentBuilderFactory.newInstance()
-    // TODO set validating here is no longer working as of 2.13.10. Not fully sure why but I don't use
-    // cobertura, so if someone wants to fix this, please do. I'll move forward with this not to block the release.
     domFactory.setValidating(true)
     val builder = domFactory.newDocumentBuilder()
     builder.setErrorHandler(new ErrorHandler() {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class CoberturaXmlWriter(`
`26`	`26`	`val file = new File(outputDir, "cobertura.xml")`
`27`	`27`	`IOUtils.writeToFile(`
`28`	`28`	`file,`
`29`		`- "<?xml version=\"1.0\"?>\n<!DOCTYPE coverage SYSTEM \"http://cobertura.sourceforge.net/xml/coverage-04.dtd\">\n" +`
	`29`	`+ "<?xml version=\"1.0\"?>\n<!DOCTYPE coverage SYSTEM \"https://cobertura.sourceforge.net/xml/coverage-04.dtd\">\n" +`
`30`	`30`	`new PrettyPrinter(120, 4).format(xml(coverage)),`
`31`	`31`	`sourceEncoding`
`32`	`32`	`)`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ class CoberturaXmlWriterTest extends FunSuite {`
`112`	`112`	`)`
`113`	`113`	`}`
`114`	`114`
`115`		`- test("cobertura output validates".ignore) {`
	`115`	`+ test("cobertura output validates") {`
`116`	`116`
`117`	`117`	`val dir = tempDir()`
`118`	`118`
`@@ -298,8 +298,6 @@ class CoberturaXmlWriterTest extends FunSuite {`
`298`	`298`	`writer.write(coverage)`
`299`	`299`
`300`	`300`	`val domFactory = DocumentBuilderFactory.newInstance()`
`301`		`- // TODO set validating here is no longer working as of 2.13.10. Not fully sure why but I don't use`
`302`		`- // cobertura, so if someone wants to fix this, please do. I'll move forward with this not to block the release.`
`303`	`301`	`domFactory.setValidating(true)`
`304`	`302`	`val builder = domFactory.newDocumentBuilder()`
`305`	`303`	`builder.setErrorHandler(new ErrorHandler() {`