Repository: ant Updated Branches: refs/heads/master 374240187 -> 5773626fd
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. Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/5773626f Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/5773626f Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/5773626f Branch: refs/heads/master Commit: 5773626fd782639b73c76d6498b38e101361e1a2 Parents: 3742401 Author: Stefan Bodewig <bode...@apache.org> Authored: Fri Apr 6 10:19:30 2018 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Fri Apr 6 10:19:30 2018 +0200 ---------------------------------------------------------------------- src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/5773626f/src/tests/junit/org/apache/tools/ant/types/XMLCatalogTest.java ---------------------------------------------------------------------- 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 7297264..45a0841 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 "
