spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Inline conditions in assertThat() statements

Browse Source 
Search: assertThat\(conditions?[0-9]?\)

See gh-36504
This commit is contained in:
Sam Brannen
2026-03-20 10:53:54 +01:00
parent 9e71dc6029
commit 4548f1ec66
76 changed files with 207 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java
+8 -16
View File
@@ -83,8 +83,7 @@ class HandlersBeanDefinitionParserTests {
assertThat(handlersMap).hasSize(2);
for (HandlerMapping hm : handlersMap.values()) {
boolean condition2 = hm instanceof SimpleUrlHandlerMapping;
assertThat(condition2).isTrue();
assertThat(hm instanceof SimpleUrlHandlerMapping).isTrue();
SimpleUrlHandlerMapping shm = (SimpleUrlHandlerMapping) hm;
if (shm.getUrlMap().containsKey("/foo")) {
@@ -94,11 +93,9 @@ class HandlersBeanDefinitionParserTests {
unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), FooWebSocketHandler.class);
HandshakeHandler handshakeHandler = handler.getHandshakeHandler();
assertThat(handshakeHandler).isNotNull();
boolean condition1 = handshakeHandler instanceof DefaultHandshakeHandler;
assertThat(condition1).isTrue();
assertThat(handshakeHandler instanceof DefaultHandshakeHandler).isTrue();
assertThat(handler.getHandshakeInterceptors()).isNotEmpty();
boolean condition = handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor;
assertThat(condition).isTrue();
assertThat(handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor).isTrue();
}
else {
assertThat(shm.getUrlMap()).containsOnlyKeys("/test");
@@ -107,11 +104,9 @@ class HandlersBeanDefinitionParserTests {
unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), TestWebSocketHandler.class);
HandshakeHandler handshakeHandler = handler.getHandshakeHandler();
assertThat(handshakeHandler).isNotNull();
boolean condition1 = handshakeHandler instanceof DefaultHandshakeHandler;
assertThat(condition1).isTrue();
assertThat(handshakeHandler instanceof DefaultHandshakeHandler).isTrue();
assertThat(handler.getHandshakeInterceptors()).isNotEmpty();
boolean condition = handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor;
assertThat(condition).isTrue();
assertThat(handler.getHandshakeInterceptors().get(0) instanceof OriginHandshakeInterceptor).isTrue();
}
}
}
@@ -122,8 +117,7 @@ class HandlersBeanDefinitionParserTests {
HandlerMapping handlerMapping = this.appContext.getBean(HandlerMapping.class);
assertThat(handlerMapping).isNotNull();
boolean condition2 = handlerMapping instanceof SimpleUrlHandlerMapping;
assertThat(condition2).isTrue();
assertThat(handlerMapping instanceof SimpleUrlHandlerMapping).isTrue();
SimpleUrlHandlerMapping urlHandlerMapping = (SimpleUrlHandlerMapping) handlerMapping;
assertThat(urlHandlerMapping.getOrder()).isEqualTo(2);
@@ -133,8 +127,7 @@ class HandlersBeanDefinitionParserTests {
unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), FooWebSocketHandler.class);
HandshakeHandler handshakeHandler = handler.getHandshakeHandler();
assertThat(handshakeHandler).isNotNull();
boolean condition1 = handshakeHandler instanceof TestHandshakeHandler;
assertThat(condition1).isTrue();
assertThat(handshakeHandler instanceof TestHandshakeHandler).isTrue();
List<HandshakeInterceptor> interceptors = handler.getHandshakeInterceptors();
assertThat(interceptors).extracting("class")
.containsExactlyInAnyOrder(FooTestInterceptor.class, BarTestInterceptor.class, OriginHandshakeInterceptor.class);
@@ -144,8 +137,7 @@ class HandlersBeanDefinitionParserTests {
unwrapAndCheckDecoratedHandlerType(handler.getWebSocketHandler(), TestWebSocketHandler.class);
handshakeHandler = handler.getHandshakeHandler();
assertThat(handshakeHandler).isNotNull();
boolean condition = handshakeHandler instanceof TestHandshakeHandler;
assertThat(condition).isTrue();
assertThat(handshakeHandler instanceof TestHandshakeHandler).isTrue();
interceptors = handler.getHandshakeInterceptors();
assertThat(interceptors).extracting("class")
.containsExactlyInAnyOrder(FooTestInterceptor.class, BarTestInterceptor.class, OriginHandshakeInterceptor.class);