You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2010/10/01 00:04:39 UTC
svn commit: r1003315 - in
/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator:
ExtensionFileComparatorTest.java NameFileComparatorTest.java
PathFileComparatorTest.java
Author: niallp
Date: Thu Sep 30 22:04:39 2010
New Revision: 1003315
URL: http://svn.apache.org/viewvc?rev=1003315&view=rev
Log:
Improve test coverage
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java
Modified: commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java?rev=1003315&r1=1003314&r2=1003315&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java Thu Sep 30 22:04:39 2010
@@ -17,6 +17,7 @@
package org.apache.commons.io.comparator;
import java.io.File;
+import java.util.Comparator;
/**
* Test case for {@link ExtensionFileComparator}.
@@ -38,9 +39,24 @@ public class ExtensionFileComparatorTest
super.setUp();
comparator = (AbstractFileComparator)ExtensionFileComparator.EXTENSION_COMPARATOR;
reverse = ExtensionFileComparator.EXTENSION_REVERSE;
- equalFile1 = new File("file.foo");
- equalFile2 = new File("file.foo");
- lessFile = new File("file.abc");
- moreFile = new File("file.xyz");
+ equalFile1 = new File("abc.foo");
+ equalFile2 = new File("def.foo");
+ lessFile = new File("abc.abc");
+ moreFile = new File("abc.xyz");
+ }
+
+ /** Test case sensitivity */
+ public void testCaseSensitivity() {
+ File file3 = new File("abc.FOO");
+ Comparator<File> sensitive = new ExtensionFileComparator(null); /* test null as well */
+ assertTrue("sensitive file1 & file2 = 0", sensitive.compare(equalFile1, equalFile2) == 0);
+ assertTrue("sensitive file1 & file3 > 0", sensitive.compare(equalFile1, file3) > 0);
+ assertTrue("sensitive file1 & less > 0", sensitive.compare(equalFile1, lessFile) > 0);
+
+ Comparator<File> insensitive = ExtensionFileComparator.EXTENSION_INSENSITIVE_COMPARATOR;
+ assertTrue("insensitive file1 & file2 = 0", insensitive.compare(equalFile1, equalFile2) == 0);
+ assertTrue("insensitive file1 & file3 = 0", insensitive.compare(equalFile1, file3) == 0);
+ assertTrue("insensitive file1 & file4 > 0", insensitive.compare(equalFile1, lessFile) > 0);
+ assertTrue("insensitive file3 & less > 0", insensitive.compare(file3, lessFile) > 0);
}
}
Modified: commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java?rev=1003315&r1=1003314&r2=1003315&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java Thu Sep 30 22:04:39 2010
@@ -17,6 +17,7 @@
package org.apache.commons.io.comparator;
import java.io.File;
+import java.util.Comparator;
/**
* Test case for {@link NameFileComparator}.
@@ -43,4 +44,19 @@ public class NameFileComparatorTest exte
lessFile = new File("c/ABC.txt");
moreFile = new File("d/XYZ.txt");
}
+
+ /** Test case sensitivity */
+ public void testCaseSensitivity() {
+ File file3 = new File("a/FOO.txt");
+ Comparator<File> sensitive = new NameFileComparator(null); /* test null as well */
+ assertTrue("sensitive file1 & file2 = 0", sensitive.compare(equalFile1, equalFile2) == 0);
+ assertTrue("sensitive file1 & file3 > 0", sensitive.compare(equalFile1, file3) > 0);
+ assertTrue("sensitive file1 & less > 0", sensitive.compare(equalFile1, lessFile) > 0);
+
+ Comparator<File> insensitive = NameFileComparator.NAME_INSENSITIVE_COMPARATOR;
+ assertTrue("insensitive file1 & file2 = 0", insensitive.compare(equalFile1, equalFile2) == 0);
+ assertTrue("insensitive file1 & file3 = 0", insensitive.compare(equalFile1, file3) == 0);
+ assertTrue("insensitive file1 & file4 > 0", insensitive.compare(equalFile1, lessFile) > 0);
+ assertTrue("insensitive file3 & less > 0", insensitive.compare(file3, lessFile) > 0);
+ }
}
Modified: commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java?rev=1003315&r1=1003314&r2=1003315&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java (original)
+++ commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java Thu Sep 30 22:04:39 2010
@@ -17,6 +17,7 @@
package org.apache.commons.io.comparator;
import java.io.File;
+import java.util.Comparator;
/**
* Test case for {@link PathFileComparator}.
@@ -43,4 +44,19 @@ public class PathFileComparatorTest exte
lessFile = new File("abc/file.txt");
moreFile = new File("xyz/file.txt");
}
+
+ /** Test case sensitivity */
+ public void testCaseSensitivity() {
+ File file3 = new File("FOO/file.txt");
+ Comparator<File> sensitive = new PathFileComparator(null); /* test null as well */
+ assertTrue("sensitive file1 & file2 = 0", sensitive.compare(equalFile1, equalFile2) == 0);
+ assertTrue("sensitive file1 & file3 > 0", sensitive.compare(equalFile1, file3) > 0);
+ assertTrue("sensitive file1 & less > 0", sensitive.compare(equalFile1, lessFile) > 0);
+
+ Comparator<File> insensitive = PathFileComparator.PATH_INSENSITIVE_COMPARATOR;
+ assertTrue("insensitive file1 & file2 = 0", insensitive.compare(equalFile1, equalFile2) == 0);
+ assertTrue("insensitive file1 & file3 = 0", insensitive.compare(equalFile1, file3) == 0);
+ assertTrue("insensitive file1 & file4 > 0", insensitive.compare(equalFile1, lessFile) > 0);
+ assertTrue("insensitive file3 & less > 0", insensitive.compare(file3, lessFile) > 0);
+ }
}