More tests for combine()

16 years ago · 5dbae2c979
parent 56ddc76712
commit 5dbae2c979
1 changed files with 8 additions and 1 deletions
--- a/org.springframework.core/src/test/java/org/springframework/util/AntPathMatcherTests.java
+++ b/org.springframework.core/src/test/java/org/springframework/util/AntPathMatcherTests.java
@ -351,7 +351,14 @@ public class AntPathMatcherTests {
 		assertEquals("/hotels/*/booking/{booking}", pathMatcher.combine("/hotels/*/booking", "{booking}"));
 		assertEquals("/hotel.html", pathMatcher.combine("/*.html", "/hotel.html"));
 		try {
-			assertEquals("/hotel.html", pathMatcher.combine("/*.html", "/hotel"));
+			pathMatcher.combine("/*.html", "/hotel");
+			fail("IllegalArgumentException expected");
+		}
+		catch (IllegalArgumentException ex) {
+			// expected
+		}
+		try {
+			pathMatcher.combine("/*.html", "/*.txt");
 			fail("IllegalArgumentException expected");
 		}
 		catch (IllegalArgumentException ex) {