Removed examples/ logic from build.xml in the hope gump will build.

Added some more tests to the FileFilter tests.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@140345 13f79535-47bb-0310-9956-ffa450edef68

Author: hen

build.xml

@@ -3,7 +3,7 @@
 
 <!--
         "IO" component of the Jakarta Commons Subproject
-        $Id: build.xml,v 1.7 2002/12/07 20:33:33 bayard Exp $
+        $Id: build.xml,v 1.8 2003/01/27 02:22:30 bayard Exp $
 -->
 
 
@@ -60,9 +60,6 @@
   <!-- The base directory for unit test sources -->
   <property name="test.home"               value="src/test"/>
 
-  <!-- The base directory for unit test sources -->
-  <property name="examples.home"           value="src/examples"/>
-  
 <!-- ========== Compiler Defaults ========================================= -->
 
 
@@ -118,7 +115,6 @@
     <mkdir dir="${build.home}/classes"/>
     <mkdir dir="${build.home}/conf"/>
     <mkdir dir="${build.home}/tests"/>
-    <mkdir dir="${build.home}/examples"/>
   </target>
 
 
@@ -160,29 +156,14 @@
     </copy>
   </target>
 
-  <target name="compile.examples" depends="compile"
-   description="Compile examples">
-    <javac  srcdir="${examples.home}"
-           destdir="${build.home}/examples"
-             debug="${compile.debug}"
-       deprecation="${compile.deprecation}"
-          optimize="${compile.optimize}">
-      <classpath refid="compile.classpath"/>
-    </javac>
-    <copy    todir="${build.home}/examples" filtering="off">
-      <fileset dir="${examples.home}" excludes="**/*.java"/>
-    </copy>
-  </target>
-  
-
   <target name="clean"
    description="Clean build and distribution directories">
     <delete    dir="${build.home}"/>
     <delete    dir="${dist.home}"/>
   </target>
 
 
-  <target name="all" depends="clean,compile, compile.examples"
+  <target name="all" depends="clean,compile"
    description="Clean and compile all components"/>
 
 
@@ -216,7 +197,7 @@
   </target>
 
 
-  <target name="jar" depends="compile, compile.examples"
+  <target name="jar" depends="compile"
    description="Create jar">
     <mkdir      dir="${dist.home}"/>
     <mkdir      dir="${build.home}/classes/META-INF"/>
@@ -225,13 +206,6 @@
     <jar    jarfile="${dist.home}/commons-${component.name}.jar"
             basedir="${build.home}/classes"
            manifest="${build.home}/conf/MANIFEST.MF"/>
-    <mkdir      dir="${dist.home}/examples"/>
-    <mkdir      dir="${build.home}/examples/classes/META-INF"/>
-    <copy      file="../LICENSE"
-             tofile="${build.home}/examples/classes/META-INF/LICENSE.txt"/>
-    <jar    jarfile="${dist.home}/commons-${component.name}-examples.jar"
-            basedir="${build.home}/examples/classes"
-           manifest="${build.home}/conf/MANIFEST.MF"/>           
   </target>
 
 

src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java

@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//io/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java,v 1.3 2002/12/25 22:16:05 scolebourne Exp $
- * $Revision: 1.3 $
- * $Date: 2002/12/25 22:16:05 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//io/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java,v 1.4 2003/01/27 02:22:31 bayard Exp $
+ * $Revision: 1.4 $
+ * $Date: 2003/01/27 02:22:31 $
  *
  * ====================================================================
  *
@@ -116,25 +116,35 @@ public void testExtension() throws Exception {
         assertFiltering( filter, new File("fred.test"), true);
     }
 
-    public void testNull() throws Exception {
-        FileFilter filter = FileFilterUtils.nullFileFilter();
-        assertFiltering( filter, new File("foo.test"), true);
-        assertFiltering( filter, new File("foo"), true);
-        assertFiltering( filter, new File(""), true);
+    public void testDirectory() throws Exception {
+        FileFilter filter = new DirectoryFileFilter();
+        /* These don't like the test for accept(File, String)
+        assertFiltering( filter, new File("src/"), true);
+        assertFiltering( filter, new File("src/java/"), true);
+        */
+        assertFiltering( filter, new File("project.xml"), false);
+        assertFiltering( filter, new File("test"), false);
+        assertFiltering( filter, new File("test/"), false);
+        assertFiltering( filter, new File("STATUS.html"), false);
     }
 
     public void testPrefix() throws Exception {
-        FileFilter filter = new PrefixFileFilter("foo");
+        FileFilter filter = new PrefixFileFilter( new String[] { "foo", "bar" } );
         assertFiltering( filter, new File("foo.test"), true);
         assertFiltering( filter, new File("foo"), true);
         assertFiltering( filter, new File("bar"), false);
+        assertFiltering( filter, new File("food/"), true);
+        assertFiltering( filter, new File("barred\\"), true);
+        assertFiltering( filter, new File("test"), false);
+        assertFiltering( filter, new File("fo_o.test"), false);
+        assertFiltering( filter, new File("abar.exe"), false);
     }
 
-    public void testDirectory() throws Exception {
-        FileFilter filter = new DirectoryFileFilter();
-        assertFiltering( filter, new File("src/"), true);
-        assertFiltering( filter, new File("project.xml"), false);
-        assertFiltering( filter, new File("src/java/"), true);
+    public void testNull() throws Exception {
+        FileFilter filter = FileFilterUtils.nullFileFilter();
+        assertFiltering( filter, new File("foo.test"), true);
+        assertFiltering( filter, new File("foo"), true);
+        assertFiltering( filter, new File(""), true);
     }
 
 }