From d74422c5bdb8c7a701452a41335f152e7dbff784 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Thu, 31 Jul 2003 09:03:46 +0000
Subject: [PATCH] Fix invalid URL for property test with url. PR: 21948

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274994 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/property.xml           |  2 +-
 .../apache/tools/ant/taskdefs/PropertyTest.java   | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/etc/testcases/taskdefs/property.xml b/src/etc/testcases/taskdefs/property.xml
index f5d98f977..baa07f004 100644
--- a/src/etc/testcases/taskdefs/property.xml
+++ b/src/etc/testcases/taskdefs/property.xml
@@ -24,7 +24,7 @@
 
   <target name="test5">
     <property name="http.port" value="999" />
-    <property url="file://${basedir}/property3.properties"/>
+    <property url="${test5.url}"/>
     <echo message="http.url is ${http.url}"/>
   </target>
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java b/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java
index 94d80ba17..0d0f5b97b 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java
@@ -54,8 +54,12 @@
 
 package org.apache.tools.ant.taskdefs;
 
-import org.apache.tools.ant.*;
+import java.net.URL;
+import java.io.File;
+
 import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.util.FileUtils;
 
 /**
  * @author Conor MacNeill
@@ -96,6 +100,15 @@ public class PropertyTest extends BuildFileTest {
     }
 
     public void test5() {
+        String baseDir = getProject().getProperty("basedir");
+        try {
+            String uri = FileUtils.newFileUtils().toURI(
+                baseDir + "/property3.properties");
+            getProject().setNewProperty(
+                "test5.url", uri);
+        } catch (Exception ex) {
+            throw new BuildException(ex);
+        }
         expectLog("test5", "http.url is http://localhost:999");
     }