Browse Source

Upgrade to Hamcrest 1.3

pull/164/merge
Phillip Webb 13 years ago
parent
commit
39682b7d3f
  1. 2
      build.gradle
  2. 6
      spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/StatusAssertionTests.java

2
build.gradle

@ -34,7 +34,7 @@ configure(allprojects) { @@ -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

@ -25,6 +25,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder @@ -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 { @@ -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

Loading…
Cancel
Save