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

openrewrite Junit Migration

Browse Source
This commit is contained in:
Rob Winch
2021-07-08 14:52:28 -05:00
parent 8652f01269
commit 3e93b024d6
999 changed files with 3088 additions and 3092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/test/java/org/springframework/security/web/DefaultRedirectStrategyTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

10
web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java
View File

@@ -27,9 +27,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -71,7 +71,7 @@ public class FilterChainProxyTests {
private Filter filter;
@Before
@BeforeEach
public void setup() throws Exception {
this.matcher = mock(RequestMatcher.class);
this.filter = mock(Filter.class);
@@ -90,7 +90,7 @@ public class FilterChainProxyTests {
this.chain = mock(FilterChain.class);
}
@After
@AfterEach
public void teardown() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/FilterInvocationTests.java
View File

@@ -20,7 +20,7 @@ import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/PortMapperImplTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.security.web;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

2
web/src/test/java/org/springframework/security/web/PortResolverImplTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;

2
web/src/test/java/org/springframework/security/web/RequestMatcherRedirectFilterTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.security.web;
import javax.servlet.FilterChain;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockHttpServletRequest;

6
web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.security.web.access;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.security.access.AccessDecisionManager;
@@ -54,7 +54,7 @@ public class DefaultWebInvocationPrivilegeEvaluatorTests {
private FilterSecurityInterceptor interceptor;
@Before
@BeforeEach
public final void setUp() {
this.interceptor = new FilterSecurityInterceptor();
this.ods = mock(FilterInvocationSecurityMetadataSource.class);

12
web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java
View File

@@ -21,11 +21,11 @@ import java.util.LinkedHashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.web.csrf.CsrfException;
@@ -36,7 +36,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class DelegatingAccessDeniedHandlerTests {
@Mock
@@ -58,7 +58,7 @@ public class DelegatingAccessDeniedHandlerTests {
private DelegatingAccessDeniedHandler handler;
@Before
@BeforeEach
public void setup() {
this.handlers = new LinkedHashMap<>();
}

10
web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java
View File

@@ -25,9 +25,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
@@ -64,8 +64,8 @@ import static org.mockito.Mockito.verifyZeroInteractions;
*/
public class ExceptionTranslationFilterTests {
@After
@Before
@AfterEach
@BeforeEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

6
web/src/test/java/org/springframework/security/web/access/RequestMatcherDelegatingAccessDeniedHandlerTests.java
View File

@@ -20,8 +20,8 @@ import java.util.LinkedHashMap;
import javax.servlet.http.HttpServletRequest;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.util.matcher.RequestMatcher;
@@ -44,7 +44,7 @@ public class RequestMatcherDelegatingAccessDeniedHandlerTests {
private HttpServletRequest request;
@Before
@BeforeEach
public void setup() {
this.accessDeniedHandler = mock(AccessDeniedHandler.class);
this.deniedHandlers = new LinkedHashMap<>();

2
web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java
View File

@@ -24,7 +24,7 @@ import java.util.Vector;
import javax.servlet.FilterChain;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java
View File

@@ -21,7 +21,7 @@ import java.util.Collection;
import javax.servlet.FilterChain;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.security.web.access.channel;
import javax.servlet.FilterChain;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.security.web.access.channel;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.security.web.access.channel;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.security.web.access.channel;
import javax.servlet.FilterChain;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

6
web/src/test/java/org/springframework/security/web/access/expression/AbstractVariableEvaluationContextPostProcessorTests.java
View File

@@ -21,8 +21,8 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.spel.support.StandardEvaluationContext;
@@ -52,7 +52,7 @@ public class AbstractVariableEvaluationContextPostProcessorTests {
EvaluationContext context;
@Before
@BeforeEach
public void setup() {
this.processor = new VariableEvaluationContextPostProcessor();
this.request = new MockHttpServletRequest();

16
web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java
View File

@@ -16,12 +16,12 @@
package org.springframework.security.web.access.expression;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.support.StaticApplicationContext;
@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class DefaultWebSecurityExpressionHandlerTests {
@Mock
@@ -53,12 +53,12 @@ public class DefaultWebSecurityExpressionHandlerTests {
private DefaultWebSecurityExpressionHandler handler;
@Before
@BeforeEach
public void setup() {
this.handler = new DefaultWebSecurityExpressionHandler();
}
@After
@AfterEach
public void cleanup() {
SecurityContextHolder.clearContext();
}

8
web/src/test/java/org/springframework/security/web/access/expression/DelegatingEvaluationContextTests.java
View File

@@ -19,11 +19,11 @@ package org.springframework.security.web.access.expression;
import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.expression.BeanResolver;
import org.springframework.expression.ConstructorResolver;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.verify;
/**
* @author Rob Winch
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class DelegatingEvaluationContextTests {
@Mock

2
web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.security.web.access.expression;
import java.util.Collection;
import java.util.LinkedHashMap;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.security.access.ConfigAttribute;
import org.springframework.security.access.SecurityConfig;

2
web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java
View File

@@ -23,7 +23,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.aopalliance.intercept.MethodInvocation;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;

2
web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.security.web.access.expression;
import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.core.Authentication;

6
web/src/test/java/org/springframework/security/web/access/intercept/AuthorizationFilterTests.java
View File

@@ -21,8 +21,8 @@ import java.util.function.Supplier;
import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -53,7 +53,7 @@ import static org.mockito.Mockito.verifyNoInteractions;
*/
public class AuthorizationFilterTests {
@After
@AfterEach
public void tearDown() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java
View File

@@ -21,7 +21,7 @@ import java.util.LinkedHashMap;
import javax.servlet.FilterChain;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

10
web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java
View File

@@ -20,9 +20,9 @@ import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.mock.web.MockFilterChain;
@@ -75,7 +75,7 @@ public class FilterSecurityInterceptorTests {
private ApplicationEventPublisher publisher;
@Before
@BeforeEach
public final void setUp() {
this.interceptor = new FilterSecurityInterceptor();
this.am = mock(AuthenticationManager.class);
@@ -91,7 +91,7 @@ public class FilterSecurityInterceptorTests {
SecurityContextHolder.clearContext();
}
@After
@AfterEach
public void tearDown() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/access/intercept/RequestKeyTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.access.intercept;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

2
web/src/test/java/org/springframework/security/web/access/intercept/RequestMatcherDelegatingAuthorizationManagerTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.security.web.access.intercept;
import java.util.function.Supplier;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.authentication.TestingAuthenticationToken;

10
web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java
View File

@@ -24,9 +24,9 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -80,7 +80,7 @@ public class AbstractAuthenticationProcessingFilterTests {
return request;
}
@Before
@BeforeEach
public void setUp() {
this.successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
this.successHandler.setDefaultTargetUrl("/logged_in.jsp");
@@ -89,7 +89,7 @@ public class AbstractAuthenticationProcessingFilterTests {
SecurityContextHolder.clearContext();
}
@After
@AfterEach
public void tearDown() {
SecurityContextHolder.clearContext();
}

10
web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java
View File

@@ -25,9 +25,9 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -54,8 +54,8 @@ public class AnonymousAuthenticationFilterTests {
filter.doFilter(request, response, filterChain);
}
@Before
@After
@BeforeEach
@AfterEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

16
web/src/test/java/org/springframework/security/web/authentication/AuthenticationFilterTests.java
View File

@@ -22,12 +22,12 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockFilterChain;
@@ -55,7 +55,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
* @author Sergey Bespalov
* @since 5.2.0
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class AuthenticationFilterTests {
@Mock
@@ -76,12 +76,12 @@ public class AuthenticationFilterTests {
@Mock
private RequestMatcher requestMatcher;
@Before
@BeforeEach
public void setup() {
given(this.authenticationManagerResolver.resolve(any())).willReturn(this.authenticationManager);
}
@After
@AfterEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java
View File

@@ -23,7 +23,7 @@ import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.MessageSourceAccessor;
import org.springframework.mock.web.MockHttpServletRequest;

8
web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java
View File

@@ -19,8 +19,8 @@ package org.springframework.security.web.authentication;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -29,13 +29,13 @@ import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@RunWith(SpringJUnit4ClassRunner.class)
@ExtendWith(SpringExtension.class)
@ContextConfiguration(
locations = "classpath:org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest-context.xml")
public class DelegatingAuthenticationEntryPointContextTests {

6
web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java
View File

@@ -20,8 +20,8 @@ import java.util.LinkedHashMap;
import javax.servlet.http.HttpServletRequest;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.web.AuthenticationEntryPoint;
@@ -49,7 +49,7 @@ public class DelegatingAuthenticationEntryPointTests {
private HttpServletRequest request = new MockHttpServletRequest();
@Before
@BeforeEach
public void before() {
this.defaultEntryPoint = mock(AuthenticationEntryPoint.class);
this.entryPoints = new LinkedHashMap<>();

12
web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java
View File

@@ -21,11 +21,11 @@ import java.util.LinkedHashMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.security.authentication.AccountExpiredException;
import org.springframework.security.authentication.AccountStatusException;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
* @author Kazuki shimizu
* @since 4.0
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class DelegatingAuthenticationFailureHandlerTests {
@Mock
@@ -66,7 +66,7 @@ public class DelegatingAuthenticationFailureHandlerTests {
private DelegatingAuthenticationFailureHandler handler;
@Before
@BeforeEach
public void setup() {
this.handlers = new LinkedHashMap<>();
}

2
web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.security.web.authentication;
import java.util.HashMap;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/authentication/ForwardAuthenticaionSuccessHandlerTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/authentication/ForwardAuthenticationFailureHandlerTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

6
web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.security.web.authentication;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -42,7 +42,7 @@ public class HttpStatusEntryPointTests {
HttpStatusEntryPoint entryPoint;
@SuppressWarnings("serial")
@Before
@BeforeEach
public void setup() {
this.request = new MockHttpServletRequest();
this.response = new MockHttpServletResponse();

2
web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.security.web.authentication;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandlerTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;
import org.springframework.mock.web.MockHttpServletRequest;

2
web/src/test/java/org/springframework/security/web/authentication/logout/CompositeLogoutHandlerTests.java
View File

@@ -22,7 +22,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.mockito.InOrder;
import org.springframework.security.core.Authentication;

2
web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.security.web.authentication.logout;
import javax.servlet.http.Cookie;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

12
web/src/test/java/org/springframework/security/web/authentication/logout/DelegatingLogoutSuccessHandlerTests.java
View File

@@ -20,11 +20,11 @@ import java.util.LinkedHashMap;
import javax.servlet.http.HttpServletRequest;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.core.Authentication;
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
* @author Shazin Sadakath
* @author Rob Winch
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class DelegatingLogoutSuccessHandlerTests {
@Mock
@@ -69,7 +69,7 @@ public class DelegatingLogoutSuccessHandlerTests {
DelegatingLogoutSuccessHandler delegatingHandler;
@Before
@BeforeEach
public void setup() {
LinkedHashMap<RequestMatcher, LogoutSuccessHandler> matcherToHandler = new LinkedHashMap<>();
matcherToHandler.put(this.matcher, this.handler);

2
web/src/test/java/org/springframework/security/web/authentication/logout/ForwardLogoutSuccessHandlerTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication.logout;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

6
web/src/test/java/org/springframework/security/web/authentication/logout/HeaderWriterLogoutHandlerTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.security.web.authentication.logout;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -39,7 +39,7 @@ public class HeaderWriterLogoutHandlerTests {
private MockHttpServletRequest request;
@Before
@BeforeEach
public void setup() {
this.response = new MockHttpServletResponse();
this.request = new MockHttpServletRequest();

2
web/src/test/java/org/springframework/security/web/authentication/logout/HttpStatusReturningLogoutSuccessHandlerTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication.logout;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockHttpServletRequest;

6
web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.security.web.authentication.logout;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -32,7 +32,7 @@ public class LogoutHandlerTests {
LogoutFilter filter;
@Before
@BeforeEach
public void setUp() {
this.filter = new LogoutFilter("/success", new SecurityContextLogoutHandler());
}

2
web/src/test/java/org/springframework/security/web/authentication/logout/LogoutSuccessEventPublishingLogoutHandlerTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication.logout;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.mock.web.MockHttpServletRequest;

10
web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java
View File

@@ -16,9 +16,9 @@
package org.springframework.security.web.authentication.logout;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -42,7 +42,7 @@ public class SecurityContextLogoutHandlerTests {
private SecurityContextLogoutHandler handler;
@Before
@BeforeEach
public void setUp() {
this.request = new MockHttpServletRequest();
this.response = new MockHttpServletResponse();
@@ -53,7 +53,7 @@ public class SecurityContextLogoutHandlerTests {
SecurityContextHolder.setContext(context);
}
@After
@AfterEach
public void tearDown() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandlerTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication.logout;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

10
web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java
View File

@@ -20,9 +20,9 @@ import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;
import org.springframework.mock.web.MockFilterChain;
@@ -59,7 +59,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests {
private AbstractPreAuthenticatedProcessingFilter filter;
@Before
@BeforeEach
public void createFilter() {
this.filter = new AbstractPreAuthenticatedProcessingFilter() {
@Override
@@ -75,7 +75,7 @@ public class AbstractPreAuthenticatedProcessingFilterTests {
SecurityContextHolder.clearContext();
}
@After
@AfterEach
public void tearDown() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication.preauth;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;

2
web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.security.web.authentication.preauth;
import java.util.Collection;
import java.util.List;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils;

2
web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.security.web.authentication.preauth;
import java.util.List;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils;

2
web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java
View File

@@ -23,7 +23,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.core.GrantedAuthority;

10
web/src/test/java/org/springframework/security/web/authentication/preauth/RequestAttributeAuthenticationFilterTests.java
View File

@@ -16,9 +16,9 @@
package org.springframework.security.web.authentication.preauth;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;
import org.springframework.mock.web.MockFilterChain;
@@ -39,8 +39,8 @@ import static org.mockito.Mockito.mock;
*/
public class RequestAttributeAuthenticationFilterTests {
@After
@Before
@AfterEach
@BeforeEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

10
web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java
View File

@@ -16,9 +16,9 @@
package org.springframework.security.web.authentication.preauth.header;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;
import org.springframework.mock.web.MockFilterChain;
@@ -41,8 +41,8 @@ import static org.mockito.Mockito.mock;
*/
public class RequestHeaderAuthenticationFilterTests {
@After
@Before
@AfterEach
@BeforeEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java
View File

@@ -24,7 +24,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.core.GrantedAuthority;

2
web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java
View File

@@ -22,7 +22,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;

2
web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java
View File

@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Set;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;

6
web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.security.web.authentication.preauth.websphere;
import javax.servlet.FilterChain;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock;
*/
public class WebSpherePreAuthenticatedProcessingFilterTests {
@After
@AfterEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

6
web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.security.web.authentication.preauth.x509;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.MessageSource;
import org.springframework.security.authentication.BadCredentialsException;
@@ -37,7 +37,7 @@ public class SubjectDnX509PrincipalExtractorTests {
SubjectDnX509PrincipalExtractor extractor;
@Before
@BeforeEach
public void setUp() {
this.extractor = new SubjectDnX509PrincipalExtractor();
}

6
web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java
View File

@@ -20,8 +20,8 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.context.MessageSource;
@@ -56,7 +56,7 @@ public class AbstractRememberMeServicesTests {
MockUserDetailsService uds;
@Before
@BeforeEach
public void setup() {
this.uds = new MockUserDetailsService(joe, false);
}

24
web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
View File

@@ -23,15 +23,15 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* @author Luke Taylor
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class JdbcTokenRepositoryImplTests {
@Mock
@@ -61,19 +61,19 @@ public class JdbcTokenRepositoryImplTests {
private JdbcTemplate template;
@BeforeClass
@BeforeAll
public static void createDataSource() {
dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:tokenrepotest", "sa", "", true);
dataSource.setDriverClassName("org.hsqldb.jdbc.JDBCDriver");
}
@AfterClass
@AfterAll
public static void clearDataSource() {
dataSource.destroy();
dataSource = null;
}
@Before
@BeforeEach
public void populateDatabase() {
this.repo = new JdbcTokenRepositoryImpl();
ReflectionTestUtils.setField(this.repo, "logger", this.logger);
@@ -84,7 +84,7 @@ public class JdbcTokenRepositoryImplTests {
+ "series varchar(100) not null, token varchar(500) not null, last_used timestamp not null)");
}
@After
@AfterEach
public void clearData() {
this.template.execute("drop table persistent_logins");
}

2
web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication.rememberme;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.security.web.authentication.NullRememberMeServices;

6
web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java
View File

@@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit;
import javax.servlet.http.Cookie;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -41,7 +41,7 @@ public class PersistentTokenBasedRememberMeServicesTests {
private MockTokenRepository repo;
@Before
@BeforeEach
public void setUpData() throws Exception {
this.services = new PersistentTokenBasedRememberMeServices("key",
new AbstractRememberMeServicesTests.MockUserDetailsService(AbstractRememberMeServicesTests.joe, false),

10
web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java
View File

@@ -20,9 +20,9 @@ import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -54,12 +54,12 @@ public class RememberMeAuthenticationFilterTests {
Authentication remembered = new TestingAuthenticationToken("remembered", "password", "ROLE_REMEMBERED");
@Before
@BeforeEach
public void setUp() {
SecurityContextHolder.clearContext();
}
@After
@AfterEach
public void tearDown() {
SecurityContextHolder.clearContext();
}

6
web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java
View File

@@ -22,8 +22,8 @@ import javax.servlet.http.Cookie;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -58,7 +58,7 @@ public class TokenBasedRememberMeServicesTests {
private TokenBasedRememberMeServices services;
@Before
@BeforeEach
public void createTokenBasedRememberMeServices() {
this.uds = mock(UserDetailsService.class);
this.services = new TokenBasedRememberMeServices("key", this.uds);

2
web/src/test/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategyTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication.session;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;

8
web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java
View File

@@ -22,10 +22,10 @@ import java.util.Collections;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.security.core.Authentication;
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.verify;
* @author Rob Winch
*
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class CompositeSessionAuthenticationStrategyTests {
@Mock

12
web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java
View File

@@ -20,11 +20,11 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -46,7 +46,7 @@ import static org.mockito.BDDMockito.given;
* @author Rob Winch
*
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class ConcurrentSessionControlAuthenticationStrategyTests {
@Mock
@@ -62,7 +62,7 @@ public class ConcurrentSessionControlAuthenticationStrategyTests {
private ConcurrentSessionControlAuthenticationStrategy strategy;
@Before
@BeforeEach
public void setup() {
this.authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");
this.request = new MockHttpServletRequest();

12
web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java
View File

@@ -16,11 +16,11 @@
package org.springframework.security.web.authentication.session;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify;
* @author Rob Winch
*
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class RegisterSessionAuthenticationStrategyTests {
@Mock
@@ -49,7 +49,7 @@ public class RegisterSessionAuthenticationStrategyTests {
private MockHttpServletResponse response;
@Before
@BeforeEach
public void setup() {
this.authenticationStrategy = new RegisterSessionAuthenticationStrategy(this.registry);
this.authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");

10
web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java
View File

@@ -21,9 +21,9 @@ import java.util.List;
import javax.servlet.FilterChain;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -64,13 +64,13 @@ public class SwitchUserFilterTests {
private static final List<GrantedAuthority> ROLES_12 = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO");
@Before
@BeforeEach
public void authenticateCurrentUser() {
UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("dano", "hawaii50");
SecurityContextHolder.getContext().setAuthentication(auth);
}
@After
@AfterEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthorityTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication.switchuser;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

2
web/src/test/java/org/springframework/security/web/authentication/ui/DefaultLogoutPageGeneratingFilterTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.security.web.authentication.ui;
import java.util.Collections;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;

12
web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationConverterTests.java
View File

@@ -19,11 +19,11 @@ package org.springframework.security.web.authentication.www;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.codec.binary.Base64;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.security.authentication.AuthenticationDetailsSource;
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
* @author Sergey Bespalov
* @since 5.2.0
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class BasicAuthenticationConverterTests {
@Mock
@@ -48,7 +48,7 @@ public class BasicAuthenticationConverterTests {
private BasicAuthenticationConverter converter;
@Before
@BeforeEach
public void setup() {
this.converter = new BasicAuthenticationConverter(this.authenticationDetailsSource);
}

2
web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPointTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.authentication.www;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockHttpServletRequest;

10
web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java
View File

@@ -24,9 +24,9 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.codec.binary.Base64;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -61,7 +61,7 @@ public class BasicAuthenticationFilterTests {
private AuthenticationManager manager;
@Before
@BeforeEach
public void setUp() {
SecurityContextHolder.clearContext();
UsernamePasswordAuthenticationToken rodRequest = new UsernamePasswordAuthenticationToken("rod", "koala");
@@ -74,7 +74,7 @@ public class BasicAuthenticationFilterTests {
this.filter = new BasicAuthenticationFilter(this.manager, new BasicAuthenticationEntryPoint());
}
@After
@AfterEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.security.web.authentication.www;
import java.util.Map;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.util.StringUtils;

2
web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java
View File

@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

10
web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java
View File

@@ -26,9 +26,9 @@ import javax.servlet.ServletRequest;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -108,12 +108,12 @@ public class DigestAuthenticationFilterTests {
return new String(Base64.encodeBase64(nonceValue.getBytes()));
}
@After
@AfterEach
public void clearContext() {
SecurityContextHolder.clearContext();
}
@Before
@BeforeEach
public void setUp() {
SecurityContextHolder.clearContext();
// Create User Details Service

10
web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java
View File

@@ -22,9 +22,9 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Method;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.core.MethodParameter;
import org.springframework.security.authentication.TestingAuthenticationToken;
@@ -49,12 +49,12 @@ public class AuthenticationPrincipalArgumentResolverTests {
private AuthenticationPrincipalArgumentResolver resolver;
@Before
@BeforeEach
public void setup() {
this.resolver = new AuthenticationPrincipalArgumentResolver();
}
@After
@AfterEach
public void cleanup() {
SecurityContextHolder.clearContext();
}

6
web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java
View File

@@ -22,8 +22,8 @@ import java.util.List;
import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -59,7 +59,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
*/
public class ConcurrentSessionFilterTests {
@After
@AfterEach
public void cleanup() {
SecurityContextHolder.clearContext();
}

2
web/src/test/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializerTests.java
View File

@@ -28,7 +28,7 @@ import javax.servlet.FilterRegistration;
import javax.servlet.ServletContext;
import javax.servlet.SessionTrackingMode;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.context.annotation.Configuration;

6
web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java
View File

@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import javax.servlet.http.HttpSession;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -70,7 +70,7 @@ public class HttpSessionSecurityContextRepositoryTests {
private final TestingAuthenticationToken testToken = new TestingAuthenticationToken("someone", "passwd", "ROLE_A");
@After
@AfterEach
public void tearDown() {
SecurityContextHolder.clearContext();
}

16
web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java
View File

@@ -18,12 +18,12 @@ package org.springframework.security.web.context;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.core.context.SecurityContext;
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Rob Winch
*
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class SaveContextOnUpdateOrErrorResponseWrapperTests {
@Mock
@@ -45,14 +45,14 @@ public class SaveContextOnUpdateOrErrorResponseWrapperTests {
private SaveContextOnUpdateOrErrorResponseWrapperStub wrappedResponse;
@Before
@BeforeEach
public void setUp() {
this.response = new MockHttpServletResponse();
this.wrappedResponse = new SaveContextOnUpdateOrErrorResponseWrapperStub(this.response, true);
SecurityContextHolder.setContext(this.securityContext);
}
@After
@AfterEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

6
web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java
View File

@@ -22,8 +22,8 @@ import javax.servlet.FilterChain;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -44,7 +44,7 @@ public class SecurityContextPersistenceFilterTests {
TestingAuthenticationToken testToken = new TestingAuthenticationToken("someone", "passwd", "ROLE_A");
@After
@AfterEach
public void clearContext() {
SecurityContextHolder.clearContext();
}

12
web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java
View File

@@ -18,11 +18,11 @@ package org.springframework.security.web.context.request.async;
import java.util.concurrent.Callable;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
* @author Rob Winch
*
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class SecurityContextCallableProcessingInterceptorTests {
@Mock
@@ -47,7 +47,7 @@ public class SecurityContextCallableProcessingInterceptorTests {
@Mock
private NativeWebRequest webRequest;
@After
@AfterEach
public void clearSecurityContext() {
SecurityContextHolder.clearContext();
}

16
web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java
View File

@@ -22,12 +22,12 @@ import java.util.concurrent.ThreadFactory;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.mock.web.MockFilterChain;
@@ -46,7 +46,7 @@ import static org.mockito.BDDMockito.given;
* @author Rob Winch
*
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class WebAsyncManagerIntegrationFilterTests {
@Mock
@@ -69,7 +69,7 @@ public class WebAsyncManagerIntegrationFilterTests {
private WebAsyncManagerIntegrationFilter filter;
@Before
@BeforeEach
public void setUp() {
this.filterChain = new MockFilterChain();
this.threadFactory = new JoinableThreadFactory();
@@ -82,7 +82,7 @@ public class WebAsyncManagerIntegrationFilterTests {
this.filter = new WebAsyncManagerIntegrationFilter();
}
@After
@AfterEach
public void clearSecurityContext() {
SecurityContextHolder.clearContext();
}

6
web/src/test/java/org/springframework/security/web/csrf/CookieCsrfTokenRepositoryTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.security.web.csrf;
import javax.servlet.http.Cookie;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -39,7 +39,7 @@ public class CookieCsrfTokenRepositoryTests {
MockHttpServletRequest request;
@Before
@BeforeEach
public void setup() {
this.repository = new CookieCsrfTokenRepository();
this.request = new MockHttpServletRequest();

12
web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java
View File

@@ -19,11 +19,11 @@ package org.springframework.security.web.csrf;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify;
* @author Rob Winch
*
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class CsrfAuthenticationStrategyTests {
@Mock
@@ -57,7 +57,7 @@ public class CsrfAuthenticationStrategyTests {
private CsrfToken generatedToken;
@Before
@BeforeEach
public void setup() {
this.response = new MockHttpServletResponse();
this.request = new MockHttpServletRequest();

12
web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java
View File

@@ -26,11 +26,11 @@ import javax.servlet.http.HttpServletResponse;
import org.assertj.core.api.AbstractObjectAssert;
import org.assertj.core.api.ObjectAssert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -54,7 +54,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
* @author Rob Winch
*
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class CsrfFilterTests {
@Mock
@@ -77,7 +77,7 @@ public class CsrfFilterTests {
private CsrfFilter filter;
@Before
@BeforeEach
public void setup() {
this.token = new DefaultCsrfToken("headerName", "paramName", "csrfTokenValue");
resetRequestResponse();

12
web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java
View File

@@ -16,11 +16,11 @@
package org.springframework.security.web.csrf;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.verify;
* @author Rob Winch
* @since 3.2
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class CsrfLogoutHandlerTests {
@Mock
@@ -45,7 +45,7 @@ public class CsrfLogoutHandlerTests {
private CsrfLogoutHandler handler;
@Before
@BeforeEach
public void setup() {
this.request = new MockHttpServletRequest();
this.response = new MockHttpServletResponse();

2
web/src/test/java/org/springframework/security/web/csrf/DefaultCsrfTokenTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.csrf;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

6
web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.security.web.csrf;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -39,7 +39,7 @@ public class HttpSessionCsrfTokenRepositoryTests {
private HttpSessionCsrfTokenRepository repo;
@Before
@BeforeEach
public void setup() {
this.request = new MockHttpServletRequest();
this.response = new MockHttpServletResponse();

12
web/src/test/java/org/springframework/security/web/csrf/LazyCsrfTokenRepositoryTests.java
View File

@@ -19,12 +19,12 @@ package org.springframework.security.web.csrf;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
/**
* @author Rob Winch
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class LazyCsrfTokenRepositoryTests {
@Mock
@@ -53,7 +53,7 @@ public class LazyCsrfTokenRepositoryTests {
DefaultCsrfToken token;
@Before
@BeforeEach
public void setup() {
this.token = new DefaultCsrfToken("header", "param", "token");
given(this.delegate.generateToken(this.request)).willReturn(this.token);

2
web/src/test/java/org/springframework/security/web/csrf/MissingCsrfTokenExceptionTests.java
View File

@@ -16,7 +16,7 @@
package org.springframework.security.web.csrf;
import org.junit.Test;
import org.junit.jupiter.api.Test;
/**
* @author Rob Winch

Some files were not shown because too many files have changed in this diff Show More