@@ -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