Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More refinements for combine()

Browse Source
This commit is contained in:
Arjen Poutsma
2009-04-03 11:35:18 +00:00
parent 5dbae2c979
commit 07e6d9d966
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
org.springframework.core/src/test/java/org/springframework/util/AntPathMatcherTests.java
View File

@@ -351,15 +351,22 @@ public class AntPathMatcherTests {
assertEquals("/hotels/*/booking/{booking}", pathMatcher.combine("/hotels/*/booking", "{booking}"));
assertEquals("/hotel.html", pathMatcher.combine("/*.html", "/hotel.html"));
try {
pathMatcher.combine("/*.html", "/hotel");
fail("IllegalArgumentException expected");
String result = pathMatcher.combine("/*.html", "/hotel");
fail("IllegalArgumentException expected; got " + result);
}
catch (IllegalArgumentException ex) {
// expected
}
try {
pathMatcher.combine("/*.html", "/*.txt");
fail("IllegalArgumentException expected");
String result = pathMatcher.combine("/*.html", "/*.txt");
fail("IllegalArgumentException expected; got " + result);
}
catch (IllegalArgumentException ex) {
// expected
}
try {
String result = pathMatcher.combine("/hotel.html", "/bookings.html");
fail("IllegalArgumentException expected; got " + result);
}
catch (IllegalArgumentException ex) {
// expected