|
|
@ -24,6 +24,7 @@ import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
|
|
import org.junit.Before; |
|
|
|
import org.junit.Before; |
|
|
|
|
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.junit.Test; |
|
|
|
|
|
|
|
|
|
|
|
import static org.junit.Assert.*; |
|
|
|
import static org.junit.Assert.*; |
|
|
@ -34,6 +35,7 @@ import static org.junit.Assert.*; |
|
|
|
* @author Juergen Hoeller |
|
|
|
* @author Juergen Hoeller |
|
|
|
* @author Arjen Poutsma |
|
|
|
* @author Arjen Poutsma |
|
|
|
* @author Rossen Stoyanchev |
|
|
|
* @author Rossen Stoyanchev |
|
|
|
|
|
|
|
* @author Sam Brannen |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public class AntPathMatcherTests { |
|
|
|
public class AntPathMatcherTests { |
|
|
|
|
|
|
|
|
|
|
@ -427,6 +429,12 @@ public class AntPathMatcherTests { |
|
|
|
assertEquals("/hotel/booking", pathMatcher.combine("/hotel/", "/booking")); // SPR-12975
|
|
|
|
assertEquals("/hotel/booking", pathMatcher.combine("/hotel/", "/booking")); // SPR-12975
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Ignore("Disabled until SPR-12998 is resolved") |
|
|
|
|
|
|
|
@Test(expected = IllegalArgumentException.class) |
|
|
|
|
|
|
|
public void combineWithTwoFileExtensionPatterns() { |
|
|
|
|
|
|
|
pathMatcher.combine("/*.html", "/*.txt"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
@Test |
|
|
|
public void patternComparator() { |
|
|
|
public void patternComparator() { |
|
|
|
Comparator<String> comparator = pathMatcher.getPatternComparator("/hotels/new"); |
|
|
|
Comparator<String> comparator = pathMatcher.getPatternComparator("/hotels/new"); |
|
|
|