From c7cdbe126db6ab5e3422e764d4effa3a5ef2148b Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 8 May 2015 14:31:21 +0200 Subject: [PATCH] Introduce failing test case in AntPathMatcherTests Issue: SPR-12998 --- .../org/springframework/util/AntPathMatcherTests.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java b/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java index 6bef14d740..a74d944b3d 100644 --- a/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java +++ b/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; @@ -34,6 +35,7 @@ import static org.junit.Assert.*; * @author Juergen Hoeller * @author Arjen Poutsma * @author Rossen Stoyanchev + * @author Sam Brannen */ public class AntPathMatcherTests { @@ -427,6 +429,12 @@ public class AntPathMatcherTests { 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 public void patternComparator() { Comparator comparator = pathMatcher.getPatternComparator("/hotels/new");