Browse Source

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
master
Peter Reilly 22 years ago
parent
commit
d74422c5bd
2 changed files with 15 additions and 2 deletions
  1. +1
    -1
      src/etc/testcases/taskdefs/property.xml
  2. +14
    -1
      src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java

+ 1
- 1
src/etc/testcases/taskdefs/property.xml View File

@@ -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>



+ 14
- 1
src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java View File

@@ -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");
}



Loading…
Cancel
Save