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
config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java
View File

@@ -24,7 +24,7 @@ import java.util.List;
import javax.naming.directory.SearchControls;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;

2
config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderConfigurerTests.java
View File

@@ -19,7 +19,7 @@ package org.springframework.security.config.annotation.authentication.ldap;
import java.util.Collections;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;

2
config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTests.java
View File

@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.Set;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ldap.core.DirContextOperations;

16
config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java
View File

@@ -24,10 +24,10 @@ import io.rsocket.exceptions.RejectedSetupException;
import io.rsocket.frame.decoder.PayloadDecoder;
import io.rsocket.transport.netty.server.CloseableChannel;
import io.rsocket.transport.netty.server.TcpServerTransport;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -44,7 +44,7 @@ import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.stereotype.Controller;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
* @author Rob Winch
*/
@ContextConfiguration
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
public class HelloRSocketITests {
@Autowired
@@ -69,7 +69,7 @@ public class HelloRSocketITests {
private RSocketRequester requester;
@Before
@BeforeEach
public void setup() {
// @formatter:off
this.server = RSocketServer.create()
@@ -83,7 +83,7 @@ public class HelloRSocketITests {
// @formatter:on
}
@After
@AfterEach
public void dispose() {
this.requester.rsocket().dispose();
this.server.dispose();

16
config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java
View File

@@ -25,10 +25,10 @@ import io.rsocket.frame.decoder.PayloadDecoder;
import io.rsocket.metadata.WellKnownMimeType;
import io.rsocket.transport.netty.server.CloseableChannel;
import io.rsocket.transport.netty.server.TcpServerTransport;
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 reactor.core.publisher.Mono;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +49,7 @@ import org.springframework.security.rsocket.metadata.BearerTokenAuthenticationEn
import org.springframework.security.rsocket.metadata.BearerTokenMetadata;
import org.springframework.stereotype.Controller;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
@@ -62,7 +62,7 @@ import static org.mockito.Mockito.mock;
* @author Rob Winch
*/
@ContextConfiguration
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
public class JwtITests {
@Autowired
@@ -81,7 +81,7 @@ public class JwtITests {
private RSocketRequester requester;
@Before
@BeforeEach
public void setup() {
// @formatter:off
this.server = RSocketServer.create()
@@ -95,7 +95,7 @@ public class JwtITests {
// @formatter:on
}
@After
@AfterEach
public void dispose() {
this.requester.rsocket().dispose();
this.server.dispose();

16
config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java
View File

@@ -25,10 +25,10 @@ import io.rsocket.exceptions.RejectedSetupException;
import io.rsocket.frame.decoder.PayloadDecoder;
import io.rsocket.transport.netty.server.CloseableChannel;
import io.rsocket.transport.netty.server.TcpServerTransport;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -47,7 +47,7 @@ import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.stereotype.Controller;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -60,7 +60,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
* @author Ebert Toribio
*/
@ContextConfiguration
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
public class RSocketMessageHandlerConnectionITests {
@Autowired
@@ -76,7 +76,7 @@ public class RSocketMessageHandlerConnectionITests {
private RSocketRequester requester;
@Before
@BeforeEach
public void setup() {
// @formatter:off
this.server = RSocketServer.create()
@@ -90,7 +90,7 @@ public class RSocketMessageHandlerConnectionITests {
// @formatter:on
}
@After
@AfterEach
public void dispose() {
this.requester.rsocket().dispose();
this.server.dispose();

16
config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java
View File

@@ -25,10 +25,10 @@ import io.rsocket.exceptions.ApplicationErrorException;
import io.rsocket.frame.decoder.PayloadDecoder;
import io.rsocket.transport.netty.server.CloseableChannel;
import io.rsocket.transport.netty.server.TcpServerTransport;
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 reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
@@ -49,7 +49,7 @@ import org.springframework.security.rsocket.metadata.BasicAuthenticationEncoder;
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.stereotype.Controller;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -58,7 +58,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
* @author Rob Winch
*/
@ContextConfiguration
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
public class RSocketMessageHandlerITests {
@Autowired
@@ -74,7 +74,7 @@ public class RSocketMessageHandlerITests {
private RSocketRequester requester;
@Before
@BeforeEach
public void setup() {
// @formatter:off
this.server = RSocketServer.create()
@@ -94,7 +94,7 @@ public class RSocketMessageHandlerITests {
// @formatter:on
}
@After
@AfterEach
public void dispose() {
this.requester.rsocket().dispose();
this.server.dispose();

16
config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java
View File

@@ -25,10 +25,10 @@ import io.rsocket.frame.decoder.PayloadDecoder;
import io.rsocket.metadata.WellKnownMimeType;
import io.rsocket.transport.netty.server.CloseableChannel;
import io.rsocket.transport.netty.server.TcpServerTransport;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -47,7 +47,7 @@ import org.springframework.security.rsocket.metadata.SimpleAuthenticationEncoder
import org.springframework.security.rsocket.metadata.UsernamePasswordMetadata;
import org.springframework.stereotype.Controller;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
@@ -58,7 +58,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
* @author Rob Winch
*/
@ContextConfiguration
@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
public class SimpleAuthenticationITests {
@Autowired
@@ -74,7 +74,7 @@ public class SimpleAuthenticationITests {
private RSocketRequester requester;
@Before
@BeforeEach
public void setup() {
// @formatter:off
this.server = RSocketServer.create()
@@ -88,7 +88,7 @@ public class SimpleAuthenticationITests {
// @formatter:on
}
@After
@AfterEach
public void dispose() {
this.requester.rsocket().dispose();
this.server.dispose();

6
config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.security.config.ldap;
import java.text.MessageFormat;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.context.ApplicationContextException;
import org.springframework.security.authentication.AuthenticationManager;
@@ -39,7 +39,7 @@ public class LdapProviderBeanDefinitionParserTests {
InMemoryXmlApplicationContext appCtx;
@After
@AfterEach
public void closeAppContext() {
if (this.appCtx != null) {
this.appCtx.close();

6
config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java
View File

@@ -19,8 +19,8 @@ package org.springframework.security.config.ldap;
import java.io.IOException;
import java.net.ServerSocket;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.ldap.core.LdapTemplate;
import org.springframework.security.config.BeanIds;
@@ -39,7 +39,7 @@ public class LdapServerBeanDefinitionParserTests {
InMemoryXmlApplicationContext appCtx;
@After
@AfterEach
public void closeAppContext() {
if (this.appCtx != null) {
this.appCtx.close();

6
config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java
View File

@@ -18,8 +18,8 @@ package org.springframework.security.config.ldap;
import java.util.Set;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Element;
import org.springframework.security.config.util.InMemoryXmlApplicationContext;
@@ -47,7 +47,7 @@ public class LdapUserServiceBeanDefinitionParserTests {
private InMemoryXmlApplicationContext appCtx;
@After
@AfterEach
public void closeAppContext() {
if (this.appCtx != null) {
this.appCtx.close();