bodewig 2003/10/14 07:56:47
Modified: src/testcases/org/apache/tools/ant/types Tag: ANT_16_BRANCH
CommandlineJavaTest.java
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.17.2.1 +4 -4
ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
Index: CommandlineJavaTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -r1.17 -r1.17.2.1
--- CommandlineJavaTest.java 8 Sep 2003 14:05:51 -0000 1.17
+++ CommandlineJavaTest.java 14 Oct 2003 14:56:47 -0000 1.17.2.1
@@ -105,7 +105,7 @@
fail("cloning should work without classpath specified");
}
-
c.createClasspath(project).setLocation(project.resolveFile("lib/optional/junit.jar"));
+
c.createClasspath(project).setLocation(project.resolveFile("build.xml"));
c.createClasspath(project).setLocation(project.resolveFile(
System.getProperty("ant.home")+"/lib/ant.jar"));
s = c.getCommandline();
@@ -113,8 +113,8 @@
// assertEquals("with classpath", "java", s[0]);
assertEquals("with classpath", "-Djava.compiler=NONE", s[1]);
assertEquals("with classpath", "-classpath", s[2]);
- assertTrue("junit.jar contained",
- s[3].indexOf("junit.jar"+java.io.File.pathSeparator) >= 0);
+ assertTrue("build.xml contained",
+ s[3].indexOf("build.xml"+java.io.File.pathSeparator) >= 0);
assertTrue("ant.jar contained", s[3].endsWith("ant.jar"));
assertEquals("with classpath", "junit.textui.TestRunner", s[4]);
assertEquals("with classpath",
@@ -168,4 +168,4 @@
assertNull(System.getProperty("key2"));
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
