Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 13:23:17 +00:00
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
messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java
+6 -6
View File
@@ -16,11 +16,11 @@
package org.springframework.security.messaging.access.expression;
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.expression.EvaluationContext;
import org.springframework.expression.Expression;
@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.mockito.BDDMockito.given;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class DefaultMessageSecurityExpressionHandlerTests {
@Mock
@@ -54,7 +54,7 @@ public class DefaultMessageSecurityExpressionHandlerTests {
Authentication authentication;
@Before
@BeforeEach
public void setup() {
this.handler = new DefaultMessageSecurityExpressionHandler<>();
this.message = new GenericMessage<>("");
messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java
+6 -6
View File
@@ -19,11 +19,11 @@ package org.springframework.security.messaging.access.expression;
import java.util.Collection;
import java.util.LinkedHashMap;
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.messaging.Message;
import org.springframework.security.access.ConfigAttribute;
@@ -34,7 +34,7 @@ import org.springframework.security.messaging.util.matcher.MessageMatcher;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests {
@Mock
@@ -59,7 +59,7 @@ public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests {
MessageSecurityExpressionRoot rootObject;
@Before
@BeforeEach
public void setup() {
this.expression1 = "permitAll";
this.expression2 = "denyAll";
messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java
+6 -6
View File
@@ -16,11 +16,11 @@
package org.springframework.security.messaging.access.expression;
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.expression.EvaluationContext;
import org.springframework.expression.Expression;
@@ -36,7 +36,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class MessageExpressionConfigAttributeTests {
@Mock
@@ -47,7 +47,7 @@ public class MessageExpressionConfigAttributeTests {
MessageExpressionConfigAttribute attribute;
@Before
@BeforeEach
public void setup() {
this.attribute = new MessageExpressionConfigAttribute(this.expression, this.matcher);
}
messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java
+6 -6
View File
@@ -19,11 +19,11 @@ package org.springframework.security.messaging.access.expression;
import java.util.Arrays;
import java.util.Collection;
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.expression.EvaluationContext;
import org.springframework.expression.Expression;
@@ -43,7 +43,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class MessageExpressionVoterTests {
@Mock
@@ -68,7 +68,7 @@ public class MessageExpressionVoterTests {
MessageExpressionVoter voter;
@Before
@BeforeEach
public void setup() {
this.attributes = Arrays
.<ConfigAttribute>asList(new MessageExpressionConfigAttribute(this.expression, this.matcher));
messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java
+8 -8
View File
@@ -20,12 +20,12 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
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.messaging.Message;
import org.springframework.messaging.MessageChannel;
@@ -46,7 +46,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willThrow;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class ChannelSecurityInterceptorTests {
@Mock
@@ -73,7 +73,7 @@ public class ChannelSecurityInterceptorTests {
ChannelSecurityInterceptor interceptor;
@Before
@BeforeEach
public void setup() {
this.attrs = Arrays.<ConfigAttribute>asList(new SecurityConfig("ROLE_USER"));
this.interceptor = new ChannelSecurityInterceptor(this.source);
@@ -83,7 +83,7 @@ public class ChannelSecurityInterceptorTests {
SecurityContextHolder.getContext().setAuthentication(this.originalAuth);
}
@After
@AfterEach
public void cleanup() {
SecurityContextHolder.clearContext();
}
messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java
+6 -6
View File
@@ -20,11 +20,11 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashMap;
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.messaging.Message;
import org.springframework.security.access.ConfigAttribute;
@@ -35,7 +35,7 @@ import org.springframework.security.messaging.util.matcher.MessageMatcher;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class DefaultMessageSecurityMetadataSourceTests {
@Mock
@@ -58,7 +58,7 @@ public class DefaultMessageSecurityMetadataSourceTests {
MessageSecurityMetadataSource source;
@Before
@BeforeEach
public void setup() {
this.messageMap = new LinkedHashMap<>();
this.messageMap.put(this.matcher1, Arrays.<ConfigAttribute>asList(this.config1));
messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java
+5 -5
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;
@@ -48,12 +48,12 @@ public class AuthenticationPrincipalArgumentResolverTests {
private AuthenticationPrincipalArgumentResolver resolver;
@Before
@BeforeEach
public void setup() {
this.resolver = new AuthenticationPrincipalArgumentResolver();
}
@After
@AfterEach
public void cleanup() {
SecurityContextHolder.clearContext();
}
messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java
+8 -8
View File
@@ -18,12 +18,12 @@ package org.springframework.security.messaging.context;
import java.security.Principal;
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.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
@@ -38,7 +38,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class SecurityContextChannelInterceptorTests {
@Mock
@@ -58,7 +58,7 @@ public class SecurityContextChannelInterceptorTests {
AnonymousAuthenticationToken expectedAnonymous;
@Before
@BeforeEach
public void setup() {
this.authentication = new TestingAuthenticationToken("user", "pass", "ROLE_USER");
this.messageBuilder = MessageBuilder.withPayload("payload");
@@ -67,7 +67,7 @@ public class SecurityContextChannelInterceptorTests {
this.interceptor = new SecurityContextChannelInterceptor();
}
@After
@AfterEach
public void cleanup() {
SecurityContextHolder.clearContext();
}
messaging/src/test/java/org/springframework/security/messaging/handler/invocation/reactive/AuthenticationPrincipalArgumentResolverTests.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.springframework.security.messaging.handler.invocation.reactive;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import org.springframework.core.MethodParameter;
messaging/src/test/java/org/springframework/security/messaging/handler/invocation/reactive/CurrentSecurityContextArgumentResolverTests.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.springframework.security.messaging.handler.invocation.reactive;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
import org.springframework.core.MethodParameter;
messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java
+4 -4
View File
@@ -20,10 +20,10 @@ import java.util.Arrays;
import java.util.Collections;
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.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.messaging.Message;
@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.assertj.core.api.Assertions.assertThatNullPointerException;
import static org.mockito.BDDMockito.given;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class AndMessageMatcherTests {
@Mock
messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java
+4 -4
View File
@@ -20,10 +20,10 @@ import java.util.Arrays;
import java.util.Collections;
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.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.messaging.Message;
@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import static org.assertj.core.api.Assertions.assertThatNullPointerException;
import static org.mockito.BDDMockito.given;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class OrMessageMatcherTests {
@Mock
messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java
+3 -3
View File
@@ -16,8 +16,8 @@
package org.springframework.security.messaging.util.matcher;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.simp.SimpMessageType;
@@ -36,7 +36,7 @@ public class SimpDestinationMessageMatcherTests {
PathMatcher pathMatcher;
@Before
@BeforeEach
public void setup() {
this.messageBuilder = MessageBuilder.withPayload("M");
this.matcher = new SimpDestinationMessageMatcher("/**");
messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java
+3 -3
View File
@@ -16,8 +16,8 @@
package org.springframework.security.messaging.util.matcher;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.messaging.Message;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
@@ -31,7 +31,7 @@ public class SimpMessageTypeMatcherTests {
private SimpMessageTypeMatcher matcher;
@Before
@BeforeEach
public void setup() {
this.matcher = new SimpMessageTypeMatcher(SimpMessageType.MESSAGE);
}
messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java
+6 -6
View File
@@ -19,11 +19,11 @@ package org.springframework.security.messaging.web.csrf;
import java.util.HashMap;
import java.util.Map;
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.messaging.Message;
import org.springframework.messaging.MessageChannel;
@@ -37,7 +37,7 @@ import org.springframework.security.web.csrf.MissingCsrfTokenException;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class CsrfChannelInterceptorTests {
@Mock
@@ -49,7 +49,7 @@ public class CsrfChannelInterceptorTests {
CsrfChannelInterceptor interceptor;
@Before
@BeforeEach
public void setup() {
this.token = new DefaultCsrfToken("header", "param", "token");
this.interceptor = new CsrfChannelInterceptor();
messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java
+6 -6
View File
@@ -19,11 +19,11 @@ package org.springframework.security.messaging.web.socket.server;
import java.util.HashMap;
import java.util.Map;
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.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
@@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Rob Winch
*/
@RunWith(MockitoJUnitRunner.class)
@ExtendWith(MockitoExtension.class)
public class CsrfTokenHandshakeInterceptorTests {
@Mock
@@ -55,7 +55,7 @@ public class CsrfTokenHandshakeInterceptorTests {
CsrfTokenHandshakeInterceptor interceptor;
@Before
@BeforeEach
public void setup() {
this.httpRequest = new MockHttpServletRequest();
this.attributes = new HashMap<>();