ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java
Date Mon, 08 Jan 2001 16:40:45 GMT
bodewig     01/01/08 08:40:45

  Modified:    .        WHATSNEW
               src/etc/testcases/taskdefs available.xml
               src/testcases/org/apache/tools/ant/types
                        CommandlineJavaTest.java
  Log:
  Fix some testcases.
  
  Revision  Changes    Path
  1.67      +2 -2      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- WHATSNEW	2001/01/08 12:52:05	1.66
  +++ WHATSNEW	2001/01/08 16:40:40	1.67
  @@ -90,8 +90,8 @@
   * 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
  
  
  
  1.4       +4 -4      jakarta-ant/src/etc/testcases/taskdefs/available.xml
  
  Index: available.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/available.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- available.xml	2000/12/18 15:43:51	1.3
  +++ available.xml	2001/01/08 16:40:43	1.4
  @@ -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>  
     
  
  
  
  1.5       +4 -3      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CommandlineJavaTest.java	2001/01/03 14:18:51	1.4
  +++ CommandlineJavaTest.java	2001/01/08 16:40:44	1.5
  @@ -64,7 +64,7 @@
   /**
    * 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 void setUp() {
           project = new Project();
           project.setBasedir(".");
  +        project.setProperty("build.sysclasspath", "ignore");
       }
   
       public void testGetCommandline() {
  @@ -92,8 +93,8 @@
           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]);
  
  
  

Mime
View raw message