spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-23 01:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source
This commit is contained in:
Phillip Webb
2026-01-06 13:24:16 -08:00
parent dad1ca5e95 581f648c3c
commit c66ad70311
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/web/servlet/SecurityFilterAutoConfigurationTests.java
+2 -2
View File
@@ -16,7 +16,6 @@
package org.springframework.boot.security.autoconfigure.web.servlet;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -38,6 +37,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.mock.web.MockServletContext;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.within;
/**
* Tests for {@link SecurityFilterAutoConfiguration}.
@@ -65,7 +65,7 @@ class SecurityFilterAutoConfigurationTests {
int securityFilterOrder = context.getBean(DelegatingFilterProxyRegistrationBean.class).getOrder();
int requestContextFilterOrder = new OrderedRequestContextFilter().getOrder();
assertThat(securityFilterOrder).isGreaterThan(requestContextFilterOrder)
.isCloseTo(requestContextFilterOrder, Assertions.within(5));
.isCloseTo(requestContextFilterOrder, within(5));
}
}
module/spring-boot-servlet/src/test/java/org/springframework/boot/servlet/filter/OrderedFilterOrderingTests.java
+2 -2
View File
@@ -19,12 +19,12 @@ package org.springframework.boot.servlet.filter;
import java.util.ArrayList;
import java.util.List;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.within;
/**
* Tests for the ordering of various {@link OrderedFilter} implementations.
@@ -48,7 +48,7 @@ class OrderedFilterOrderingTests {
@Test
void requestContextOrderingIsCloseToRequestWrapperFilterMaxOrder() {
assertThat(new OrderedRequestContextFilter().getOrder())
.isCloseTo(OrderedFilter.REQUEST_WRAPPER_FILTER_MAX_ORDER, Assertions.within(105));
.isCloseTo(OrderedFilter.REQUEST_WRAPPER_FILTER_MAX_ORDER, within(105));
}
}
module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/SessionPropertiesTests.java
+2 -3
View File
@@ -19,12 +19,12 @@ package org.springframework.boot.session.autoconfigure;
import java.time.Duration;
import java.util.function.Supplier;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.core.Ordered;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.within;
import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.mock;
@@ -58,8 +58,7 @@ class SessionPropertiesTests {
@Test
void defaultFilterOrderIsCloseToHighestPrecedence() {
assertThat(this.properties.getServlet().getFilterOrder()).isCloseTo(Ordered.HIGHEST_PRECEDENCE,
Assertions.within(50));
assertThat(this.properties.getServlet().getFilterOrder()).isCloseTo(Ordered.HIGHEST_PRECEDENCE, within(50));
}
}