Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import io.spring.javaformat.gradle.tasks.Format

plugins {
id "checkstyle"
id "io.spring.javaformat" version "0.0.42"
id "io.spring.javaformat" version "0.0.47"
id 'io.spring.nohttp' version '0.0.11'
}

Expand All @@ -12,7 +12,7 @@ allprojects {
apply plugin: 'io.spring.javaformat'

dependencies {
checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:0.0.42"
checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:0.0.47"
}

// Ensure every test task has at least a single test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@
*
* @author Rob Winch
* @author Eddú Meléndez
* @since 5.0
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(properties = "spring.rsocket.server.port=0")
public class HelloRSocketApplicationITests {
class HelloRSocketApplicationITests {

@Autowired
RSocketRequester.Builder requester;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/
@SpringBootTest
@AutoConfigureWebTestClient(timeout = "36000")
public class HelloTests {
class HelloTests {

@Autowired
WebTestClient rest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/
@SpringBootTest
@AutoConfigureWebTestClient(timeout = "36000")
public class HelloTests {
class HelloTests {

@Autowired
WebTestClient rest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@
* Integration tests for WebFlux based form log in sample.
*
* @author Rob Winch
* @since 5.0
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class WebfluxFormApplicationITests {
class WebfluxFormApplicationITests {

WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import static org.assertj.core.api.Assertions.assertThat;

@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class WebfluxX509ApplicationITest {
class WebfluxX509ApplicationITest {

@LocalServerPort
int port;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* @author Michael Simons
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class HelloSecurityExplicitITests {
class HelloSecurityExplicitITests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/
@SpringBootTest
@AutoConfigureWebTestClient(timeout = "36000")
public class HelloSecurityTests {
class HelloSecurityTests {

@Autowired
WebTestClient rest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/
@SpringBootTest
@AutoConfigureWebTestClient(timeout = "36000")
public class HelloSecurityTests {
class HelloSecurityTests {

@Autowired
WebTestClient rest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/
@SpringBootTest
@AutoConfigureWebTestClient(timeout = "36000")
public class HelloTests {
class HelloTests {

@Autowired
WebTestClient rest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@
* Integration tests.
*
* @author Rob Winch
* @since 5.0
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@AutoConfigureWebTestClient
public class HelloMethodApplicationITests {
class HelloMethodApplicationITests {

@Autowired
WebTestClient rest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/
@SpringBootTest
@AutoConfigureWebTestClient(timeout = "36000")
public class HelloMethodApplicationTests {
class HelloMethodApplicationTests {

@Autowired
WebTestClient rest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* @since 5.0
*/
@SpringBootTest
public class MessageServiceTests {
class MessageServiceTests {

@Autowired
MessageService messages;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
*/
@SpringBootTest
@AutoConfigureWebTestClient(timeout = "36000")
public class OAuth2LoginApplicationTests {
class OAuth2LoginApplicationTests {

@Autowired
WebTestClient test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
*/
@WebFluxTest(OAuth2LoginController.class)
@ExtendWith(MockitoExtension.class)
public class OAuth2LoginControllerTests {
class OAuth2LoginControllerTests {

@Autowired
OAuth2LoginController controller;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@
* Integration tests for resource server.
*
* @author Rob Winch
* @since 5.1
*/
@SpringBootTest
@AutoConfigureWebTestClient(timeout = "36000")
@ActiveProfiles("test")
public class ServerOAuth2ResourceServerApplicationITests {
class ServerOAuth2ResourceServerApplicationITests {

Consumer<HttpHeaders> noScopesToken = (http) -> http.setBearerAuth(
"eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
*/
@WebFluxTest(OAuth2ResourceServerController.class)
@Import(SecurityConfiguration.class)
public class OAuth2ResourceServerControllerTests {
class OAuth2ResourceServerControllerTests {

@Autowired
WebTestClient rest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
@WebFluxTest
@Import({ SecurityConfiguration.class, OAuth2WebClientController.class })
@AutoConfigureWebTestClient(timeout = "36000")
public class OAuth2WebClientControllerTests {
class OAuth2WebClientControllerTests {

private static MockWebServer web = new MockWebServer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/
@SpringBootTest
@AutoConfigureWebTestClient(timeout = "36000")
public class OAuth2WebClientWebFluxApplicationTests {
class OAuth2WebClientWebFluxApplicationTests {

@Autowired
private WebTestClient client;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
@WebFluxTest
@Import({ SecurityConfiguration.class, RegisteredOAuth2AuthorizedClientController.class })
@AutoConfigureWebTestClient(timeout = "36000")
public class RegisteredOAuth2AuthorizedClientControllerTests {
class RegisteredOAuth2AuthorizedClientControllerTests {

private static MockWebServer web = new MockWebServer();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Michael Simons
*/
public class HelloWorldTests {
class HelloWorldTests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

@ExtendWith(SpringExtension.class)
@SpringJUnitWebConfig(classes = SecurityConfiguration.class)
public class RememberMeTests {
class RememberMeTests {

@Test
void loginWhenRemembermeThenAuthenticated(WebApplicationContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Michael Simons
*/
public class FormLoginTests {
class FormLoginTests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Michael Simons
*/
public class InMemoryTests {
class InMemoryTests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Rob Winch
*/
public class JdbcTests {
class JdbcTests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Michael Simons
*/
public class InMemoryTests {
class InMemoryTests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* @author Michael Simons
*/
// @Disabled
public class X509Tests {
class X509Tests {

@Test
void notCertificateThenSslHandshakeException() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*/
@ExtendWith(SpringExtension.class)
@ContextConfiguration(classes = DataConfiguration.class)
public class SecurityMessageRepositoryTests {
class SecurityMessageRepositoryTests {

@Autowired
SecurityMessageRepository repository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Michael Simons
*/
public class HelloWorldTests {
class HelloWorldTests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Michael Simons
*/
public class HelloWorldTests {
class HelloWorldTests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Michael Simons
*/
public class HelloWorldTests {
class HelloWorldTests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Rob Winch
*/
public class MaxSessionsITests {
class MaxSessionsITests {

private WebDriver user1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

@ExtendWith(SpringExtension.class)
@SpringJUnitWebConfig(classes = SecurityConfiguration.class)
public class MaxSessionTests {
class MaxSessionTests {

@Test
void run(WebApplicationContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
@ContextConfiguration(classes = ApplicationConfiguration.class)
@WebAppConfiguration
@Disabled("gh-127")
public class Saml2JavaConfigurationITests {
class Saml2JavaConfigurationITests {

private MockMvc mvc;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* @author Rob Winch
*/
@SpringBootTest
public class DataApplicationTests {
class DataApplicationTests {

@Autowired
MessageRepository repository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*/
@SpringBootTest
@AutoConfigureMockMvc
public class X509WebAuthnMfaApplicationTests {
class X509WebAuthnMfaApplicationTests {

@Autowired
private MockMvc mvc;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@AutoConfigureTestRestTemplate
public class HelloSecurityExplicitITests {
class HelloSecurityExplicitITests {

@Autowired
private TestRestTemplate rest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*/
@SpringBootTest
@AutoConfigureMockMvc
public class UserDetailsServiceApplicationTests {
class UserDetailsServiceApplicationTests {

@Autowired
private MockMvc mockMvc;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* @author Rob Winch
*/
@SpringBootTest
public class DataApplicationTests {
class DataApplicationTests {

@Autowired
MessageRepository repository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* @author Michael Simons
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class HelloSecurityExplicitITests {
class HelloSecurityExplicitITests {

private WebDriver driver;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/
@SpringBootTest
@AutoConfigureMockMvc
public class HelloSecurityExplicitApplicationTests {
class HelloSecurityExplicitApplicationTests {

@Autowired
private MockMvc mockMvc;
Expand Down
Loading