Browse Source

Clean up regarding deprecated HttpStatus.MOVED_TEMPORARILY

pull/623/merge
Sam Brannen 12 years ago
parent
commit
2cbd5ba993
  1. 1
      spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
  2. 7
      spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
  3. 4
      spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
  4. 4
      spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java

1
spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java

@ -283,6 +283,7 @@ public class StatusResultMatchers { @@ -283,6 +283,7 @@ public class StatusResultMatchers {
/**
* Assert the response status code is {@code HttpStatus.MOVED_TEMPORARILY} (302).
* @see #isFound()
* @deprecated in favor of {@link #isFound()}
*/
@Deprecated
public ResultMatcher isMovedTemporarily() {

7
spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package org.springframework.test.web.servlet.samples.standalone;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@ -53,7 +54,7 @@ public class FilterTests { @@ -53,7 +54,7 @@ public class FilterTests {
standaloneSetup(new PersonController())
.addFilters(new ContinueFilter()).build()
.perform(post("/persons").param("name", "Andy"))
.andExpect(status().isMovedTemporarily())
.andExpect(status().isFound())
.andExpect(redirectedUrl("/person/1"))
.andExpect(model().size(1))
.andExpect(model().attributeExists("id"))
@ -90,7 +91,7 @@ public class FilterTests { @@ -90,7 +91,7 @@ public class FilterTests {
standaloneSetup(new PersonController())
.addFilter(new RedirectFilter(), "/p", "/person").build()
.perform(post("/persons").param("name", "Andy"))
.andExpect(status().isMovedTemporarily())
.andExpect(status().isFound())
.andExpect(redirectedUrl("/person/1"))
.andExpect(model().size(1))
.andExpect(model().attributeExists("id"))

4
spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -51,7 +51,7 @@ public class RedirectTests { @@ -51,7 +51,7 @@ public class RedirectTests {
@Test
public void save() throws Exception {
this.mockMvc.perform(post("/persons").param("name", "Andy"))
.andExpect(status().isMovedTemporarily())
.andExpect(status().isFound())
.andExpect(redirectedUrl("/persons/Joe"))
.andExpect(model().size(1))
.andExpect(model().attributeExists("name"))

4
spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -48,7 +48,7 @@ public class FlashAttributeAssertionTests { @@ -48,7 +48,7 @@ public class FlashAttributeAssertionTests {
@Before
public void setup() {
this.mockMvc = standaloneSetup(new PersonController())
.alwaysExpect(status().isMovedTemporarily())
.alwaysExpect(status().isFound())
.alwaysExpect(flash().attributeCount(3))
.build();
}

Loading…
Cancel
Save