Skip to content

Commit 48e46e1

Browse files
author
Niall Pemberton
committed
Improve test coverage
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1003315 13f79535-47bb-0310-9956-ffa450edef68
1 parent 3e71a20 commit 48e46e1

3 files changed

Lines changed: 52 additions & 4 deletions

File tree

src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.commons.io.comparator;
1818

1919
import java.io.File;
20+
import java.util.Comparator;
2021

2122
/**
2223
* Test case for {@link ExtensionFileComparator}.
@@ -38,9 +39,24 @@ protected void setUp() throws Exception {
3839
super.setUp();
3940
comparator = (AbstractFileComparator)ExtensionFileComparator.EXTENSION_COMPARATOR;
4041
reverse = ExtensionFileComparator.EXTENSION_REVERSE;
41-
equalFile1 = new File("file.foo");
42-
equalFile2 = new File("file.foo");
43-
lessFile = new File("file.abc");
44-
moreFile = new File("file.xyz");
42+
equalFile1 = new File("abc.foo");
43+
equalFile2 = new File("def.foo");
44+
lessFile = new File("abc.abc");
45+
moreFile = new File("abc.xyz");
46+
}
47+
48+
/** Test case sensitivity */
49+
public void testCaseSensitivity() {
50+
File file3 = new File("abc.FOO");
51+
Comparator<File> sensitive = new ExtensionFileComparator(null); /* test null as well */
52+
assertTrue("sensitive file1 & file2 = 0", sensitive.compare(equalFile1, equalFile2) == 0);
53+
assertTrue("sensitive file1 & file3 > 0", sensitive.compare(equalFile1, file3) > 0);
54+
assertTrue("sensitive file1 & less > 0", sensitive.compare(equalFile1, lessFile) > 0);
55+
56+
Comparator<File> insensitive = ExtensionFileComparator.EXTENSION_INSENSITIVE_COMPARATOR;
57+
assertTrue("insensitive file1 & file2 = 0", insensitive.compare(equalFile1, equalFile2) == 0);
58+
assertTrue("insensitive file1 & file3 = 0", insensitive.compare(equalFile1, file3) == 0);
59+
assertTrue("insensitive file1 & file4 > 0", insensitive.compare(equalFile1, lessFile) > 0);
60+
assertTrue("insensitive file3 & less > 0", insensitive.compare(file3, lessFile) > 0);
4561
}
4662
}

src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.commons.io.comparator;
1818

1919
import java.io.File;
20+
import java.util.Comparator;
2021

2122
/**
2223
* Test case for {@link NameFileComparator}.
@@ -43,4 +44,19 @@ protected void setUp() throws Exception {
4344
lessFile = new File("c/ABC.txt");
4445
moreFile = new File("d/XYZ.txt");
4546
}
47+
48+
/** Test case sensitivity */
49+
public void testCaseSensitivity() {
50+
File file3 = new File("a/FOO.txt");
51+
Comparator<File> sensitive = new NameFileComparator(null); /* test null as well */
52+
assertTrue("sensitive file1 & file2 = 0", sensitive.compare(equalFile1, equalFile2) == 0);
53+
assertTrue("sensitive file1 & file3 > 0", sensitive.compare(equalFile1, file3) > 0);
54+
assertTrue("sensitive file1 & less > 0", sensitive.compare(equalFile1, lessFile) > 0);
55+
56+
Comparator<File> insensitive = NameFileComparator.NAME_INSENSITIVE_COMPARATOR;
57+
assertTrue("insensitive file1 & file2 = 0", insensitive.compare(equalFile1, equalFile2) == 0);
58+
assertTrue("insensitive file1 & file3 = 0", insensitive.compare(equalFile1, file3) == 0);
59+
assertTrue("insensitive file1 & file4 > 0", insensitive.compare(equalFile1, lessFile) > 0);
60+
assertTrue("insensitive file3 & less > 0", insensitive.compare(file3, lessFile) > 0);
61+
}
4662
}

src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.commons.io.comparator;
1818

1919
import java.io.File;
20+
import java.util.Comparator;
2021

2122
/**
2223
* Test case for {@link PathFileComparator}.
@@ -43,4 +44,19 @@ protected void setUp() throws Exception {
4344
lessFile = new File("abc/file.txt");
4445
moreFile = new File("xyz/file.txt");
4546
}
47+
48+
/** Test case sensitivity */
49+
public void testCaseSensitivity() {
50+
File file3 = new File("FOO/file.txt");
51+
Comparator<File> sensitive = new PathFileComparator(null); /* test null as well */
52+
assertTrue("sensitive file1 & file2 = 0", sensitive.compare(equalFile1, equalFile2) == 0);
53+
assertTrue("sensitive file1 & file3 > 0", sensitive.compare(equalFile1, file3) > 0);
54+
assertTrue("sensitive file1 & less > 0", sensitive.compare(equalFile1, lessFile) > 0);
55+
56+
Comparator<File> insensitive = PathFileComparator.PATH_INSENSITIVE_COMPARATOR;
57+
assertTrue("insensitive file1 & file2 = 0", insensitive.compare(equalFile1, equalFile2) == 0);
58+
assertTrue("insensitive file1 & file3 = 0", insensitive.compare(equalFile1, file3) == 0);
59+
assertTrue("insensitive file1 & file4 > 0", insensitive.compare(equalFile1, lessFile) > 0);
60+
assertTrue("insensitive file3 & less > 0", insensitive.compare(file3, lessFile) > 0);
61+
}
4662
}

0 commit comments

Comments
 (0)