You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2001/07/18 13:31:16 UTC

cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

bodewig     01/07/18 04:31:16

  Modified:    src/testcases/org/apache/tools/ant/types
                        CommandlineJavaTest.java
  Log:
  Adapt testcase to changes in CommandlineJava.
  
  Revision  Changes    Path
  1.7       +9 -2      jakarta-ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
  
  Index: CommandlineJavaTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CommandlineJavaTest.java	2001/02/13 12:32:01	1.6
  +++ CommandlineJavaTest.java	2001/07/18 11:31:16	1.7
  @@ -87,7 +87,14 @@
           c.createVmArgument().setValue("-Djava.compiler=NONE");
           String[] s = c.getCommandline();
           assertEquals("no classpath", 4, s.length);
  -        assertEquals("no classpath", "java", s[0]);
  +        /*
  +         * After changing CommandlineJava to search for the java
  +         * executable, I don't know, how to tests the value returned
  +         * here without using the same logic as applied in the class
  +         * itself.
  +         *
  +         * assert("no classpath", "java", s[0]);
  +         */
           assertEquals("no classpath", "-Djava.compiler=NONE", s[1]);
           assertEquals("no classpath", "junit.textui.TestRunner", s[2]);
           assertEquals("no classpath", 
  @@ -102,7 +109,7 @@
           c.createClasspath(project).setLocation(project.resolveFile("bootstrap/lib/ant.jar"));
           s = c.getCommandline();
           assertEquals("with classpath", 6, s.length);
  -        assertEquals("with classpath", "java", s[0]);
  +        //        assertEquals("with classpath", "java", s[0]);
           assertEquals("with classpath", "-Djava.compiler=NONE", s[1]);
           assertEquals("with classpath", "-classpath", s[2]);
           assert("junit.jar contained",