From 5773626fd782639b73c76d6498b38e101361e1a2 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 6 Apr 2018 10:19:30 +0200 Subject: [PATCH] Revert change that broke tests in Jenkins. the File constructor seems to be unable to parse URLs created from URIs sometimes, leading to a test failure. Most likely the spaces or parentheses inside of the path of the jenkins workspaces are responsible. --- src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java b/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java index 72972642a..45a08414a 100644 --- a/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java @@ -128,7 +128,7 @@ public class XMLCatalogTest { assertNull("Nonexistent Catalog entry should not be returned", isResult); Source result = catalog.resolve("i/dont/exist.dtd", null); - String expected = toURLString(new File(project.getBaseDir().toURI().toURL() + + String expected = toURLString(new File(project.getBaseDir().toURL() + "/i/dont/exist.dtd")); String resultStr = fileURLPartWithoutLeadingSlashes((SAXSource) result); assertTrue("Nonexistent Catalog entry return input with a system ID like "