ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/types/selectors BaseSelectorTest.java FilenameSelectorTest.java
Date Tue, 11 Mar 2003 09:26:45 GMT
bodewig     2003/03/11 01:26:44

  Modified:    src/etc/testcases/taskdefs bunzip2.xml bzip2.xml
               src/etc/testcases/types selectors.xml
               src/testcases/org/apache/tools/ant/taskdefs BUnzip2Test.java
                        BZip2Test.java
               src/testcases/org/apache/tools/ant/types/selectors
                        BaseSelectorTest.java FilenameSelectorTest.java
  Added:       src/etc/testcases/taskdefs/expected asf-logo-huge.tar.gz
  Removed:     src/etc/testcases/taskdefs/expected asf-logo-huge.tar
  Log:
  Save some (mega)bytes
  
  Revision  Changes    Path
  1.4       +5 -1      ant/src/etc/testcases/taskdefs/bunzip2.xml
  
  Index: bunzip2.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/bunzip2.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- bunzip2.xml	23 Jun 2002 01:20:01 -0000	1.3
  +++ bunzip2.xml	11 Mar 2003 09:26:39 -0000	1.4
  @@ -2,12 +2,16 @@
   
   <project basedir="." default="cleanup">
   
  -  <target name="realTest" depends="cleanup">
  +  <target name="realTest">
       <bunzip2 src="expected/asf-logo-huge.tar.bz2" dest="asf-logo-huge.tar" />
     </target>
   
     <target name="cleanup">
       <delete file="asf-logo-huge.tar" />
  +    <delete file="expected/asf-logo-huge.tar" />
     </target>
   
  +  <target name="prepare">
  +    <gunzip src="expected/asf-logo-huge.tar.gz"/>
  +  </target>
   </project>
  
  
  
  1.5       +6 -2      ant/src/etc/testcases/taskdefs/bzip2.xml
  
  Index: bzip2.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/bzip2.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- bzip2.xml	23 Jun 2002 01:20:01 -0000	1.4
  +++ bzip2.xml	11 Mar 2003 09:26:40 -0000	1.5
  @@ -2,11 +2,11 @@
   
   <project basedir="." default="cleanup">
   
  -  <target name="realTest" depends="cleanup">
  +  <target name="realTest">
       <bzip2 src="expected/asf-logo-huge.tar" zipfile="asf-logo-huge.tar.bz2" />
     </target>
   
  -  <target name="testDateCheck" depends="cleanup">
  +  <target name="testDateCheck">
       <touch file="asf-logo.gif.bz2"/>
       <bzip2 src="../asf-logo.gif" zipfile="asf-logo.gif.bz2" />
     </target>
  @@ -14,6 +14,10 @@
     <target name="cleanup">
       <delete file="asf-logo-huge.tar.bz2" />
       <delete file="asf-logo.gif.bz2" />
  +    <delete file="expected/asf-logo-huge.tar"/>
     </target>
   
  +  <target name="prepare">
  +    <gunzip src="expected/asf-logo-huge.tar.gz"/>
  +  </target>
   </project>
  
  
  
  1.1                  ant/src/etc/testcases/taskdefs/expected/asf-logo-huge.tar.gz
  
  	<<Binary file>>
  
  
  1.4       +4 -4      ant/src/etc/testcases/types/selectors.xml
  
  Index: selectors.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/types/selectors.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- selectors.xml	9 Jul 2002 21:05:57 -0000	1.3
  +++ selectors.xml	11 Mar 2003 09:26:44 -0000	1.4
  @@ -26,8 +26,8 @@
               tofile="${test.dir}/zip/asf-logo.gif.zip" />
       <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.tar"
               tofile="${test.dir}/tar/asf-logo.gif.tar" />
  -    <copy file="${etc.dir}/taskdefs/expected/asf-logo-huge.tar"
  -            tofile="${test.dir}/tar/asf-logo-huge.tar" />
  +    <copy file="${etc.dir}/taskdefs/expected/asf-logo-huge.tar.gz"
  +            tofile="${test.dir}/tar/asf-logo-huge.tar.gz" />
       <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.tar.gz"
               tofile="${test.dir}/tar/gz/asf-logo.gif.tar.gz" />
       <copy file="${etc.dir}/taskdefs/expected/asf-logo.gif.tar.bz2"
  @@ -51,7 +51,7 @@
               datetime="05/10/2002 2:30 PM"/>
       <touch file="${test.dir}/tar/asf-logo.gif.tar"
               datetime="05/10/2002 2:29 PM"/>
  -    <touch file="${test.dir}/tar/asf-logo-huge.tar"
  +    <touch file="${test.dir}/tar/asf-logo-huge.tar.gz"
               datetime="05/10/2002 2:29 AM"/>
     </target>
   
  @@ -72,7 +72,7 @@
       <sleep seconds="3"/>
       <touch file="${mirror.dir}/tar/asf-logo.gif.tar"/>
       <sleep seconds="2"/>
  -    <touch file="${mirror.dir}/tar/asf-logo-huge.tar"/>
  +    <touch file="${mirror.dir}/tar/asf-logo-huge.tar.gz"/>
       <touch file="${mirror.dir}/tar/gz/asf-logo.gif.tar.gz"/>
       <touch file="${mirror.dir}/tar/bz2/asf-logo.gif.tar.bz2"/>
       <touch file="${mirror.dir}/tar/bz2/asf-logo-huge.tar.bz2"/>
  
  
  
  1.7       +3 -2      ant/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
  
  Index: BUnzip2Test.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BUnzip2Test.java	7 Mar 2003 11:23:11 -0000	1.6
  +++ BUnzip2Test.java	11 Mar 2003 09:26:44 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -71,6 +71,7 @@
   
       public void setUp() {
           configureProject("src/etc/testcases/taskdefs/bunzip2.xml");
  +        executeTarget("prepare");
       }
   
       public void tearDown() {
  
  
  
  1.7       +3 -2      ant/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java
  
  Index: BZip2Test.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BZip2Test.java	7 Mar 2003 11:23:11 -0000	1.6
  +++ BZip2Test.java	11 Mar 2003 09:26:44 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -71,6 +71,7 @@
   
       public void setUp() {
           configureProject("src/etc/testcases/taskdefs/bzip2.xml");
  +        executeTarget("prepare");
       }
   
       public void tearDown() {
  
  
  
  1.5       +2 -2      ant/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
  
  Index: BaseSelectorTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BaseSelectorTest.java	10 Feb 2003 14:14:57 -0000	1.4
  +++ BaseSelectorTest.java	11 Mar 2003 09:26:44 -0000	1.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -82,7 +82,7 @@
       protected File mirrordir = new File(mirrordirname);
       protected String[] filenames = {".","asf-logo.gif.md5","asf-logo.gif.bz2",
               "asf-logo.gif.gz","copy.filterset.filtered","zip/asf-logo.gif.zip",
  -            "tar/asf-logo.gif.tar","tar/asf-logo-huge.tar",
  +            "tar/asf-logo.gif.tar","tar/asf-logo-huge.tar.gz",
               "tar/gz/asf-logo.gif.tar.gz","tar/bz2/asf-logo.gif.tar.bz2",
               "tar/bz2/asf-logo-huge.tar.bz2","tar/bz2"};
       protected File[] files = new File[filenames.length];
  
  
  
  1.4       +3 -3      ant/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
  
  Index: FilenameSelectorTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FilenameSelectorTest.java	10 Feb 2003 14:14:57 -0000	1.3
  +++ FilenameSelectorTest.java	11 Mar 2003 09:26:44 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -140,13 +140,13 @@
               s.setName("**/*.gz");
               s.setNegate(true);
               results = selectionString(s);
  -            assertEquals("TTTFTTTTFTTT", results);
  +            assertEquals("TTTFTTTFFTTT", results);
   
               s = (FilenameSelector)getInstance();
               s.setName("**/*.GZ");
               s.setCasesensitive(false);
               results = selectionString(s);
  -            assertEquals("FFFTFFFFTFFF", results);
  +            assertEquals("FFFTFFFTTFFF", results);
   
               s = (FilenameSelector)getInstance();
               Parameter param1 = new Parameter();
  
  
  

Mime
View raw message