Browse Source

Make CommandlineJavaTest independent of lib/optional/junit.jar, PR 17402

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275496 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 21 years ago
parent
commit
0a562a9fab
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java

+ 4
- 4
src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java View File

@@ -105,7 +105,7 @@ public class CommandlineJavaTest extends TestCase {
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 @@ public class CommandlineJavaTest extends TestCase {
// 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 @@ public class CommandlineJavaTest extends TestCase {
assertNull(System.getProperty("key2"));
}

}
}

Loading…
Cancel
Save