From 113e9e7644f4bb181f776946ddf6c8343df4b1a5 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 8 Jan 2001 16:40:44 +0000
Subject: [PATCH] Fix some testcases.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268416 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                  | 4 ++--
 src/etc/testcases/taskdefs/available.xml                  | 8 ++++----
 .../org/apache/tools/ant/types/CommandlineJavaTest.java   | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 50ad97e0f..56f19ae58 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -90,8 +90,8 @@ Fixed bugs:
 * nested <classpath> elements of <taskdef> now work for <taskdef>s not
   nested into <target> as well.
 
-* <property> and <available> will search for the resource /foo instead
-  of /org/apache/tools/ant/taskdefs/foo when given a relative resource
+* <property> and <available> will search for the resource "foo" instead
+  of "/org/apache/tools/ant/taskdefs/foo" when given a relative resource
   name foo.
 
 Changes from Ant 1.1 to Ant 1.2
diff --git a/src/etc/testcases/taskdefs/available.xml b/src/etc/testcases/taskdefs/available.xml
index ef494ee80..9ad3bc526 100644
--- a/src/etc/testcases/taskdefs/available.xml
+++ b/src/etc/testcases/taskdefs/available.xml
@@ -26,12 +26,12 @@
 
   <target name="test6">
     <available property="test" 
-               resource="/org/apache/tools/ant/taskdefs/this_resource_does_not_exist"/>
+               resource="org/apache/tools/ant/taskdefs/this_resource_does_not_exist"/>
   </target>
 
   <target name="test7">
     <available property="test" 
-               resource="/org/apache/tools/ant/taskdefs/defaults.properties"/>
+               resource="org/apache/tools/ant/taskdefs/defaults.properties"/>
   </target>
 
   <target name="test8">
@@ -47,14 +47,14 @@
   <target name="test10">
     <available property="test" 
                file="available.xml"
-               resource="/org/apache/tools/ant/taskdefs/defaults.properties"
+               resource="org/apache/tools/ant/taskdefs/defaults.properties"
                classname="org.apache.tools.ant.taskdefs.Ant"/>
   </target>
   
   <target name="test11">
     <available property="test" 
                file="src/etc/testcases/taskdefs/available.xml"
-               resource="/org/apache/tools/ant/taskdefs/defaults.properties"
+               resource="org/apache/tools/ant/taskdefs/defaults.properties"
                classname="org.apache.tools.ant.taskdefs.this_class_does_not_exist"/>
   </target>  
   
diff --git a/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java b/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
index 5b52c0a35..b46829d7d 100644
--- a/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
+++ b/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
@@ -64,7 +64,7 @@ import java.io.File;
 /**
  * JUnit 3 testcases for org.apache.tools.ant.CommandlineJava
  *
- * @author Stefan Bodewig <a href="mailto:stefan.bodewig@megabit.net">stefan.bodewig@megabit.net</a> 
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  */
 public class CommandlineJavaTest extends TestCase {
 
@@ -77,6 +77,7 @@ public class CommandlineJavaTest extends TestCase {
     public void setUp() {
         project = new Project();
         project.setBasedir(".");
+        project.setProperty("build.sysclasspath", "ignore");
     }
 
     public void testGetCommandline() {
@@ -92,8 +93,8 @@ public class CommandlineJavaTest extends TestCase {
         assertEquals("no classpath", 
                      "org.apache.tools.ant.CommandlineJavaTest", s[3]);
 
-        c.createClasspath(project).setLocation(new File("junit.jar"));
-        c.createClasspath(project).setLocation(new File("ant.jar"));
+        c.createClasspath(project).setLocation(project.resolveFile("lib/core/junit.jar"));
+        c.createClasspath(project).setLocation(project.resolveFile("lib/ant.jar"));
         s = c.getCommandline();
         assertEquals("with classpath", 6, s.length);
         assertEquals("with classpath", "java", s[0]);