Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test object factories to Test<Object>s naming convention #16686

Merged
merged 1 commit into from
Apr 3, 2025
Merged

Update test object factories to Test<Object>s naming convention #16686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...tation/web/builders/TestHttpSecurity.java → ...tion/web/builders/TestHttpSecurities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import org.springframework.security.config.annotation.web.configurers.DefaultLoginPageConfigurer;
import org.springframework.test.util.ReflectionTestUtils;

public final class TestHttpSecurity {
public final class TestHttpSecurities {

private TestHttpSecurity() {
private TestHttpSecurities() {

}

Expand Down
4 changes: 2 additions & 2 deletions ...a/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.TestHttpSecurity;
import org.springframework.security.config.annotation.web.builders.TestHttpSecurities;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
import org.springframework.security.config.test.SpringTestContext;
Expand Down Expand Up @@ -169,7 +169,7 @@ static class NullWebInvocationPrivilegeEvaluatorConfig {

@Bean
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
TestHttpSecurity.disableDefaults(http);
TestHttpSecurities.disableDefaults(http);
http.formLogin();
return http.build();
}
Expand Down
8 changes: 4 additions & 4 deletions ...gframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.TestHttpSecurity;
import org.springframework.security.config.annotation.web.builders.TestHttpSecurities;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.test.SpringTestContext;
import org.springframework.security.config.test.SpringTestContextExtension;
Expand Down Expand Up @@ -140,7 +140,7 @@ static class CustomFilterPositionConfig {
@Bean
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
// @formatter:off
TestHttpSecurity.disableDefaults(http);
TestHttpSecurities.disableDefaults(http);
http
// this works so long as the CustomFilter extends one of the standard filters
// if not, use addFilterBefore or addFilterAfter
Expand All @@ -158,7 +158,7 @@ static class CustomFilterPositionAtConfig {
@Bean
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
// @formatter:off
TestHttpSecurity.disableDefaults(http);
TestHttpSecurities.disableDefaults(http);
http
.addFilterAt(new OtherCustomFilter(), UsernamePasswordAuthenticationFilter.class);
return http.build();
Expand All @@ -179,7 +179,7 @@ AuthenticationManager authenticationManager() {
@Bean
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
// @formatter:off
TestHttpSecurity.disableDefaults(http);
TestHttpSecurities.disableDefaults(http);
http
.authorizeRequests()
.anyRequest().hasRole("USER")
Expand Down
4 changes: 2 additions & 2 deletions ...gframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.springframework.security.config.ObjectPostProcessor;
import org.springframework.security.config.TestDeferredSecurityContext;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.TestHttpSecurity;
import org.springframework.security.config.annotation.web.builders.TestHttpSecurities;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.test.SpringTestContext;
import org.springframework.security.config.test.SpringTestContextExtension;
Expand Down Expand Up @@ -199,7 +199,7 @@ static class SecurityContextRepositoryDefaultsSecurityContextRepositoryConfig {

@Bean
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
TestHttpSecurity.disableDefaults(http);
TestHttpSecurities.disableDefaults(http);
// @formatter:off
http
.addFilter(new WebAsyncManagerIntegrationFilter())
Expand Down
16 changes: 8 additions & 8 deletions ...ork/security/web/access/RequestMatcherDelegatingWebInvocationPrivilegeEvaluatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void isAllowedWhenDelegatesEmptyThenAllowed() {
@Test
void isAllowedWhenNotMatchThenAllowed() {
RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> notMatch = entry(this.alwaysDeny,
TestWebInvocationPrivilegeEvaluator.alwaysAllow());
TestWebInvocationPrivilegeEvaluators.alwaysAllow());
WebInvocationPrivilegeEvaluator delegating = evaluator(notMatch);
assertThat(delegating.isAllowed(this.uri, this.authentication)).isTrue();
verify(notMatch.getRequestMatcher()).matches(any());
Expand All @@ -96,9 +96,9 @@ void isAllowedWhenPrivilegeEvaluatorDenyThenAllowedFalse() {
@Test
void isAllowedWhenNotMatchThenMatchThenOnlySecondDelegateInvoked() {
RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> notMatchDelegate = entry(this.alwaysDeny,
TestWebInvocationPrivilegeEvaluator.alwaysAllow());
TestWebInvocationPrivilegeEvaluators.alwaysAllow());
RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> matchDelegate = entry(this.alwaysMatch,
TestWebInvocationPrivilegeEvaluator.alwaysAllow());
TestWebInvocationPrivilegeEvaluators.alwaysAllow());
RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> spyNotMatchDelegate = spy(notMatchDelegate);
RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> spyMatchDelegate = spy(matchDelegate);

Expand All @@ -120,8 +120,8 @@ void isAllowedWhenDelegatePrivilegeEvaluatorsEmptyThenAllowedTrue() {

@Test
void isAllowedWhenFirstDelegateDenyThenDoNotInvokeOthers() {
WebInvocationPrivilegeEvaluator deny = TestWebInvocationPrivilegeEvaluator.alwaysDeny();
WebInvocationPrivilegeEvaluator allow = TestWebInvocationPrivilegeEvaluator.alwaysAllow();
WebInvocationPrivilegeEvaluator deny = TestWebInvocationPrivilegeEvaluators.alwaysDeny();
WebInvocationPrivilegeEvaluator allow = TestWebInvocationPrivilegeEvaluators.alwaysAllow();
WebInvocationPrivilegeEvaluator spyDeny = spy(deny);
WebInvocationPrivilegeEvaluator spyAllow = spy(allow);
RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> delegate = entry(this.alwaysMatch, spyDeny,
Expand All @@ -136,7 +136,7 @@ void isAllowedWhenFirstDelegateDenyThenDoNotInvokeOthers() {

@Test
void isAllowedWhenDifferentArgumentsThenCallSpecificIsAllowedInDelegate() {
WebInvocationPrivilegeEvaluator deny = TestWebInvocationPrivilegeEvaluator.alwaysDeny();
WebInvocationPrivilegeEvaluator deny = TestWebInvocationPrivilegeEvaluators.alwaysDeny();
WebInvocationPrivilegeEvaluator spyDeny = spy(deny);
RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> delegate = entry(this.alwaysMatch, spyDeny);

Expand Down Expand Up @@ -197,11 +197,11 @@ private RequestMatcherDelegatingWebInvocationPrivilegeEvaluator evaluator(Reques
}

private RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> allow(RequestMatcher requestMatcher) {
return entry(requestMatcher, TestWebInvocationPrivilegeEvaluator.alwaysAllow());
return entry(requestMatcher, TestWebInvocationPrivilegeEvaluators.alwaysAllow());
}

private RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> deny(RequestMatcher requestMatcher) {
return entry(requestMatcher, TestWebInvocationPrivilegeEvaluator.alwaysDeny());
return entry(requestMatcher, TestWebInvocationPrivilegeEvaluators.alwaysDeny());
}

private RequestMatcherEntry<List<WebInvocationPrivilegeEvaluator>> entry(RequestMatcher requestMatcher,
Expand Down
4 changes: 2 additions & 2 deletions .../TestWebInvocationPrivilegeEvaluator.java → ...TestWebInvocationPrivilegeEvaluators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

import org.springframework.security.core.Authentication;

public final class TestWebInvocationPrivilegeEvaluator {
public final class TestWebInvocationPrivilegeEvaluators {

private static final AlwaysAllowWebInvocationPrivilegeEvaluator ALWAYS_ALLOW = new AlwaysAllowWebInvocationPrivilegeEvaluator();

private static final AlwaysDenyWebInvocationPrivilegeEvaluator ALWAYS_DENY = new AlwaysDenyWebInvocationPrivilegeEvaluator();

private TestWebInvocationPrivilegeEvaluator() {
private TestWebInvocationPrivilegeEvaluators() {
}

public static WebInvocationPrivilegeEvaluator alwaysAllow() {
Expand Down