openrewrite Junit Migration

core/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.access;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.event.AuthenticationCredentialsNotFoundEvent;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;

core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.access;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.event.AuthorizationFailureEvent;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/test/java/org/springframework/security/access/AuthorizedEventTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.access;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.event.AuthorizedEvent;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/test/java/org/springframework/security/access/SecurityConfigTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.access;
 
-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.assertThatExceptionOfType;

core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java

@@ -21,8 +21,8 @@ import java.util.Collection;
 import javax.annotation.security.PermitAll;
 import javax.annotation.security.RolesAllowed;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.intercept.method.MockMethodInvocation;
@@ -41,7 +41,7 @@ public class Jsr250MethodSecurityMetadataSourceTests {
 
 	UserAllowedClass userAllowed;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.mds = new Jsr250MethodSecurityMetadataSource();
 		this.a = new A();

core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.access.annotation;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;

core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java

@@ -27,7 +27,7 @@ import java.util.Collection;
 import java.util.EnumSet;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;

core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java

@@ -16,8 +16,8 @@
 
 package org.springframework.security.access.expression;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -37,7 +37,7 @@ public class AbstractSecurityExpressionHandlerTests {
 
 	private AbstractSecurityExpressionHandler<Object> handler;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		this.handler = new AbstractSecurityExpressionHandler<Object>() {
 			@Override

core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java

@@ -16,8 +16,8 @@
 
 package org.springframework.security.access.expression;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.authentication.TestingAuthenticationToken;
@@ -38,7 +38,7 @@ public class SecurityExpressionRootTests {
 
 	SecurityExpressionRoot root;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.root = new SecurityExpressionRoot(JOE) {
 		};

core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java

@@ -23,12 +23,12 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.aopalliance.intercept.MethodInvocation;
-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.expression.EvaluationContext;
 import org.springframework.expression.Expression;
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DefaultMethodSecurityExpressionHandlerTests {
 
 	private DefaultMethodSecurityExpressionHandler handler;
@@ -58,14 +58,14 @@ public class DefaultMethodSecurityExpressionHandlerTests {
 	@Mock
 	private AuthenticationTrustResolver trustResolver;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.handler = new DefaultMethodSecurityExpressionHandler();
 		given(this.methodInvocation.getThis()).willReturn(new Foo());
 		given(this.methodInvocation.getMethod()).willReturn(Foo.class.getMethods()[0]);
 	}
 
-	@After
+	@AfterEach
 	public void cleanup() {
 		SecurityContextHolder.clearContext();
 	}

core/src/test/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdviceTests.java

@@ -19,11 +19,11 @@ package org.springframework.security.access.expression.method;
 import java.util.ArrayList;
 import java.util.List;
 
-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.intercept.method.MockMethodInvocation;
 import org.springframework.security.access.prepost.PreInvocationAttribute;
@@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
  * @author Maksim Vinogradov
  * @since 5.2
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ExpressionBasedPreInvocationAdviceTests {
 
 	@Mock
@@ -46,7 +46,7 @@ public class ExpressionBasedPreInvocationAdviceTests {
 
 	private ExpressionBasedPreInvocationAdvice expressionBasedPreInvocationAdvice;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		this.expressionBasedPreInvocationAdvice = new ExpressionBasedPreInvocationAdvice();
 	}

core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java

@@ -23,7 +23,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;

core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java

@@ -19,10 +19,10 @@ package org.springframework.security.access.expression.method;
 import java.lang.reflect.Method;
 
 import org.aopalliance.intercept.MethodInvocation;
-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.core.ParameterNameDiscoverer;
 import org.springframework.lang.Nullable;
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.doReturn;
  * @author shabarijonnalagadda
  *
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class MethodSecurityEvaluationContextTests {
 
 	@Mock

core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java

@@ -16,8 +16,8 @@
 
 package org.springframework.security.access.expression.method;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -50,7 +50,7 @@ public class MethodSecurityExpressionRootTests {
 
 	private Authentication user;
 
-	@Before
+	@BeforeEach
 	public void createContext() {
 		this.user = mock(Authentication.class);
 		this.root = new MethodSecurityExpressionRoot(this.user);

core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java

@@ -24,8 +24,8 @@ import java.lang.annotation.Target;
 import java.util.Collection;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.Expression;
 import org.springframework.security.access.ConfigAttribute;
@@ -67,7 +67,7 @@ public class PrePostAnnotationSecurityMetadataSourceTests {
 
 	private MockMethodInvocation annotatedAtMethodLevel;
 
-	@Before
+	@BeforeEach
 	public void setUpData() throws Exception {
 		this.voidImpl1 = new MockMethodInvocation(new ReturnVoidImpl1(), ReturnVoid.class, "doSomething", List.class);
 		this.voidImpl2 = new MockMethodInvocation(new ReturnVoidImpl2(), ReturnVoid.class, "doSomething", List.class);

core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapperTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.access.hierarchicalroles;
 
 import java.util.Collection;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;

core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.access.hierarchicalroles;
 import java.util.ArrayList;
 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;

core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtilsTests.java

@@ -23,7 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-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;

core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java

@@ -21,7 +21,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;

core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.access.intercept;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.SecurityMetadataSource;

core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java

@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Vector;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.AfterInvocationProvider;

core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.access.intercept;
 import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;

core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.access.intercept;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.SecurityConfig;
 

core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java

@@ -16,8 +16,8 @@
 
 package org.springframework.security.access.intercept;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.TestingAuthenticationToken;
@@ -50,7 +50,7 @@ public class RunAsImplAuthenticationProviderTests {
 		RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
 		provider.setKey("my_password");
 		Authentication result = provider.authenticate(token);
-		Assert.assertTrue("Should have returned RunAsUserToken", result instanceof RunAsUserToken);
+		Assertions.assertTrue(result instanceof RunAsUserToken, "Should have returned RunAsUserToken");
 		RunAsUserToken resultCast = (RunAsUserToken) result;
 		assertThat(resultCast.getKeyHash()).isEqualTo("my_password".hashCode());
 	}

core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.access.intercept;
 
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.access.intercept;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.AuthorityUtils;

core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java

@@ -19,9 +19,9 @@ package org.springframework.security.access.intercept.aopalliance;
 import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
-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.aop.framework.ProxyFactory;
 import org.springframework.context.ApplicationEventPublisher;
@@ -84,7 +84,7 @@ public class MethodSecurityInterceptorTests {
 
 	private ApplicationEventPublisher eventPublisher;
 
-	@Before
+	@BeforeEach
 	public final void setUp() {
 		SecurityContextHolder.clearContext();
 		this.token = new TestingAuthenticationToken("Test", "Password");
@@ -100,7 +100,7 @@ public class MethodSecurityInterceptorTests {
 		createTarget(false);
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		SecurityContextHolder.clearContext();
 	}

core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.access.intercept.aopalliance;
 
 import java.lang.reflect.Method;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.TargetObject;
 import org.springframework.security.access.SecurityConfig;

core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java

@@ -24,9 +24,9 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.reflect.CodeSignature;
-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.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -82,7 +82,7 @@ public class AspectJMethodSecurityInterceptorTests {
 
 	private ProceedingJoinPoint joinPoint;
 
-	@Before
+	@BeforeEach
 	public final void setUp() {
 		MockitoAnnotations.initMocks(this);
 		SecurityContextHolder.clearContext();
@@ -108,7 +108,7 @@ public class AspectJMethodSecurityInterceptorTests {
 		given(this.authman.authenticate(this.token)).willReturn(this.token);
 	}
 
-	@After
+	@AfterEach
 	public void clearContext() {
 		SecurityContextHolder.clearContext();
 	}

core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java

@@ -19,8 +19,8 @@ package org.springframework.security.access.intercept.method;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
@@ -46,7 +46,7 @@ public class MapBasedMethodSecurityMetadataSourceTests {
 
 	private Method someMethodInteger;
 
-	@Before
+	@BeforeEach
 	public void initialize() throws Exception {
 		this.mds = new MapBasedMethodSecurityMetadataSource();
 		this.someMethodString = MockService.class.getMethod("someMethod", String.class);

core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java

@@ -19,8 +19,8 @@ package org.springframework.security.access.intercept.method;
 import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.ITargetObject;
 import org.springframework.security.OtherTargetObject;
@@ -61,7 +61,7 @@ public class MethodInvocationPrivilegeEvaluatorTests {
 
 	private final List<ConfigAttribute> role = SecurityConfig.createList("ROLE_IGNORED");
 
-	@Before
+	@BeforeEach
 	public final void setUp() {
 		SecurityContextHolder.clearContext();
 		this.interceptor = new MethodSecurityInterceptor();

core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java

@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
 
 import org.springframework.security.access.ConfigAttribute;

core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java

@@ -17,18 +17,18 @@
 package org.springframework.security.access.prepost;
 
 import org.aopalliance.intercept.MethodInvocation;
-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.aop.ProxyMethodInvocation;
 import org.springframework.security.access.intercept.aspectj.MethodInvocationAdapter;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class PreInvocationAuthorizationAdviceVoterTests {
 
 	@Mock
@@ -36,7 +36,7 @@ public class PreInvocationAuthorizationAdviceVoterTests {
 
 	private PreInvocationAuthorizationAdviceVoter voter;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		this.voter = new PreInvocationAuthorizationAdviceVoter(this.authorizationAdvice);
 	}

core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java

@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Vector;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;

core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java

@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;

core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java

@@ -20,8 +20,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
@@ -54,7 +54,7 @@ public class AffirmativeBasedTests {
 
 	private AccessDecisionVoter deny;
 
-	@Before
+	@BeforeEach
 	@SuppressWarnings("unchecked")
 	public void setup() {
 		this.grant = mock(AccessDecisionVoter.class);

core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.access.vote;
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.ConfigAttribute;

core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.access.vote;
 import java.util.List;
 import java.util.Vector;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;

core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.access.vote;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.SecurityConfig;

core/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.access.vote;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.SecurityConfig;

core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.access.vote;
 import java.util.List;
 import java.util.Vector;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;

core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java

@@ -18,8 +18,8 @@ package org.springframework.security.authentication;
 
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.core.AuthenticatedPrincipal;
 import org.springframework.security.core.GrantedAuthority;
@@ -42,7 +42,7 @@ public class AbstractAuthenticationTokenTests {
 
 	private List<GrantedAuthority> authorities = null;
 
-	@Before
+	@BeforeEach
 	public final void setUp() {
 		this.authorities = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO");
 	}

core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.authentication;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.core.authority.AuthorityUtils;
 

core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java

@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;

core/src/test/java/org/springframework/security/authentication/DelegatingReactiveAuthenticationManagerTests.java

@@ -18,10 +18,10 @@ package org.springframework.security.authentication;
 
 import java.time.Duration;
 
-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 reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -35,7 +35,7 @@ import static org.mockito.BDDMockito.given;
  * @author Rob Winch
  * @since 5.1
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DelegatingReactiveAuthenticationManagerTests {
 
 	@Mock

core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java

@@ -21,7 +21,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.MessageSource;
 import org.springframework.security.core.Authentication;

core/src/test/java/org/springframework/security/authentication/ReactiveAuthenticationManagerAdapterTests.java

@@ -16,11 +16,11 @@
 
 package org.springframework.security.authentication;
 
-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 reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -35,7 +35,7 @@ import static org.mockito.BDDMockito.given;
  * @author Rob Winch
  * @since 5.0
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ReactiveAuthenticationManagerAdapterTests {
 
 	@Mock
@@ -46,7 +46,7 @@ public class ReactiveAuthenticationManagerAdapterTests {
 
 	ReactiveAuthenticationManagerAdapter manager;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.manager = new ReactiveAuthenticationManagerAdapter(this.delegate);
 	}

core/src/test/java/org/springframework/security/authentication/ReactiveUserDetailsServiceAuthenticationManagerTests.java

@@ -16,11 +16,11 @@
 
 package org.springframework.security.authentication;
 
-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 reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -41,7 +41,7 @@ import static org.mockito.BDDMockito.given;
  * @author Rob Winch
  * @since 5.0
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ReactiveUserDetailsServiceAuthenticationManagerTests {
 
 	@Mock
@@ -56,7 +56,7 @@ public class ReactiveUserDetailsServiceAuthenticationManagerTests {
 
 	String password;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.manager = new UserDetailsRepositoryReactiveAuthenticationManager(this.repository);
 		this.username = "user";

core/src/test/java/org/springframework/security/authentication/TestingAuthenticationProviderTests.java

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

core/src/test/java/org/springframework/security/authentication/TestingAuthenticationTokenTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.authentication;
 
 import java.util.Arrays;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 

core/src/test/java/org/springframework/security/authentication/UserDetailsRepositoryReactiveAuthenticationManagerTests.java

@@ -16,11 +16,11 @@
 
 package org.springframework.security.authentication;
 
-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 reactor.core.publisher.Mono;
 import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
  * @author Eddú Meléndez
  * @since 5.1
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
 
 	@Mock
@@ -75,7 +75,7 @@ public class UserDetailsRepositoryReactiveAuthenticationManagerTests {
 	// @formatter:on
 	private UserDetailsRepositoryReactiveAuthenticationManager manager;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.manager = new UserDetailsRepositoryReactiveAuthenticationManager(this.userDetailsService);
 		given(this.scheduler.schedule(any())).willAnswer((a) -> {

core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.authentication;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.core.authority.AuthorityUtils;
 

core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.authentication.anonymous;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.AnonymousAuthenticationProvider;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;

core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.authentication.anonymous;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java

@@ -20,7 +20,7 @@ import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.security.authentication.AccountExpiredException;

core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.authentication.event;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.authentication.event;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java

@@ -26,8 +26,8 @@ import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
 import org.apache.commons.logging.Log;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 import org.springframework.context.ApplicationEventPublisher;
@@ -65,7 +65,7 @@ public class DefaultJaasAuthenticationProviderTests {
 
 	private Log log;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		Configuration configuration = mock(Configuration.class);
 		this.publisher = mock(ApplicationEventPublisher.class);

core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java

@@ -28,8 +28,8 @@ import java.util.Set;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -65,7 +65,7 @@ public class JaasAuthenticationProviderTests {
 
 	private JaasEventCheck eventCheck;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		String resName = "/" + getClass().getName().replace('.', '/') + ".xml";
 		this.context = new ClassPathXmlApplicationContext(resName);

core/src/test/java/org/springframework/security/authentication/jaas/JaasGrantedAuthorityTests.java

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

core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.authentication.jaas;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java

@@ -23,9 +23,9 @@ import java.util.Map;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginException;
 
-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.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -47,14 +47,14 @@ public class SecurityContextLoginModuleTests {
 	private UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("principal",
 			"credentials");
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		this.module = new SecurityContextLoginModule();
 		this.module.initialize(this.subject, null, null, null);
 		SecurityContextHolder.clearContext();
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		SecurityContextHolder.clearContext();
 		this.module = null;

core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java

@@ -23,8 +23,8 @@ import java.util.Map;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.jaas.TestLoginModule;
 
@@ -42,7 +42,7 @@ public class InMemoryConfigurationTests {
 
 	private Map<String, AppConfigurationEntry[]> mappedEntries;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		this.defaultEntries = new AppConfigurationEntry[] { new AppConfigurationEntry(TestLoginModule.class.getName(),
 				LoginModuleControlFlag.REQUIRED, Collections.<String, Object>emptyMap()) };

core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.authentication.rcp;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;

core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.authentication.rcp;
 
 import java.util.Collection;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;

core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java

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

core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.authentication.rememberme;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.RememberMeAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

core/src/test/java/org/springframework/security/authorization/AuthenticatedAuthorizationManagerTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.authorization;
 
 import java.util.function.Supplier;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.TestingAuthenticationToken;

core/src/test/java/org/springframework/security/authorization/AuthenticatedReactiveAuthorizationManagerTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.security.authorization;
 
-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 reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock;
  * @author Rob Winch
  * @since 5.0
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class AuthenticatedReactiveAuthorizationManagerTests {
 
 	@Mock

core/src/test/java/org/springframework/security/authorization/AuthorityAuthorizationManagerTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.authorization;
 
 import java.util.function.Supplier;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;

core/src/test/java/org/springframework/security/authorization/AuthorityReactiveAuthorizationManagerTests.java

@@ -18,10 +18,10 @@ package org.springframework.security.authorization;
 
 import java.util.Collections;
 
-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 reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -36,7 +36,7 @@ import static org.mockito.BDDMockito.given;
  * @author Rob Winch
  * @since 5.0
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class AuthorityReactiveAuthorizationManagerTests {
 
 	@Mock

core/src/test/java/org/springframework/security/authorization/AuthorizationManagerTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.authorization;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.TestingAuthenticationToken;

core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerAfterMethodInterceptorTests.java

@@ -17,7 +17,7 @@
 package org.springframework.security.authorization.method;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.Pointcut;
 import org.springframework.security.authorization.AuthorizationManager;

core/src/test/java/org/springframework/security/authorization/method/AuthorizationManagerBeforeMethodInterceptorTests.java

@@ -17,7 +17,7 @@
 package org.springframework.security.authorization.method;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.Pointcut;
 import org.springframework.security.authorization.AuthorizationManager;

core/src/test/java/org/springframework/security/authorization/method/AuthorizationMethodPointcutsTests.java

@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.support.AopUtils;

core/src/test/java/org/springframework/security/authorization/method/Jsr250AuthorizationManagerTests.java

@@ -24,7 +24,7 @@ import javax.annotation.security.DenyAll;
 import javax.annotation.security.PermitAll;
 import javax.annotation.security.RolesAllowed;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.annotation.AnnotationConfigurationException;
 import org.springframework.security.access.intercept.method.MockMethodInvocation;

core/src/test/java/org/springframework/security/authorization/method/PostAuthorizeAuthorizationManagerTests.java

@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.Supplier;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.annotation.AnnotationConfigurationException;
 import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;

core/src/test/java/org/springframework/security/authorization/method/PostFilterAuthorizationMethodInterceptorTests.java

@@ -20,9 +20,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 import org.assertj.core.api.InstanceOfAssertFactories;
-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.aop.MethodMatcher;
 import org.springframework.core.annotation.AnnotationConfigurationException;
@@ -44,12 +44,12 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
  */
 public class PostFilterAuthorizationMethodInterceptorTests {
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		SecurityContextHolder.getContext().setAuthentication(TestAuthentication.authenticatedUser());
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		SecurityContextHolder.clearContext();
 	}

core/src/test/java/org/springframework/security/authorization/method/PreAuthorizeAuthorizationManagerTests.java

@@ -20,7 +20,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.function.Supplier;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.annotation.AnnotationConfigurationException;
 import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;

core/src/test/java/org/springframework/security/authorization/method/PreFilterAuthorizationMethodInterceptorTests.java

@@ -21,9 +21,9 @@ import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 
-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.aop.MethodMatcher;
 import org.springframework.core.annotation.AnnotationConfigurationException;
@@ -46,12 +46,12 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
  */
 public class PreFilterAuthorizationMethodInterceptorTests {
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		SecurityContextHolder.getContext().setAuthentication(TestAuthentication.authenticatedUser());
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		SecurityContextHolder.clearContext();
 	}

core/src/test/java/org/springframework/security/authorization/method/SecuredAuthorizationManagerTests.java

@@ -20,7 +20,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.function.Supplier;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.annotation.AnnotationConfigurationException;
 import org.springframework.security.access.annotation.Secured;

core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java

@@ -22,8 +22,8 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -52,7 +52,7 @@ public abstract class AbstractDelegatingSecurityContextExecutorServiceTests
 
 	protected DelegatingSecurityContextExecutorService executor;
 
-	@Before
+	@BeforeEach
 	public final void setUpExecutorService() {
 		this.executor = create();
 	}

core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.concurrent;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java

@@ -19,8 +19,8 @@ package org.springframework.security.concurrent;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 
 import static org.assertj.core.api.Assertions.assertThatObject;
@@ -45,7 +45,7 @@ public abstract class AbstractDelegatingSecurityContextScheduledExecutorServiceT
 
 	private DelegatingSecurityContextScheduledExecutorService executor;
 
-	@Before
+	@BeforeEach
 	public final void setUpExecutor() {
 		this.executor = create();
 	}

core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextTestSupport.java

@@ -18,14 +18,14 @@ package org.springframework.security.concurrent;
 
 import java.util.concurrent.Callable;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
-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;
@@ -40,7 +40,7 @@ import static org.mockito.ArgumentMatchers.eq;
  * @since 3.2
  *
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public abstract class AbstractDelegatingSecurityContextTestSupport {
 
 	@Mock
@@ -86,12 +86,12 @@ public abstract class AbstractDelegatingSecurityContextTestSupport {
 				.thenReturn(this.wrappedRunnable);
 	}
 
-	@Before
+	@BeforeEach
 	public final void setContext() {
 		SecurityContextHolder.setContext(this.currentSecurityContext);
 	}
 
-	@After
+	@AfterEach
 	public final void clearContext() {
 		SecurityContextHolder.clearContext();
 	}

core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorServiceTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.concurrent;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import org.springframework.security.core.context.SecurityContext;
 
@@ -31,7 +31,7 @@ import org.springframework.security.core.context.SecurityContext;
 public class CurrentDelegatingSecurityContextExecutorServiceTests
 		extends AbstractDelegatingSecurityContextExecutorServiceTests {
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		super.currentSecurityContextSetup();
 	}

core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.concurrent;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import org.springframework.security.core.context.SecurityContext;
 
@@ -30,7 +30,7 @@ import org.springframework.security.core.context.SecurityContext;
  */
 public class CurrentDelegatingSecurityContextExecutorTests extends AbstractDelegatingSecurityContextExecutorTests {
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		super.currentSecurityContextSetup();
 	}

core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextScheduledExecutorServiceTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.concurrent;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import org.springframework.security.core.context.SecurityContext;
 
@@ -31,7 +31,7 @@ import org.springframework.security.core.context.SecurityContext;
 public class CurrentDelegatingSecurityContextScheduledExecutorServiceTests
 		extends AbstractDelegatingSecurityContextScheduledExecutorServiceTests {
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		this.currentSecurityContextSetup();
 	}

core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java

@@ -21,14 +21,14 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-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.internal.stubbing.answers.Returns;
 import org.mockito.invocation.InvocationOnMock;
-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;
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify;
  * @author Rob Winch
  * @since 3.2
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DelegatingSecurityContextCallableTests {
 
 	@Mock
@@ -60,7 +60,7 @@ public class DelegatingSecurityContextCallableTests {
 
 	private SecurityContext originalSecurityContext;
 
-	@Before
+	@BeforeEach
 	@SuppressWarnings("serial")
 	public void setUp() throws Exception {
 		this.originalSecurityContext = SecurityContextHolder.createEmptyContext();
@@ -75,7 +75,7 @@ public class DelegatingSecurityContextCallableTests {
 		this.executor = Executors.newFixedThreadPool(1);
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		SecurityContextHolder.clearContext();
 	}

core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java

@@ -20,12 +20,12 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-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.mockito.stubbing.Answer;
 
 import org.springframework.core.task.SyncTaskExecutor;
@@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify;
  * @author Rob Winch
  * @since 3.2
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DelegatingSecurityContextRunnableTests {
 
 	@Mock
@@ -60,7 +60,7 @@ public class DelegatingSecurityContextRunnableTests {
 
 	private SecurityContext originalSecurityContext;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		this.originalSecurityContext = SecurityContextHolder.createEmptyContext();
 		willAnswer((Answer<Object>) (invocation) -> {
@@ -70,7 +70,7 @@ public class DelegatingSecurityContextRunnableTests {
 		this.executor = Executors.newFixedThreadPool(1);
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		SecurityContextHolder.clearContext();
 	}

core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.concurrent;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.core.context.SecurityContext;
 

core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorServiceTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.concurrent;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import org.springframework.security.core.context.SecurityContext;
 
@@ -31,7 +31,7 @@ import org.springframework.security.core.context.SecurityContext;
 public class ExplicitDelegatingSecurityContextExecutorServiceTests
 		extends AbstractDelegatingSecurityContextExecutorServiceTests {
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		super.explicitSecurityContextSetup();
 	}

core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.concurrent;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import org.springframework.security.core.context.SecurityContext;
 
@@ -30,7 +30,7 @@ import org.springframework.security.core.context.SecurityContext;
  */
 public class ExplicitDelegatingSecurityContextExecutorTests extends AbstractDelegatingSecurityContextExecutorTests {
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		super.explicitSecurityContextSetup();
 	}

core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextScheduledExecutorServiceTests.java

@@ -16,7 +16,7 @@
 
 package org.springframework.security.concurrent;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import org.springframework.security.core.context.SecurityContext;
 
@@ -31,7 +31,7 @@ import org.springframework.security.core.context.SecurityContext;
 public class ExplicitDelegatingSecurityContextScheduledExecutorServiceTests
 		extends AbstractDelegatingSecurityContextScheduledExecutorServiceTests {
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		this.explicitSecurityContextSetup();
 	}

core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java

@@ -16,11 +16,11 @@
 
 package org.springframework.security.context;
 
-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.context.ApplicationEvent;
 import org.springframework.context.event.SmartApplicationListener;
@@ -31,7 +31,7 @@ import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DelegatingApplicationListenerTests {
 
 	@Mock
@@ -41,7 +41,7 @@ public class DelegatingApplicationListenerTests {
 
 	DelegatingApplicationListener listener;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		this.event = new ApplicationEvent(this) {
 		};

core/src/test/java/org/springframework/security/converter/RsaKeyConvertersTests.java

@@ -24,7 +24,7 @@ import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.core.convert.converter.Converter;
 

core/src/test/java/org/springframework/security/core/JavaVersionTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.core;
 import java.io.DataInputStream;
 import java.io.InputStream;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java

@@ -21,14 +21,14 @@ import java.lang.reflect.Method;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-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.Answers;
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.core.SpringVersion;
 import org.springframework.util.ReflectionUtils;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
  * @author Luke Taylor
  * @author Rob Winch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class SpringSecurityCoreVersionTests {
 
 	@Mock
@@ -58,13 +58,13 @@ public class SpringSecurityCoreVersionTests {
 	@Mock(answer = Answers.CALLS_REAL_METHODS)
 	private MockedStatic<SpringSecurityCoreVersion> springSecurityCoreVersion;
 
-	@Before
+	@BeforeEach
 	public void setup() throws Exception {
 		Field logger = ReflectionUtils.findField(SpringSecurityCoreVersion.class, "logger");
 		StaticFinalReflectionUtils.setField(logger, this.logger);
 	}
 
-	@After
+	@AfterEach
 	public void cleanup() throws Exception {
 		System.clearProperty(getDisableChecksProperty());
 		Field logger = ReflectionUtils.findField(SpringSecurityCoreVersion.class, "logger");

core/src/test/java/org/springframework/security/core/SpringSecurityMessageSourceTests.java

@@ -18,7 +18,7 @@ package org.springframework.security.core;
 
 import java.util.Locale;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.context.support.MessageSourceAccessor;

core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java

@@ -19,7 +19,7 @@ package org.springframework.security.core.authority;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.security.core.GrantedAuthority;