Skip to content

Commit 709699a

Browse files
committed
Some more test cases
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1002805 13f79535-47bb-0310-9956-ffa450edef68
1 parent 226bb72 commit 709699a

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

src/test/org/apache/commons/io/FilenameUtilsWildcardTestCase.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public void testMatch() {
3939
assertEquals(true, FilenameUtils.wildcardMatch(null, null));
4040
assertEquals(true, FilenameUtils.wildcardMatch("Foo", "Foo"));
4141
assertEquals(true, FilenameUtils.wildcardMatch("", ""));
42+
assertEquals(true, FilenameUtils.wildcardMatch("", "*"));
43+
assertEquals(false, FilenameUtils.wildcardMatch("", "?"));
4244
assertEquals(true, FilenameUtils.wildcardMatch("Foo", "Fo*"));
4345
assertEquals(true, FilenameUtils.wildcardMatch("Foo", "Fo?"));
4446
assertEquals(true, FilenameUtils.wildcardMatch("Foo Bar and Catflap", "Fo*"));
@@ -117,9 +119,10 @@ public void testSplitOnTokens() {
117119
assertArrayEquals( new String[] { "Ad", "*", "er" }, FilenameUtils.splitOnTokens("Ad*er") );
118120
assertArrayEquals( new String[] { "Ad", "?", "er" }, FilenameUtils.splitOnTokens("Ad?er") );
119121
assertArrayEquals( new String[] { "Test", "*", "?", "One" }, FilenameUtils.splitOnTokens("Test*?One") );
122+
assertArrayEquals( new String[] { "Test", "?", "*", "One" }, FilenameUtils.splitOnTokens("Test?*One") );
120123
assertArrayEquals( new String[] { "*" }, FilenameUtils.splitOnTokens("****") );
121124
assertArrayEquals( new String[] { "*", "?", "?", "*" }, FilenameUtils.splitOnTokens("*??*") );
122-
assertArrayEquals( new String[] { "*", "?", "?", "*" }, FilenameUtils.splitOnTokens("*??*") );
125+
assertArrayEquals( new String[] { "*", "?", "*", "?", "*" }, FilenameUtils.splitOnTokens("*?**?*") );
123126
assertArrayEquals( new String[] { "h", "?", "?", "*" }, FilenameUtils.splitOnTokens("h??*") );
124127
assertArrayEquals( new String[] { "" }, FilenameUtils.splitOnTokens("") );
125128
}

0 commit comments

Comments
 (0)