Skip to content

Commit 581f648

Browse files
committed
Fix Assertions static imports
See gh-48630
1 parent a4f3568 commit 581f648

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

module/spring-boot-security/src/test/java/org/springframework/boot/security/autoconfigure/web/servlet/SecurityFilterAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.boot.security.autoconfigure.web.servlet;
1818

19-
import org.assertj.core.api.Assertions;
2019
import org.junit.jupiter.api.Test;
2120

2221
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@@ -38,6 +37,7 @@
3837
import org.springframework.mock.web.MockServletContext;
3938

4039
import static org.assertj.core.api.Assertions.assertThat;
40+
import static org.assertj.core.api.Assertions.within;
4141

4242
/**
4343
* Tests for {@link SecurityFilterAutoConfiguration}.
@@ -65,7 +65,7 @@ void filterIsOrderedShortlyAfterRequestContextFilter() {
6565
int securityFilterOrder = context.getBean(DelegatingFilterProxyRegistrationBean.class).getOrder();
6666
int requestContextFilterOrder = new OrderedRequestContextFilter().getOrder();
6767
assertThat(securityFilterOrder).isGreaterThan(requestContextFilterOrder)
68-
.isCloseTo(requestContextFilterOrder, Assertions.within(5));
68+
.isCloseTo(requestContextFilterOrder, within(5));
6969
}
7070
}
7171

module/spring-boot-servlet/src/test/java/org/springframework/boot/servlet/filter/OrderedFilterOrderingTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import org.assertj.core.api.Assertions;
2322
import org.junit.jupiter.api.Test;
2423

2524
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
2625

2726
import static org.assertj.core.api.Assertions.assertThat;
27+
import static org.assertj.core.api.Assertions.within;
2828

2929
/**
3030
* Tests for the ordering of various {@link OrderedFilter} implementations.
@@ -48,7 +48,7 @@ void ordering() {
4848
@Test
4949
void requestContextOrderingIsCloseToRequestWrapperFilterMaxOrder() {
5050
assertThat(new OrderedRequestContextFilter().getOrder())
51-
.isCloseTo(OrderedFilter.REQUEST_WRAPPER_FILTER_MAX_ORDER, Assertions.within(105));
51+
.isCloseTo(OrderedFilter.REQUEST_WRAPPER_FILTER_MAX_ORDER, within(105));
5252
}
5353

5454
}

module/spring-boot-session/src/test/java/org/springframework/boot/session/autoconfigure/SessionPropertiesTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import java.time.Duration;
2020
import java.util.function.Supplier;
2121

22-
import org.assertj.core.api.Assertions;
2322
import org.junit.jupiter.api.Test;
2423

2524
import org.springframework.core.Ordered;
2625

2726
import static org.assertj.core.api.Assertions.assertThat;
27+
import static org.assertj.core.api.Assertions.within;
2828
import static org.mockito.BDDMockito.then;
2929
import static org.mockito.Mockito.mock;
3030

@@ -58,8 +58,7 @@ void determineTimeoutWithNoTimeoutUseFallback() {
5858

5959
@Test
6060
void defaultFilterOrderIsCloseToHighestPrecedence() {
61-
assertThat(this.properties.getServlet().getFilterOrder()).isCloseTo(Ordered.HIGHEST_PRECEDENCE,
62-
Assertions.within(50));
61+
assertThat(this.properties.getServlet().getFilterOrder()).isCloseTo(Ordered.HIGHEST_PRECEDENCE, within(50));
6362
}
6463

6564
}

0 commit comments

Comments
 (0)