Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use AssertJ's hasSize() for collections and maps

Browse Source 
Achieved via a global search-and-replace.
This commit is contained in:
Sam Brannen
2022-11-22 16:50:10 +01:00
parent f9f8f2d89e
commit 36f7597f25
237 changed files with 1161 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java
View File

@@ -40,7 +40,7 @@ public class WebSocketExtensionTests {
WebSocketExtension extension = extensions.get(0);
assertThat(extension.getName()).isEqualTo("x-test-extension");
assertThat(extension.getParameters().size()).isEqualTo(2);
assertThat(extension.getParameters()).hasSize(2);
assertThat(extension.getParameters().get("foo")).isEqualTo("bar");
assertThat(extension.getParameters().get("bar")).isEqualTo("baz");
}

2
spring-websocket/src/test/java/org/springframework/web/socket/WebSocketHandshakeTests.java
View File

@@ -80,7 +80,7 @@ class WebSocketHandshakeTests extends AbstractWebSocketIntegrationTests {
serverHandler.await();
assertThat(serverHandler.getTransportError()).isNull();
assertThat(serverHandler.getReceivedMessages().size()).isEqualTo(1);
assertThat(serverHandler.getReceivedMessages()).hasSize(1);
assertThat(serverHandler.getReceivedMessages().get(0).getClass()).isEqualTo(PongMessage.class);
}

4
spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java
View File

@@ -116,7 +116,7 @@ public class StandardWebSocketClientTests {
WebSocketSession session = this.wsClient.doHandshake(this.wsHandler, this.headers, uri).get();
assertThat(session.getHandshakeHeaders().size()).isEqualTo(1);
assertThat(session.getHandshakeHeaders()).hasSize(1);
assertThat(session.getHandshakeHeaders().getFirst("foo")).isEqualTo("bar");
}
@@ -166,7 +166,7 @@ public class StandardWebSocketClientTests {
Map<String, List<String>> headers = new HashMap<>();
endpointConfig.getConfigurator().beforeRequest(headers);
assertThat(headers.size()).isEqualTo(1);
assertThat(headers).hasSize(1);
}
@Test

10
spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
View File

@@ -399,12 +399,12 @@ public class MessageBrokerBeanDefinitionParserTests {
SimpAnnotationMethodMessageHandler handler = this.appContext.getBean(SimpAnnotationMethodMessageHandler.class);
List<HandlerMethodArgumentResolver> customResolvers = handler.getCustomArgumentResolvers();
assertThat(customResolvers.size()).isEqualTo(2);
assertThat(customResolvers).hasSize(2);
assertThat(handler.getArgumentResolvers().contains(customResolvers.get(0))).isTrue();
assertThat(handler.getArgumentResolvers().contains(customResolvers.get(1))).isTrue();
List<HandlerMethodReturnValueHandler> customHandlers = handler.getCustomReturnValueHandlers();
assertThat(customHandlers.size()).isEqualTo(2);
assertThat(customHandlers).hasSize(2);
assertThat(handler.getReturnValueHandlers().contains(customHandlers.get(0))).isTrue();
assertThat(handler.getReturnValueHandlers().contains(customHandlers.get(1))).isTrue();
}
@@ -416,7 +416,7 @@ public class MessageBrokerBeanDefinitionParserTests {
CompositeMessageConverter compositeConverter = this.appContext.getBean(CompositeMessageConverter.class);
assertThat(compositeConverter).isNotNull();
assertThat(compositeConverter.getConverters().size()).isEqualTo(4);
assertThat(compositeConverter.getConverters()).hasSize(4);
assertThat(compositeConverter.getConverters().iterator().next().getClass()).isEqualTo(StringMessageConverter.class);
}
@@ -427,7 +427,7 @@ public class MessageBrokerBeanDefinitionParserTests {
CompositeMessageConverter compositeConverter = this.appContext.getBean(CompositeMessageConverter.class);
assertThat(compositeConverter).isNotNull();
assertThat(compositeConverter.getConverters().size()).isEqualTo(1);
assertThat(compositeConverter.getConverters()).hasSize(1);
assertThat(compositeConverter.getConverters().iterator().next().getClass()).isEqualTo(StringMessageConverter.class);
}
@@ -442,7 +442,7 @@ public class MessageBrokerBeanDefinitionParserTests {
assertThat(channel.hasSubscription(subscriber)).isTrue();
}
List<ChannelInterceptor> interceptors = channel.getInterceptors();
assertThat(interceptors.size()).isEqualTo(interceptorCount);
assertThat(interceptors).hasSize(interceptorCount);
assertThat(interceptors.get(interceptors.size() - 1).getClass()).isEqualTo(ImmutableMessageChannelInterceptor.class);
}

8
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java
View File

@@ -63,7 +63,7 @@ public class WebMvcStompEndpointRegistryTests {
this.endpointRegistry.addEndpoint("/stomp");
Map<String, SubProtocolHandler> protocolHandlers = webSocketHandler.getProtocolHandlerMap();
assertThat(protocolHandlers.size()).isEqualTo(3);
assertThat(protocolHandlers).hasSize(3);
assertThat(protocolHandlers.get("v10.stomp")).isNotNull();
assertThat(protocolHandlers.get("v11.stomp")).isNotNull();
assertThat(protocolHandlers.get("v12.stomp")).isNotNull();
@@ -72,7 +72,7 @@ public class WebMvcStompEndpointRegistryTests {
@Test
public void handlerMapping() {
SimpleUrlHandlerMapping hm = (SimpleUrlHandlerMapping) this.endpointRegistry.getHandlerMapping();
assertThat(hm.getUrlMap().size()).isEqualTo(0);
assertThat(hm.getUrlMap()).hasSize(0);
UrlPathHelper pathHelper = new UrlPathHelper();
this.endpointRegistry.setUrlPathHelper(pathHelper);
@@ -80,10 +80,10 @@ public class WebMvcStompEndpointRegistryTests {
this.endpointRegistry.addEndpoint("/stompOverSockJS").withSockJS();
//SPR-12403
assertThat(this.webSocketHandler.getProtocolHandlers().size()).isEqualTo(1);
assertThat(this.webSocketHandler.getProtocolHandlers()).hasSize(1);
hm = (SimpleUrlHandlerMapping) this.endpointRegistry.getHandlerMapping();
assertThat(hm.getUrlMap().size()).isEqualTo(2);
assertThat(hm.getUrlMap()).hasSize(2);
assertThat(hm.getUrlMap().get("/stompOverWebSocket")).isNotNull();
assertThat(hm.getUrlMap().get("/stompOverSockJS/**")).isNotNull();
assertThat(hm.getUrlPathHelper()).isSameAs(pathHelper);

14
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java
View File

@@ -55,7 +55,7 @@ public class WebSocketHandlerRegistrationTests {
this.registration.addHandler(handler, "/foo", "/bar");
List<Mapping> mappings = this.registration.getMappings();
assertThat(mappings.size()).isEqualTo(2);
assertThat(mappings).hasSize(2);
Mapping m1 = mappings.get(0);
assertThat(m1.webSocketHandler).isEqualTo(handler);
@@ -80,7 +80,7 @@ public class WebSocketHandlerRegistrationTests {
this.registration.addHandler(handler, "/foo").addInterceptors(interceptor);
List<Mapping> mappings = this.registration.getMappings();
assertThat(mappings.size()).isEqualTo(1);
assertThat(mappings).hasSize(1);
Mapping mapping = mappings.get(0);
assertThat(mapping.webSocketHandler).isEqualTo(handler);
@@ -99,7 +99,7 @@ public class WebSocketHandlerRegistrationTests {
this.registration.addHandler(handler, "/foo").addInterceptors(interceptor).setAllowedOrigins();
List<Mapping> mappings = this.registration.getMappings();
assertThat(mappings.size()).isEqualTo(1);
assertThat(mappings).hasSize(1);
Mapping mapping = mappings.get(0);
assertThat(mapping.webSocketHandler).isEqualTo(handler);
@@ -121,7 +121,7 @@ public class WebSocketHandlerRegistrationTests {
.setAllowedOriginPatterns("https://*.abc.com");
List<Mapping> mappings = this.registration.getMappings();
assertThat(mappings.size()).isEqualTo(1);
assertThat(mappings).hasSize(1);
Mapping mapping = mappings.get(0);
assertThat(mapping.webSocketHandler).isEqualTo(handler);
@@ -149,7 +149,7 @@ public class WebSocketHandlerRegistrationTests {
this.registration.getSockJsServiceRegistration().setTaskScheduler(this.taskScheduler);
List<Mapping> mappings = this.registration.getMappings();
assertThat(mappings.size()).isEqualTo(1);
assertThat(mappings).hasSize(1);
Mapping mapping = mappings.get(0);
assertThat(mapping.webSocketHandler).isEqualTo(handler);
@@ -172,7 +172,7 @@ public class WebSocketHandlerRegistrationTests {
this.registration.addHandler(handler, "/foo").setHandshakeHandler(handshakeHandler);
List<Mapping> mappings = this.registration.getMappings();
assertThat(mappings.size()).isEqualTo(1);
assertThat(mappings).hasSize(1);
Mapping mapping = mappings.get(0);
assertThat(mapping.webSocketHandler).isEqualTo(handler);
@@ -189,7 +189,7 @@ public class WebSocketHandlerRegistrationTests {
this.registration.getSockJsServiceRegistration().setTaskScheduler(this.taskScheduler);
List<Mapping> mappings = this.registration.getMappings();
assertThat(mappings.size()).isEqualTo(1);
assertThat(mappings).hasSize(1);
Mapping mapping = mappings.get(0);
assertThat(mapping.webSocketHandler).isEqualTo(handler);

2
spring-websocket/src/test/java/org/springframework/web/socket/handler/ConcurrentWebSocketSessionDecoratorTests.java
View File

@@ -50,7 +50,7 @@ public class ConcurrentWebSocketSessionDecoratorTests {
TextMessage textMessage = new TextMessage("payload");
decorator.sendMessage(textMessage);
assertThat(session.getSentMessages().size()).isEqualTo(1);
assertThat(session.getSentMessages()).hasSize(1);
assertThat(session.getSentMessages().get(0)).isEqualTo(textMessage);
assertThat(decorator.getBufferSize()).isEqualTo(0);

10
spring-websocket/src/test/java/org/springframework/web/socket/messaging/DefaultSimpUserRegistryTests.java
View File

@@ -56,7 +56,7 @@ public class DefaultSimpUserRegistryTests {
assertThat(simpUser).isNotNull();
assertThat(registry.getUserCount()).isEqualTo(1);
assertThat(simpUser.getSessions().size()).isEqualTo(1);
assertThat(simpUser.getSessions()).hasSize(1);
assertThat(simpUser.getSession("123")).isNotNull();
}
@@ -81,7 +81,7 @@ public class DefaultSimpUserRegistryTests {
assertThat(simpUser).isNotNull();
assertThat(registry.getUserCount()).isEqualTo(1);
assertThat(simpUser.getSessions().size()).isEqualTo(3);
assertThat(simpUser.getSessions()).hasSize(3);
assertThat(simpUser.getSession("123")).isNotNull();
assertThat(simpUser.getSession("456")).isNotNull();
assertThat(simpUser.getSession("789")).isNotNull();
@@ -106,7 +106,7 @@ public class DefaultSimpUserRegistryTests {
SimpUser simpUser = registry.getUser("joe");
assertThat(simpUser).isNotNull();
assertThat(simpUser.getSessions().size()).isEqualTo(3);
assertThat(simpUser.getSessions()).hasSize(3);
CloseStatus status = CloseStatus.GOING_AWAY;
message = createMessage(SimpMessageType.DISCONNECT, "456");
@@ -117,7 +117,7 @@ public class DefaultSimpUserRegistryTests {
disconnectEvent = new SessionDisconnectEvent(this, message, "789", status, user);
registry.onApplicationEvent(disconnectEvent);
assertThat(simpUser.getSessions().size()).isEqualTo(1);
assertThat(simpUser.getSessions()).hasSize(1);
assertThat(simpUser.getSession("123")).isNotNull();
}
@@ -144,7 +144,7 @@ public class DefaultSimpUserRegistryTests {
Set<SimpSubscription> matches = registry.findSubscriptions(subscription -> subscription.getDestination().equals("/match"));
assertThat(matches.size()).isEqualTo(2);
assertThat(matches).hasSize(2);
Iterator<SimpSubscription> iterator = matches.iterator();
Set<String> sessionIds = new HashSet<>(2);

28
spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java
View File

@@ -106,7 +106,7 @@ public class StompSubProtocolHandlerTests {
Message<byte[]> message = MessageBuilder.createMessage(EMPTY_PAYLOAD, headers.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, message);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
WebSocketMessage<?> textMessage = this.session.getSentMessages().get(0);
assertThat(textMessage.getPayload()).isEqualTo("""
CONNECTED
@@ -123,7 +123,7 @@ public class StompSubProtocolHandlerTests {
Message<byte[]> message = MessageBuilder.createMessage(EMPTY_PAYLOAD, headers.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, message);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
WebSocketMessage<?> textMessage = this.session.getSentMessages().get(0);
assertThat(textMessage.getPayload()).isEqualTo("""
CONNECTED
@@ -145,7 +145,7 @@ public class StompSubProtocolHandlerTests {
Message<byte[]> ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, ackAccessor.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, ackMessage);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
TextMessage actual = (TextMessage) this.session.getSentMessages().get(0);
assertThat(actual.getPayload()).isEqualTo("""
CONNECTED
@@ -168,7 +168,7 @@ public class StompSubProtocolHandlerTests {
Message<byte[]> ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, ackAccessor.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, ackMessage);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
TextMessage actual = (TextMessage) this.session.getSentMessages().get(0);
assertThat(actual.getPayload()).isEqualTo("""
CONNECTED
@@ -189,7 +189,7 @@ public class StompSubProtocolHandlerTests {
Message<byte[]> ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, ackAccessor.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, ackMessage);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
TextMessage actual = (TextMessage) this.session.getSentMessages().get(0);
assertThat(actual.getPayload()).isEqualTo("""
ERROR
@@ -210,7 +210,7 @@ public class StompSubProtocolHandlerTests {
Message<byte[]> ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, ackAccessor.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, ackMessage);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
TextMessage actual = (TextMessage) this.session.getSentMessages().get(0);
assertThat(actual.getPayload()).isEqualTo("""
RECEIPT
@@ -227,7 +227,7 @@ public class StompSubProtocolHandlerTests {
Message<byte[]> ackMessage = MessageBuilder.createMessage(EMPTY_PAYLOAD, accessor.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, ackMessage);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
TextMessage actual = (TextMessage) this.session.getSentMessages().get(0);
assertThat(actual.getPayload()).isEqualTo("\n");
}
@@ -270,7 +270,7 @@ public class StompSubProtocolHandlerTests {
Message<byte[]> message = MessageBuilder.createMessage(EMPTY_PAYLOAD, headers.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, message);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
WebSocketMessage<?> textMessage = this.session.getSentMessages().get(0);
assertThat(((String) textMessage.getPayload()).contains("destination:/user/queue/foo\n")).isTrue();
assertThat(((String) textMessage.getPayload()).contains(SimpMessageHeaderAccessor.ORIGINAL_DESTINATION)).isFalse();
@@ -292,7 +292,7 @@ public class StompSubProtocolHandlerTests {
Message<byte[]> message = MessageBuilder.createMessage(payload, headers.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, message);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
WebSocketMessage<?> webSocketMessage = this.session.getSentMessages().get(0);
assertThat(webSocketMessage instanceof BinaryMessage).isTrue();
@@ -302,7 +302,7 @@ public class StompSubProtocolHandlerTests {
message = MessageBuilder.createMessage(payload, headers.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, message);
assertThat(this.session.getSentMessages().size()).isEqualTo(2);
assertThat(this.session.getSentMessages()).hasSize(2);
webSocketMessage = this.session.getSentMessages().get(1);
assertThat(webSocketMessage instanceof TextMessage).isTrue();
}
@@ -332,7 +332,7 @@ public class StompSubProtocolHandlerTests {
assertThat(stompAccessor.getPasscode()).isEqualTo("guest");
assertThat(stompAccessor.getHeartbeat()).isEqualTo(new long[] {10000, 10000});
assertThat(stompAccessor.getAcceptVersion()).isEqualTo(new HashSet<>(Arrays.asList("1.1","1.0")));
assertThat(this.session.getSentMessages().size()).isEqualTo(0);
assertThat(this.session.getSentMessages()).hasSize(0);
}
@Test
@@ -393,7 +393,7 @@ public class StompSubProtocolHandlerTests {
TextMessage wsMessage = StompTextMessageBuilder.create(StompCommand.CONNECT).build();
handler.handleMessageFromClient(this.session, wsMessage, channel);
assertThat(messageHandler.getMessages().size()).isEqualTo(1);
assertThat(messageHandler.getMessages()).hasSize(1);
Message<?> message = messageHandler.getMessages().get(0);
Principal user = SimpMessageHeaderAccessor.getUser(message.getHeaders());
assertThat(user).isNotNull();
@@ -420,7 +420,7 @@ public class StompSubProtocolHandlerTests {
this.protocolHandler.handleMessageFromClient(this.session, textMessage, this.channel);
verifyNoInteractions(this.channel);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
TextMessage actual = (TextMessage) this.session.getSentMessages().get(0);
assertThat(actual.getPayload().startsWith("ERROR")).isTrue();
}
@@ -483,7 +483,7 @@ public class StompSubProtocolHandlerTests {
message = MessageBuilder.createMessage(EMPTY_PAYLOAD, headers.getMessageHeaders());
this.protocolHandler.handleMessageToClient(this.session, message);
assertThat(this.session.getSentMessages().size()).isEqualTo(1);
assertThat(this.session.getSentMessages()).hasSize(1);
textMessage = (TextMessage) this.session.getSentMessages().get(0);
assertThat(textMessage.getPayload()).isEqualTo("""
CONNECTED

8
spring-websocket/src/test/java/org/springframework/web/socket/server/support/HttpSessionHandshakeInterceptorTests.java
View File

@@ -50,7 +50,7 @@ public class HttpSessionHandshakeInterceptorTests extends AbstractHttpRequestTes
HttpSessionHandshakeInterceptor interceptor = new HttpSessionHandshakeInterceptor();
interceptor.beforeHandshake(this.request, this.response, wsHandler, attributes);
assertThat(attributes.size()).isEqualTo(3);
assertThat(attributes).hasSize(3);
assertThat(attributes.get("foo")).isEqualTo("bar");
assertThat(attributes.get("bar")).isEqualTo("baz");
assertThat(attributes.get(HttpSessionHandshakeInterceptor.HTTP_SESSION_ID_ATTR_NAME)).isEqualTo("123");
@@ -66,7 +66,7 @@ public class HttpSessionHandshakeInterceptorTests extends AbstractHttpRequestTes
HttpSessionHandshakeInterceptor interceptor = new HttpSessionHandshakeInterceptor(names);
interceptor.beforeHandshake(this.request, this.response, wsHandler, attributes);
assertThat(attributes.size()).isEqualTo(2);
assertThat(attributes).hasSize(2);
assertThat(attributes.get("foo")).isEqualTo("bar");
assertThat(attributes.get(HttpSessionHandshakeInterceptor.HTTP_SESSION_ID_ATTR_NAME)).isEqualTo("123");
}
@@ -80,7 +80,7 @@ public class HttpSessionHandshakeInterceptorTests extends AbstractHttpRequestTes
interceptor.setCopyHttpSessionId(false);
interceptor.beforeHandshake(this.request, this.response, wsHandler, attributes);
assertThat(attributes.size()).isEqualTo(1);
assertThat(attributes).hasSize(1);
assertThat(attributes.get("foo")).isEqualTo("bar");
}
@@ -94,7 +94,7 @@ public class HttpSessionHandshakeInterceptorTests extends AbstractHttpRequestTes
interceptor.setCopyAllAttributes(false);
interceptor.beforeHandshake(this.request, this.response, wsHandler, attributes);
assertThat(attributes.size()).isEqualTo(1);
assertThat(attributes).hasSize(1);
assertThat(attributes.get(HttpSessionHandshakeInterceptor.HTTP_SESSION_ID_ATTR_NAME)).isEqualTo("123");
}

8
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsClientTests.java
View File

@@ -115,12 +115,12 @@ class SockJsClientTests {
this.sockJsClient.doHandshake(handler, headers, new URI(URL)).addCallback(this.connectCallback);
HttpHeaders httpHeaders = headersCaptor.getValue();
assertThat(httpHeaders.size()).isEqualTo(2);
assertThat(httpHeaders).hasSize(2);
assertThat(httpHeaders.getFirst("foo")).isEqualTo("bar");
assertThat(httpHeaders.getFirst("auth")).isEqualTo("123");
httpHeaders = this.xhrTransport.getRequest().getHttpRequestHeaders();
assertThat(httpHeaders.size()).isEqualTo(2);
assertThat(httpHeaders).hasSize(2);
assertThat(httpHeaders.getFirst("foo")).isEqualTo("bar");
assertThat(httpHeaders.getFirst("auth")).isEqualTo("123");
}
@@ -137,9 +137,9 @@ class SockJsClientTests {
this.sockJsClient.setHttpHeaderNames("auth");
this.sockJsClient.doHandshake(handler, headers, new URI(URL)).addCallback(this.connectCallback);
assertThat(headersCaptor.getValue().size()).isEqualTo(1);
assertThat(headersCaptor.getValue()).hasSize(1);
assertThat(headersCaptor.getValue().getFirst("auth")).isEqualTo("123");
assertThat(this.xhrTransport.getRequest().getHttpRequestHeaders().size()).isEqualTo(1);
assertThat(this.xhrTransport.getRequest().getHttpRequestHeaders()).hasSize(1);
assertThat(this.xhrTransport.getRequest().getHttpRequestHeaders().getFirst("auth")).isEqualTo("123");
}

4
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/XhrTransportTests.java
View File

@@ -69,7 +69,7 @@ class XhrTransportTests {
transport.sendMessageResponseToReturn = new ResponseEntity<>(HttpStatus.NO_CONTENT);
URI url = new URI("https://example.com");
transport.executeSendRequest(url, requestHeaders, new TextMessage("payload"));
assertThat(transport.actualSendRequestHeaders.size()).isEqualTo(2);
assertThat(transport.actualSendRequestHeaders).hasSize(2);
assertThat(transport.actualSendRequestHeaders.getFirst("foo")).isEqualTo("bar");
assertThat(transport.actualSendRequestHeaders.getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
}
@@ -106,7 +106,7 @@ class XhrTransportTests {
verify(request).getHttpRequestHeaders();
verifyNoMoreInteractions(request);
assertThat(transport.actualHandshakeHeaders.size()).isEqualTo(1);
assertThat(transport.actualHandshakeHeaders).hasSize(1);
assertThat(transport.actualHandshakeHeaders.getOrigin()).isEqualTo("foo");
assertThat(transport.actualSession.isDisconnected()).isFalse();

6
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java
View File

@@ -111,7 +111,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests {
DefaultSockJsService service = new DefaultSockJsService(mock(TaskScheduler.class));
Map<TransportType, TransportHandler> handlers = service.getTransportHandlers();
assertThat(handlers.size()).isEqualTo(6);
assertThat(handlers).hasSize(6);
assertThat(handlers.get(TransportType.WEBSOCKET)).isNotNull();
assertThat(handlers.get(TransportType.XHR)).isNotNull();
assertThat(handlers.get(TransportType.XHR_SEND)).isNotNull();
@@ -127,7 +127,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests {
DefaultSockJsService service = new DefaultSockJsService(mock(TaskScheduler.class), xhrHandler);
Map<TransportType, TransportHandler> handlers = service.getTransportHandlers();
assertThat(handlers.size()).isEqualTo(6);
assertThat(handlers).hasSize(6);
assertThat(handlers.get(xhrHandler.getTransportType())).isSameAs(xhrHandler);
}
@@ -143,7 +143,7 @@ public class DefaultSockJsServiceTests extends AbstractHttpRequestTests {
mock(TaskScheduler.class), new XhrPollingTransportHandler(), new XhrReceivingTransportHandler());
Map<TransportType, TransportHandler> actualHandlers = service.getTransportHandlers();
assertThat(actualHandlers.size()).isEqualTo(2);
assertThat(actualHandlers).hasSize(2);
}
@Test

6
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/SockJsSessionTests.java
View File

@@ -186,7 +186,7 @@ class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSession> {
this.session.setActive(true);
this.session.close();
assertThat(this.session.getSockJsFramesWritten().size()).isEqualTo(1);
assertThat(this.session.getSockJsFramesWritten()).hasSize(1);
assertThat(this.session.getSockJsFramesWritten().get(0)).isEqualTo(SockJsFrame.closeFrameGoAway());
assertThat(this.session.getNumberOfLastActiveTimeUpdates()).isEqualTo(1);
@@ -235,7 +235,7 @@ class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSession> {
void writeFrame() {
this.session.writeFrame(SockJsFrame.openFrame());
assertThat(this.session.getSockJsFramesWritten().size()).isEqualTo(1);
assertThat(this.session.getSockJsFramesWritten()).hasSize(1);
assertThat(this.session.getSockJsFramesWritten().get(0)).isEqualTo(SockJsFrame.openFrame());
}
@@ -255,7 +255,7 @@ class SockJsSessionTests extends AbstractSockJsSessionTests<TestSockJsSession> {
this.session.setActive(true);
this.session.sendHeartbeat();
assertThat(this.session.getSockJsFramesWritten().size()).isEqualTo(1);
assertThat(this.session.getSockJsFramesWritten()).hasSize(1);
assertThat(this.session.getSockJsFramesWritten().get(0)).isEqualTo(SockJsFrame.heartbeatFrame());
verify(this.taskScheduler).schedule(any(Runnable.class), any(Instant.class));