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

Upgrade to Hamcrest 1.3

Browse Source
This commit is contained in:
Phillip Webb
2012-10-30 15:52:46 -07:00
parent 22dfe93f2f
commit 39682b7d3f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -34,7 +34,7 @@ configure(allprojects) {
}
dependencies {
testCompile "org.hamcrest:hamcrest-all:1.1"
testCompile "org.hamcrest:hamcrest-all:1.3"
testCompile "org.easymock:easymock:2.5.1"
}

6
spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java
View File

@@ -25,6 +25,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
import org.hamcrest.Matcher;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.HttpStatus;
@@ -60,11 +61,10 @@ public class StatusAssertionTests {
this.mockMvc.perform(get("/badRequest")).andExpect(status().isBadRequest());
}
@SuppressWarnings("unchecked")
@Test
public void testMatcher() throws Exception {
this.mockMvc.perform(get("/badRequest"))
.andExpect(status().is(allOf(greaterThanOrEqualTo(400), lessThan(500))));
Matcher<Integer> matcher = allOf(greaterThanOrEqualTo(400), lessThan(500));
this.mockMvc.perform(get("/badRequest")).andExpect(status().is(matcher));
}
@Test