Skip to content

Commit 83be809

Browse files
jgrandjajgrandja
committed
Move SpringTestRule
1 parent a38b66a commit 83be809

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/JwkSetTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
3636
import org.springframework.security.authentication.TestingAuthenticationToken;
3737
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
38-
import org.springframework.security.config.test.SpringTestRule;
3938
import org.springframework.security.oauth2.jose.TestJwks;
4039
import org.springframework.security.oauth2.server.authorization.JdbcOAuth2AuthorizationService;
4140
import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationService;
@@ -44,6 +43,7 @@
4443
import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
4544
import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
4645
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
46+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
4747
import org.springframework.test.web.servlet.MockMvc;
4848

4949
import static org.hamcrest.CoreMatchers.containsString;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationCodeGrantTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
6262
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
6363
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
64-
import org.springframework.security.config.test.SpringTestRule;
6564
import org.springframework.security.core.Authentication;
6665
import org.springframework.security.core.GrantedAuthority;
6766
import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -100,6 +99,7 @@
10099
import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
101100
import org.springframework.security.oauth2.server.authorization.settings.ClientSettings;
102101
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
102+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
103103
import org.springframework.security.oauth2.server.authorization.token.DelegatingOAuth2TokenGenerator;
104104
import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
105105
import org.springframework.security.oauth2.server.authorization.token.JwtGenerator;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationServerMetadataTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
3434
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
3535
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
36-
import org.springframework.security.config.test.SpringTestRule;
3736
import org.springframework.security.oauth2.jose.TestJwks;
3837
import org.springframework.security.oauth2.server.authorization.client.JdbcRegisteredClientRepository;
3938
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
4039
import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
4140
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
4241
import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
4342
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
43+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
4444
import org.springframework.test.web.servlet.MockMvc;
4545

4646
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2ClientCredentialsGrantTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.springframework.security.authentication.TestingAuthenticationToken;
5050
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
5151
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
52-
import org.springframework.security.config.test.SpringTestRule;
5352
import org.springframework.security.core.Authentication;
5453
import org.springframework.security.core.context.SecurityContextHolder;
5554
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
@@ -71,6 +70,7 @@
7170
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
7271
import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
7372
import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
73+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
7474
import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
7575
import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer;
7676
import org.springframework.security.web.SecurityFilterChain;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2RefreshTokenGrantTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.springframework.mock.web.MockHttpServletResponse;
4848
import org.springframework.security.authentication.TestingAuthenticationToken;
4949
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
50-
import org.springframework.security.config.test.SpringTestRule;
5150
import org.springframework.security.core.Authentication;
5251
import org.springframework.security.core.GrantedAuthority;
5352
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
@@ -74,6 +73,7 @@
7473
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
7574
import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
7675
import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
76+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
7777
import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
7878
import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer;
7979
import org.springframework.test.web.servlet.MockMvc;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenIntrospectionTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.springframework.security.authentication.TestingAuthenticationToken;
5151
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
5252
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
53-
import org.springframework.security.config.test.SpringTestRule;
5453
import org.springframework.security.core.Authentication;
5554
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
5655
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -85,6 +84,7 @@
8584
import org.springframework.security.oauth2.server.authorization.settings.OAuth2TokenFormat;
8685
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
8786
import org.springframework.security.oauth2.server.authorization.settings.TokenSettings;
87+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
8888
import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsContext;
8989
import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsSet;
9090
import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2TokenRevocationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.springframework.security.authentication.TestingAuthenticationToken;
4242
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
4343
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
44-
import org.springframework.security.config.test.SpringTestRule;
4544
import org.springframework.security.core.Authentication;
4645
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
4746
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -65,6 +64,7 @@
6564
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
6665
import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
6766
import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
67+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
6868
import org.springframework.security.web.SecurityFilterChain;
6969
import org.springframework.security.web.authentication.AuthenticationConverter;
7070
import org.springframework.security.web.authentication.AuthenticationFailureHandler;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcClientRegistrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
5050
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
5151
import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
52-
import org.springframework.security.config.test.SpringTestRule;
5352
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
5453
import org.springframework.security.crypto.password.PasswordEncoder;
5554
import org.springframework.security.oauth2.core.AuthorizationGrantType;
@@ -80,6 +79,7 @@
8079
import org.springframework.security.oauth2.server.authorization.oidc.http.converter.OidcClientRegistrationHttpMessageConverter;
8180
import org.springframework.security.oauth2.server.authorization.settings.ClientSettings;
8281
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
82+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
8383
import org.springframework.security.web.SecurityFilterChain;
8484
import org.springframework.security.web.util.matcher.RequestMatcher;
8585
import org.springframework.test.web.servlet.MockMvc;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import org.springframework.security.authentication.TestingAuthenticationToken;
5151
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
5252
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
53-
import org.springframework.security.config.test.SpringTestRule;
5453
import org.springframework.security.core.Authentication;
5554
import org.springframework.security.core.GrantedAuthority;
5655
import org.springframework.security.crypto.password.NoOpPasswordEncoder;
@@ -81,6 +80,7 @@
8180
import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
8281
import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
8382
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
83+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
8484
import org.springframework.security.oauth2.server.authorization.token.DelegatingOAuth2TokenGenerator;
8585
import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
8686
import org.springframework.security.oauth2.server.authorization.token.JwtGenerator;

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
3838
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
3939
import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
40-
import org.springframework.security.config.test.SpringTestRule;
4140
import org.springframework.security.oauth2.core.OAuth2AccessToken;
4241
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
4342
import org.springframework.security.oauth2.core.oidc.OidcScopes;
@@ -63,6 +62,7 @@
6362
import org.springframework.security.oauth2.server.authorization.oidc.authentication.OidcUserInfoAuthenticationContext;
6463
import org.springframework.security.oauth2.server.authorization.oidc.authentication.OidcUserInfoAuthenticationToken;
6564
import org.springframework.security.oauth2.server.authorization.settings.ProviderSettings;
65+
import org.springframework.security.oauth2.server.authorization.test.SpringTestRule;
6666
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
6767
import org.springframework.security.web.SecurityFilterChain;
6868
import org.springframework.security.web.context.HttpSessionSecurityContextRepository;

0 commit comments

Comments
 (0)