You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ba...@apache.org on 2003/01/27 03:22:31 UTC
cvs commit: jakarta-commons-sandbox/io/src/test/org/apache/commons/io/filefilter FileFilterTestCase.java
bayard 2003/01/26 18:22:31
Modified: io build.xml
io/src/test/org/apache/commons/io/filefilter
FileFilterTestCase.java
Log:
Removed examples/ logic from build.xml in the hope gump will build.
Added some more tests to the FileFilter tests.
Revision Changes Path
1.8 +3 -29 jakarta-commons-sandbox/io/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/io/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 7 Dec 2002 20:33:33 -0000 1.7
+++ build.xml 27 Jan 2003 02:22:30 -0000 1.8
@@ -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,21 +156,6 @@
</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}"/>
@@ -182,7 +163,7 @@
</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>
1.4 +24 -14 jakarta-commons-sandbox/io/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java
Index: FileFilterTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/io/src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileFilterTestCase.java 25 Dec 2002 22:16:05 -0000 1.3
+++ FileFilterTestCase.java 27 Jan 2003 02:22:31 -0000 1.4
@@ -116,25 +116,35 @@
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);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>