From e6318056354a58eed6bcdcc3db3fb7e93f7a9837 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 11 May 2017 14:38:18 -0500 Subject: [PATCH] Remove RedirectMatcher This is no longer necessary now that Spring 5 is the minimum version. Fixes gh-4092 --- .../web/servlet/response/RedirectMatcher.java | 42 ------------------- .../showcase/login/AuthenticationTests.java | 7 ++-- .../CustomConfigAuthenticationTests.java | 7 ++-- ...oginRequestBuilderAuthenticationTests.java | 7 ++-- 4 files changed, 9 insertions(+), 54 deletions(-) delete mode 100644 test/src/test/java/org/springframework/security/test/web/servlet/response/RedirectMatcher.java diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/RedirectMatcher.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/RedirectMatcher.java deleted file mode 100644 index 9311846f53..0000000000 --- a/test/src/test/java/org/springframework/security/test/web/servlet/response/RedirectMatcher.java +++ /dev/null @@ -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); - } - }; - } -} diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java index ce7857d9c6..93ffb05652 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java @@ -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 } -} \ No newline at end of file +} diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java index 4bde426c27..9775c6822b 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java @@ -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; } } -} \ No newline at end of file +} diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java index 8fe37526eb..70348b0891 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java @@ -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 } -} \ No newline at end of file +}