svn commit: r1002805 - /commons/proper/io/trunk/src/test/org/apache/commons/io/FilenameUtilsWildcardTestCase.java

[sebb]

Author: sebb
Date: Wed Sep 29 18:51:13 2010
New Revision: 1002805

URL: http://svn.apache.org/viewvc?rev=1002805&view=rev
Log:
Some more test cases

Modified:
    
commons/proper/io/trunk/src/test/org/apache/commons/io/FilenameUtilsWildcardTestCase.java

Modified: 
commons/proper/io/trunk/src/test/org/apache/commons/io/FilenameUtilsWildcardTestCase.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/FilenameUtilsWildcardTestCase.java?rev=1002805&r1=1002804&r2=1002805&view=diff
==============================================================================
--- 
commons/proper/io/trunk/src/test/org/apache/commons/io/FilenameUtilsWildcardTestCase.java
 (original)
+++ 
commons/proper/io/trunk/src/test/org/apache/commons/io/FilenameUtilsWildcardTestCase.java
 Wed Sep 29 18:51:13 2010
@@ -39,6 +39,8 @@ public class FilenameUtilsWildcardTestCa
         assertEquals(true, FilenameUtils.wildcardMatch(null, null));
         assertEquals(true, FilenameUtils.wildcardMatch("Foo", "Foo"));
         assertEquals(true, FilenameUtils.wildcardMatch("", ""));
+        assertEquals(true, FilenameUtils.wildcardMatch("", "*"));
+        assertEquals(false, FilenameUtils.wildcardMatch("", "?"));
         assertEquals(true, FilenameUtils.wildcardMatch("Foo", "Fo*"));
         assertEquals(true, FilenameUtils.wildcardMatch("Foo", "Fo?"));
         assertEquals(true, FilenameUtils.wildcardMatch("Foo Bar and Catflap", 
"Fo*"));
@@ -117,9 +119,10 @@ public class FilenameUtilsWildcardTestCa
         assertArrayEquals( new String[] { "Ad", "*", "er" }, 
FilenameUtils.splitOnTokens("Ad*er") );
         assertArrayEquals( new String[] { "Ad", "?", "er" }, 
FilenameUtils.splitOnTokens("Ad?er") );
         assertArrayEquals( new String[] { "Test", "*", "?", "One" }, 
FilenameUtils.splitOnTokens("Test*?One") );
+        assertArrayEquals( new String[] { "Test", "?", "*", "One" }, 
FilenameUtils.splitOnTokens("Test?*One") );
         assertArrayEquals( new String[] { "*" }, 
FilenameUtils.splitOnTokens("****") );
         assertArrayEquals( new String[] { "*", "?", "?", "*" }, 
FilenameUtils.splitOnTokens("*??*") );
-        assertArrayEquals( new String[] { "*", "?", "?", "*" }, 
FilenameUtils.splitOnTokens("*??*") );
+        assertArrayEquals( new String[] { "*", "?", "*", "?", "*" }, 
FilenameUtils.splitOnTokens("*?**?*") );
         assertArrayEquals( new String[] { "h", "?", "?", "*" }, 
FilenameUtils.splitOnTokens("h??*") );
         assertArrayEquals( new String[] { "" }, 
FilenameUtils.splitOnTokens("") );
     }