root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use JUnit ExpectedException rule in AntPathMatcherTests

This commit is contained in:
Sam Brannen 2015-05-08 14:37:15 +02:00
parent c7cdbe126d
commit 638926be4f
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,11 +25,16 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
/**
* Unit tests for {@link AntPathMatcher}.
*
* @author Alef Arendsen
* @author Seth Ladd
* @author Juergen Hoeller
@ -41,6 +46,9 @@ public class AntPathMatcherTests {
private AntPathMatcher pathMatcher;
@Rule
public ExpectedException exception = ExpectedException.none();
@Before
public void createMatcher() {
pathMatcher = new AntPathMatcher();
@ -388,14 +396,9 @@ public class AntPathMatcherTests {
*/
@Test
public void extractUriTemplateVarsRegexCapturingGroups() {
try {
pathMatcher.extractUriTemplateVariables("/web/{id:foo(bar)?}", "/web/foobar");
fail("Expected exception");
}
catch (IllegalArgumentException ex) {
assertTrue("Expected helpful message on the use of capturing groups",
ex.getMessage().contains("The number of capturing groups in the pattern"));
}
exception.expect(IllegalArgumentException.class);
exception.expectMessage(containsString("The number of capturing groups in the pattern"));
pathMatcher.extractUriTemplateVariables("/web/{id:foo(bar)?}", "/web/foobar");
}
@Test
@ -430,8 +433,9 @@ public class AntPathMatcherTests {
}
@Ignore("Disabled until SPR-12998 is resolved")
@Test(expected = IllegalArgumentException.class)
@Test
public void combineWithTwoFileExtensionPatterns() {
exception.expect(IllegalArgumentException.class);
pathMatcher.combine("/*.html", "/*.txt");
}