From c838d3a25cf7b29d86c1736fd02ea802edfa06da Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 8 Jul 2021 16:30:12 -0500 Subject: [PATCH] Use SpringExtension instead of rules --- ...thSecurityContextTestExecutionListenerTests.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListenerTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListenerTests.java index ba36cdba47..3acca07471 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListenerTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListenerTests.java @@ -19,8 +19,6 @@ package org.springframework.security.test.context.support; import java.lang.reflect.Method; import java.util.function.Supplier; -import org.junit.ClassRule; -import org.junit.Rule; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -38,8 +36,7 @@ import org.springframework.security.core.context.SecurityContextImpl; import org.springframework.security.test.context.TestSecurityContextHolder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestContext; -import org.springframework.test.context.junit4.rules.SpringClassRule; -import org.springframework.test.context.junit4.rules.SpringMethodRule; +import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -52,16 +49,10 @@ import static org.mockito.Mockito.verify; * @author Rob Winch * @since 5.0 */ -@ExtendWith(MockitoExtension.class) +@ExtendWith({ MockitoExtension.class, SpringExtension.class }) @ContextConfiguration(classes = WithSecurityContextTestExecutionListenerTests.NoOpConfiguration.class) public class WithSecurityContextTestExecutionListenerTests { - @ClassRule - public static final SpringClassRule spring = new SpringClassRule(); - - @Rule - public final SpringMethodRule springMethod = new SpringMethodRule(); - @Autowired private ApplicationContext applicationContext;