Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 09:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove RedirectMatcher

Browse Source 
This is no longer necessary now that Spring 5 is the minimum version.

Fixes gh-4092
This commit is contained in:
Rob Winch 2017-05-11 14:38:18 -05:00
parent d81b436e5d
commit e631805635
4 changed files with 9 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
test/src/test/java/org/springframework/security/test/web/servlet/response/RedirectMatcher.java
View File

@ -1,42 +0,0 @@
/*
* Copyright 2002-2016 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on 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.security.test.web.servlet.response;
import static org.assertj.core.api.Assertions.assertThat;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.ResultMatcher;
/**
* Necessary to support binary compatibility for Spring IO Checks against Cario
* since Spring Framework changed the signature in Spring 5. See
* https://github.com/spring-projects/spring-framework/commit/
* a795fd47142bd3b206ce244b94b1fd1dd0adc2e9
*
* @author Rob Winch
*/
public class RedirectMatcher {
public static ResultMatcher redirectUrl(final String expectedUrl) {
return new ResultMatcher() {
@Override
public void match(MvcResult result) throws Exception {
assertThat(result.getResponse().getRedirectedUrl()).isEqualTo(expectedUrl);
}
};
}
}

7
test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java
View File

@ -16,7 +16,6 @@
package org.springframework.security.test.web.servlet.showcase.login;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.*;
import static org.springframework.security.test.web.servlet.response.RedirectMatcher.redirectUrl;
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.*;
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@ -68,7 +67,7 @@ public class AuthenticationTests {
@Test
public void authenticationSuccess() throws Exception {
mvc.perform(formLogin()).andExpect(status().isFound())
.andExpect(redirectUrl("/"))
.andExpect(redirectedUrl("/"))
.andExpect(authenticated().withUsername("user"));
}
@ -76,7 +75,7 @@ public class AuthenticationTests {
public void authenticationFailed() throws Exception {
mvc.perform(formLogin().user("user").password("invalid"))
.andExpect(status().isFound())
.andExpect(redirectUrl("/login?error"))
.andExpect(redirectedUrl("/login?error"))
.andExpect(unauthenticated());
}
@ -92,4 +91,4 @@ public class AuthenticationTests {
}
// @formatter:on
}
}
}

7
test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java
View File

@ -17,7 +17,6 @@ package org.springframework.security.test.web.servlet.showcase.login;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.*;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*;
import static org.springframework.security.test.web.servlet.response.RedirectMatcher.redirectUrl;
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.*;
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@ -65,7 +64,7 @@ public class CustomConfigAuthenticationTests {
mvc.perform(
formLogin("/authenticate").user("user", "user").password("pass",
"password")).andExpect(status().isFound())
.andExpect(redirectUrl("/"))
.andExpect(redirectedUrl("/"))
.andExpect(authenticated().withUsername("user"));
}
@ -81,7 +80,7 @@ public class CustomConfigAuthenticationTests {
mvc.perform(
formLogin("/authenticate").user("user", "notfound").password("pass",
"invalid")).andExpect(status().isFound())
.andExpect(redirectUrl("/authenticate?error"))
.andExpect(redirectedUrl("/authenticate?error"))
.andExpect(unauthenticated());
}
@ -122,4 +121,4 @@ public class CustomConfigAuthenticationTests {
return repo;
}
}
}
}

7
test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java
View File

@ -15,7 +15,6 @@
*/
package org.springframework.security.test.web.servlet.showcase.login;
import static org.springframework.security.test.web.servlet.response.RedirectMatcher.redirectUrl;
import static org.springframework.security.test.web.servlet.response.SecurityMockMvcResultMatchers.*;
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@ -57,7 +56,7 @@ public class CustomLoginRequestBuilderAuthenticationTests {
public void authenticationSuccess() throws Exception {
mvc.perform(login())
.andExpect(status().isFound())
.andExpect(redirectUrl("/"))
.andExpect(redirectedUrl("/"))
.andExpect(authenticated().withUsername("user"));
}
@ -65,7 +64,7 @@ public class CustomLoginRequestBuilderAuthenticationTests {
public void authenticationFailed() throws Exception {
mvc.perform(login().user("notfound").password("invalid"))
.andExpect(status().isFound())
.andExpect(redirectUrl("/authenticate?error"))
.andExpect(redirectedUrl("/authenticate?error"))
.andExpect(unauthenticated());
}
@ -101,4 +100,4 @@ public class CustomLoginRequestBuilderAuthenticationTests {
}
// @formatter:on
}
}
}