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

AntPathMatcher actually throws IllegalArgumentException if patterns cannot be combined

Browse Source 
Issue: SPR-12998
This commit is contained in:
Juergen Hoeller
2015-05-09 15:29:33 +02:00
parent acfc95e260
commit 1e046435ab
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java
View File

@@ -44,15 +44,11 @@ import static org.junit.Assert.*;
*/
public class AntPathMatcherTests {
private AntPathMatcher pathMatcher;
private final AntPathMatcher pathMatcher = new AntPathMatcher();
@Rule
public ExpectedException exception = ExpectedException.none();
public final ExpectedException exception = ExpectedException.none();
@Before
public void createMatcher() {
pathMatcher = new AntPathMatcher();
}
@Test
public void match() {
@@ -432,7 +428,6 @@ public class AntPathMatcherTests {
assertEquals("/hotel/booking", pathMatcher.combine("/hotel/", "/booking")); // SPR-12975
}
@Ignore("Disabled until SPR-12998 is resolved")
@Test
public void combineWithTwoFileExtensionPatterns() {
exception.expect(IllegalArgumentException.class);