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-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java
View File

@@ -196,7 +196,7 @@ public class MessageHeadersTests {
}
MessageHeaders headers = new MyMH();
assertThat(headers.getId().toString()).isEqualTo("00000000-0000-0000-0000-000000000001");
assertThat(headers.size()).isEqualTo(1);
assertThat(headers).hasSize(1);
}
}

8
spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethodTests.java
View File

@@ -51,8 +51,8 @@ public class InvocableHandlerMethodTests {
Method method = ResolvableMethod.on(Handler.class).mockCall(c -> c.handle(0, "")).method();
Object value = invoke(new Handler(), method);
assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1);
assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1);
assertThat(value).isEqualTo("99-value");
assertThat(getStubResolver(0).getResolvedParameters().get(0).getParameterName()).isEqualTo("intArg");
assertThat(getStubResolver(1).getResolvedParameters().get(0).getParameterName()).isEqualTo("stringArg");
@@ -65,8 +65,8 @@ public class InvocableHandlerMethodTests {
Method method = ResolvableMethod.on(Handler.class).mockCall(c -> c.handle(0, "")).method();
Object value = invoke(new Handler(), method);
assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1);
assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1);
assertThat(value).isEqualTo("null-null");
}

10
spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethodTests.java
View File

@@ -58,8 +58,8 @@ public class InvocableHandlerMethodTests {
Method method = ResolvableMethod.on(Handler.class).mockCall(c -> c.handle(0, "")).method();
Object value = invokeAndBlock(new Handler(), method);
assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1);
assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1);
assertThat(value).isEqualTo("99-value");
assertThat(getStubResolver(0).getResolvedParameters().get(0).getParameterName()).isEqualTo("intArg");
assertThat(getStubResolver(1).getResolvedParameters().get(0).getParameterName()).isEqualTo("stringArg");
@@ -72,8 +72,8 @@ public class InvocableHandlerMethodTests {
Method method = ResolvableMethod.on(Handler.class).mockCall(c -> c.handle(0, "")).method();
Object value = invokeAndBlock(new Handler(), method);
assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(1).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1);
assertThat(getStubResolver(1).getResolvedParameters()).hasSize(1);
assertThat(value).isEqualTo("null-null");
}
@@ -145,7 +145,7 @@ public class InvocableHandlerMethodTests {
Object value = invokeAndBlock(handler, method);
assertThat(value).isNull();
assertThat(getStubResolver(0).getResolvedParameters().size()).isEqualTo(1);
assertThat(getStubResolver(0).getResolvedParameters()).hasSize(1);
assertThat(handler.getResult()).isEqualTo("5.25");
assertThat(getStubResolver(0).getResolvedParameters().get(0).getParameterName()).isEqualTo("amount");
}

2
spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/reactive/MethodMessageHandlerTests.java
View File

@@ -66,7 +66,7 @@ public class MethodMessageHandlerTests {
TestMethodMessageHandler messageHandler = initMethodMessageHandler(TestController.class);
Map<String, HandlerMethod> mappings = messageHandler.getHandlerMethods();
assertThat(mappings.keySet().size()).isEqualTo(5);
assertThat(mappings.keySet()).hasSize(5);
assertThat(mappings).containsOnlyKeys(
"/handleMessage", "/handleMessageWithArgument", "/handleMessageWithError",
"/handleMessageMatch1", "/handleMessageMatch2");

2
spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterTests.java
View File

@@ -119,7 +119,7 @@ public class DefaultRSocketRequesterTests {
assertThat(payloads).isNotNull();
if (Arrays.equals(new String[] {""}, expectedValues)) {
assertThat(payloads.size()).isEqualTo(1);
assertThat(payloads).hasSize(1);
assertThat(payloads.get(0).getMetadataUtf8()).isEqualTo("toA");
assertThat(payloads.get(0).getDataUtf8()).isEqualTo("");
}

6
spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
View File

@@ -62,7 +62,7 @@ public class SimpMessagingTemplateTests {
this.messagingTemplate.convertAndSendToUser("joe", "/queue/foo", "data");
List<Message<byte[]>> messages = this.messageChannel.getMessages();
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
Message<byte[]> message = messages.get(0);
SimpMessageHeaderAccessor headerAccessor =
@@ -78,7 +78,7 @@ public class SimpMessagingTemplateTests {
this.messagingTemplate.convertAndSendToUser("https://joe.openid.example.org/", "/queue/foo", "data");
List<Message<byte[]>> messages = this.messageChannel.getMessages();
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
SimpMessageHeaderAccessor headerAccessor =
MessageHeaderAccessor.getAccessor(messages.get(0), SimpMessageHeaderAccessor.class);
@@ -133,7 +133,7 @@ public class SimpMessagingTemplateTests {
this.messagingTemplate.convertAndSendToUser("joe", "/queue/foo", "data");
List<Message<byte[]>> messages = this.messageChannel.getMessages();
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
Message<byte[]> message = messages.get(0);
SimpMessageHeaderAccessor headerAccessor =

44
spring-messaging/src/test/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryTests.java
View File

@@ -53,17 +53,17 @@ public class DefaultSubscriptionRegistryTests {
this.registry.registerSubscription(subscribeMessage(null, subsId, dest));
MultiValueMap<String, String> actual = this.registry.findSubscriptions(createMessage(dest));
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(0);
assertThat(actual).hasSize(0);
this.registry.registerSubscription(subscribeMessage(sessId, null, dest));
actual = this.registry.findSubscriptions(createMessage(dest));
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(0);
assertThat(actual).hasSize(0);
this.registry.registerSubscription(subscribeMessage(sessId, subsId, null));
actual = this.registry.findSubscriptions(createMessage(dest));
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(0);
assertThat(actual).hasSize(0);
}
@Test
@@ -92,7 +92,7 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> actual = this.registry.findSubscriptions(createMessage(dest));
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual).hasSize(1);
assertThat(sort(actual.get(sessId))).isEqualTo(subscriptionIds);
}
@@ -107,7 +107,7 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> actual = this.registry.findSubscriptions(createMessage(dest));
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual).hasSize(1);
assertThat(actual.get(sessId)).containsExactly(subId);
}
@@ -125,7 +125,7 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> actual = this.registry.findSubscriptions(createMessage(dest));
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(3);
assertThat(actual).hasSize(3);
assertThat(sort(actual.get(sessIds.get(0)))).isEqualTo(subscriptionIds);
assertThat(sort(actual.get(sessIds.get(1)))).isEqualTo(subscriptionIds);
assertThat(sort(actual.get(sessIds.get(2)))).isEqualTo(subscriptionIds);
@@ -162,7 +162,7 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> actual = this.registry.findSubscriptions(destNasdaqIbmMessage);
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual).hasSize(1);
assertThat(actual.get(sess1)).containsExactlyInAnyOrder(subs2, subs1);
this.registry.registerSubscription(subscribeMessage(sess2, subs1, destNasdaqIbm));
@@ -171,7 +171,7 @@ public class DefaultSubscriptionRegistryTests {
actual = this.registry.findSubscriptions(destNasdaqIbmMessage);
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(2);
assertThat(actual).hasSize(2);
assertThat(actual.get(sess1)).containsExactlyInAnyOrder(subs2, subs1);
assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1));
@@ -179,7 +179,7 @@ public class DefaultSubscriptionRegistryTests {
actual = this.registry.findSubscriptions(destNasdaqIbmMessage);
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual).hasSize(1);
assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1));
this.registry.registerSubscription(subscribeMessage(sess1, subs1, "/topic/PRICE.STOCK.*.IBM"));
@@ -187,7 +187,7 @@ public class DefaultSubscriptionRegistryTests {
actual = this.registry.findSubscriptions(destNasdaqIbmMessage);
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(2);
assertThat(actual).hasSize(2);
assertThat(actual.get(sess1)).containsExactlyInAnyOrder(subs1, subs2);
assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1));
@@ -195,7 +195,7 @@ public class DefaultSubscriptionRegistryTests {
actual = this.registry.findSubscriptions(destNasdaqIbmMessage);
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(2);
assertThat(actual).hasSize(2);
assertThat(actual.get(sess1)).isEqualTo(Collections.singletonList(subs1));
assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1));
@@ -203,14 +203,14 @@ public class DefaultSubscriptionRegistryTests {
actual = this.registry.findSubscriptions(destNasdaqIbmMessage);
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual).hasSize(1);
assertThat(actual.get(sess2)).isEqualTo(Collections.singletonList(subs1));
this.registry.unregisterSubscription(unsubscribeMessage(sess2, subs1));
actual = this.registry.findSubscriptions(destNasdaqIbmMessage);
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(0);
assertThat(actual).hasSize(0);
}
@Test // SPR-11755
@@ -289,14 +289,14 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> actual = this.registry.findSubscriptions(message);
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual).hasSize(1);
assertThat(actual.get(sessionId)).isEqualTo(Collections.singletonList(subscriptionId));
// Then without
actual = this.registry.findSubscriptions(createMessage(destination));
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(0);
assertThat(actual).hasSize(0);
}
@Test
@@ -316,7 +316,7 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> actual = this.registry.findSubscriptions(message);
assertThat(actual).isNotNull();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual).hasSize(1);
assertThat(actual.get(sessionId)).isEqualTo(Collections.singletonList(subscriptionId));
}
@@ -408,7 +408,7 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> subscriptions = this.registry.findSubscriptions(createMessage("/foo"));
assertThat(subscriptions).isNotNull();
assertThat(subscriptions.size()).isEqualTo(2);
assertThat(subscriptions).hasSize(2);
Iterator<Map.Entry<String, List<String>>> iterator = subscriptions.entrySet().iterator();
iterator.next();
@@ -426,7 +426,7 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> allSubscriptions = this.registry.findSubscriptions(createMessage("/foo"));
assertThat(allSubscriptions).isNotNull();
assertThat(allSubscriptions.size()).isEqualTo(1);
assertThat(allSubscriptions).hasSize(1);
Iterator<String> iteratorValues = allSubscriptions.get("sess1").iterator();
iteratorValues.next();
@@ -443,14 +443,14 @@ public class DefaultSubscriptionRegistryTests {
this.registry.registerSubscription(subscribeMessage("sess1", "1", "/foo"));
this.registry.registerSubscription(subscribeMessage("sess1", "2", "/bar"));
assertThat(this.registry.findSubscriptions(createMessage("/foo")).size()).isEqualTo(1);
assertThat(this.registry.findSubscriptions(createMessage("/bar")).size()).isEqualTo(1);
assertThat(this.registry.findSubscriptions(createMessage("/foo"))).hasSize(1);
assertThat(this.registry.findSubscriptions(createMessage("/bar"))).hasSize(1);
this.registry.registerSubscription(subscribeMessage("sess2", "1", "/foo"));
this.registry.registerSubscription(subscribeMessage("sess2", "2", "/bar"));
assertThat(this.registry.findSubscriptions(createMessage("/foo")).size()).isEqualTo(2);
assertThat(this.registry.findSubscriptions(createMessage("/bar")).size()).isEqualTo(2);
assertThat(this.registry.findSubscriptions(createMessage("/foo"))).hasSize(2);
assertThat(this.registry.findSubscriptions(createMessage("/bar"))).hasSize(2);
}
private Message<?> createMessage(String destination) {

6
spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java
View File

@@ -230,7 +230,7 @@ public class SimpleBrokerMessageHandlerTests {
verify(this.clientOutChannel, atLeast(2)).send(this.messageCaptor.capture());
List<Message<?>> messages = this.messageCaptor.getAllValues();
assertThat(messages.size()).isEqualTo(2);
assertThat(messages).hasSize(2);
MessageHeaders headers = messages.get(0).getHeaders();
assertThat(headers.get(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER)).isEqualTo(SimpMessageType.CONNECT_ACK);
@@ -261,7 +261,7 @@ public class SimpleBrokerMessageHandlerTests {
verify(this.clientOutChannel, times(2)).send(this.messageCaptor.capture());
List<Message<?>> messages = this.messageCaptor.getAllValues();
assertThat(messages.size()).isEqualTo(2);
assertThat(messages).hasSize(2);
MessageHeaders headers = messages.get(0).getHeaders();
assertThat(headers.get(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER)).isEqualTo(SimpMessageType.CONNECT_ACK);
@@ -292,7 +292,7 @@ public class SimpleBrokerMessageHandlerTests {
verify(this.clientOutChannel, times(1)).send(this.messageCaptor.capture());
List<Message<?>> messages = this.messageCaptor.getAllValues();
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
assertThat(messages.get(0).getHeaders().get(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER)).isEqualTo(SimpMessageType.CONNECT_ACK);
}

24
spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java
View File

@@ -97,7 +97,7 @@ public class MessageBrokerConfigurationTests {
TestChannel channel = context.getBean("clientInboundChannel", TestChannel.class);
Set<MessageHandler> handlers = channel.getSubscribers();
assertThat(handlers.size()).isEqualTo(3);
assertThat(handlers).hasSize(3);
assertThat(handlers.contains(context.getBean(SimpAnnotationMethodMessageHandler.class))).isTrue();
assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue();
assertThat(handlers.contains(context.getBean(SimpleBrokerMessageHandler.class))).isTrue();
@@ -110,7 +110,7 @@ public class MessageBrokerConfigurationTests {
TestChannel channel = context.getBean("clientInboundChannel", TestChannel.class);
Set<MessageHandler> handlers = channel.getSubscribers();
assertThat(handlers.size()).isEqualTo(3);
assertThat(handlers).hasSize(3);
assertThat(handlers.contains(context.getBean(SimpAnnotationMethodMessageHandler.class))).isTrue();
assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue();
assertThat(handlers.contains(context.getBean(StompBrokerRelayMessageHandler.class))).isTrue();
@@ -122,7 +122,7 @@ public class MessageBrokerConfigurationTests {
AbstractSubscribableChannel channel = context.getBean(
"clientInboundChannel", AbstractSubscribableChannel.class);
assertThat(channel.getInterceptors().size()).isEqualTo(3);
assertThat(channel.getInterceptors()).hasSize(3);
CustomThreadPoolTaskExecutor taskExecutor = context.getBean(
"clientInboundChannelExecutor", CustomThreadPoolTaskExecutor.class);
@@ -196,7 +196,7 @@ public class MessageBrokerConfigurationTests {
AbstractSubscribableChannel channel = context.getBean(
"clientOutboundChannel", AbstractSubscribableChannel.class);
assertThat(channel.getInterceptors().size()).isEqualTo(4);
assertThat(channel.getInterceptors()).hasSize(4);
ThreadPoolTaskExecutor taskExecutor = context.getBean(
"clientOutboundChannelExecutor", ThreadPoolTaskExecutor.class);
@@ -217,7 +217,7 @@ public class MessageBrokerConfigurationTests {
TestChannel channel = context.getBean("brokerChannel", TestChannel.class);
Set<MessageHandler> handlers = channel.getSubscribers();
assertThat(handlers.size()).isEqualTo(2);
assertThat(handlers).hasSize(2);
assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue();
assertThat(handlers.contains(context.getBean(SimpleBrokerMessageHandler.class))).isTrue();
@@ -231,7 +231,7 @@ public class MessageBrokerConfigurationTests {
TestChannel channel = context.getBean("brokerChannel", TestChannel.class);
Set<MessageHandler> handlers = channel.getSubscribers();
assertThat(handlers.size()).isEqualTo(2);
assertThat(handlers).hasSize(2);
assertThat(handlers.contains(context.getBean(UserDestinationMessageHandler.class))).isTrue();
assertThat(handlers.contains(context.getBean(StompBrokerRelayMessageHandler.class))).isTrue();
}
@@ -267,7 +267,7 @@ public class MessageBrokerConfigurationTests {
AbstractSubscribableChannel channel = context.getBean(
"brokerChannel", AbstractSubscribableChannel.class);
assertThat(channel.getInterceptors().size()).isEqualTo(4);
assertThat(channel.getInterceptors()).hasSize(4);
ThreadPoolTaskExecutor taskExecutor = context.getBean(
"brokerChannelExecutor", ThreadPoolTaskExecutor.class);
@@ -359,11 +359,11 @@ public class MessageBrokerConfigurationTests {
context.getBean(SimpAnnotationMethodMessageHandler.class);
List<HandlerMethodArgumentResolver> customResolvers = handler.getCustomArgumentResolvers();
assertThat(customResolvers.size()).isEqualTo(1);
assertThat(customResolvers).hasSize(1);
assertThat(handler.getArgumentResolvers().contains(customResolvers.get(0))).isTrue();
List<HandlerMethodReturnValueHandler> customHandlers = handler.getCustomReturnValueHandlers();
assertThat(customHandlers.size()).isEqualTo(1);
assertThat(customHandlers).hasSize(1);
assertThat(handler.getReturnValueHandlers().contains(customHandlers.get(0))).isTrue();
}
@@ -461,7 +461,7 @@ public class MessageBrokerConfigurationTests {
StompBrokerRelayMessageHandler relay = context.getBean(StompBrokerRelayMessageHandler.class);
assertThat(relay.getSystemSubscriptions()).isNotNull();
assertThat(relay.getSystemSubscriptions().size()).isEqualTo(2);
assertThat(relay.getSystemSubscriptions()).hasSize(2);
assertThat(relay.getSystemSubscriptions().get("/topic/unresolved-user-destination")).isSameAs(handler1);
assertThat(relay.getSystemSubscriptions().get("/topic/simp-user-registry")).isSameAs(handler2);
}
@@ -517,7 +517,7 @@ public class MessageBrokerConfigurationTests {
message = MessageBuilder.createMessage("123".getBytes(), headers.getMessageHeaders());
inChannel.send(message);
assertThat(outChannel.messages.size()).isEqualTo(2);
assertThat(outChannel.messages).hasSize(2);
Message<?> outputMessage = outChannel.messages.remove(1);
headers = StompHeaderAccessor.wrap(outputMessage);
@@ -534,7 +534,7 @@ public class MessageBrokerConfigurationTests {
accessor.setSessionId("sess1");
template.convertAndSendToUser("sess1", "queue.q1", "456".getBytes(), accessor.getMessageHeaders());
assertThat(outChannel.messages.size()).isEqualTo(1);
assertThat(outChannel.messages).hasSize(1);
outputMessage = outChannel.messages.remove(0);
headers = StompHeaderAccessor.wrap(outputMessage);

22
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java
View File

@@ -45,7 +45,7 @@ public class BufferingStompDecoderTests {
String chunk = "SEND\na:alpha\n\nMessage body\0";
List<Message<byte[]>> messages = stompDecoder.decode(toByteBuffer(chunk));
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
assertThat(new String(messages.get(0).getPayload())).isEqualTo("Message body");
assertThat(stompDecoder.getBufferSize()).isEqualTo(0);
@@ -62,7 +62,7 @@ public class BufferingStompDecoderTests {
assertThat(messages).isEqualTo(Collections.<Message<byte[]>>emptyList());
messages = stompDecoder.decode(toByteBuffer(chunk2));
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
assertThat(new String(messages.get(0).getPayload())).isEqualTo("Message body");
assertThat(stompDecoder.getBufferSize()).isEqualTo(0);
@@ -75,7 +75,7 @@ public class BufferingStompDecoderTests {
String chunk = "SEND\na:alpha\n\nPayload1\0" + "SEND\na:alpha\n\nPayload2\0";
List<Message<byte[]>> messages = stompDecoder.decode(toByteBuffer(chunk));
assertThat(messages.size()).isEqualTo(2);
assertThat(messages).hasSize(2);
assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload1");
assertThat(new String(messages.get(1).getPayload())).isEqualTo("Payload2");
@@ -90,7 +90,7 @@ public class BufferingStompDecoderTests {
String chunk1 = "SEND\na:alpha\n\nPayload1\0SEND\ncontent-length:" + contentLength + "\n";
List<Message<byte[]>> messages = stompDecoder.decode(toByteBuffer(chunk1));
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload1");
assertThat(stompDecoder.getBufferSize()).isEqualTo(23);
@@ -99,14 +99,14 @@ public class BufferingStompDecoderTests {
String chunk2 = "\nPayload2a";
messages = stompDecoder.decode(toByteBuffer(chunk2));
assertThat(messages.size()).isEqualTo(0);
assertThat(messages).hasSize(0);
assertThat(stompDecoder.getBufferSize()).isEqualTo(33);
assertThat((int) stompDecoder.getExpectedContentLength()).isEqualTo(contentLength);
String chunk3 = "-Payload2b\0";
messages = stompDecoder.decode(toByteBuffer(chunk3));
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload2a-Payload2b");
assertThat(stompDecoder.getBufferSize()).isEqualTo(0);
assertThat(stompDecoder.getExpectedContentLength()).isNull();
@@ -118,7 +118,7 @@ public class BufferingStompDecoderTests {
String chunk1 = "SEND\na:alpha\n\nPayload1\0SEND\na:alpha\n";
List<Message<byte[]>> messages = stompDecoder.decode(toByteBuffer(chunk1));
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload1");
assertThat(stompDecoder.getBufferSize()).isEqualTo(13);
@@ -127,14 +127,14 @@ public class BufferingStompDecoderTests {
String chunk2 = "\nPayload2a";
messages = stompDecoder.decode(toByteBuffer(chunk2));
assertThat(messages.size()).isEqualTo(0);
assertThat(messages).hasSize(0);
assertThat(stompDecoder.getBufferSize()).isEqualTo(23);
assertThat(stompDecoder.getExpectedContentLength()).isNull();
String chunk3 = "-Payload2b\0";
messages = stompDecoder.decode(toByteBuffer(chunk3));
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
assertThat(new String(messages.get(0).getPayload())).isEqualTo("Payload2a-Payload2b");
assertThat(stompDecoder.getBufferSize()).isEqualTo(0);
assertThat(stompDecoder.getExpectedContentLength()).isNull();
@@ -171,7 +171,7 @@ public class BufferingStompDecoderTests {
String chunk = "MESSAG";
List<Message<byte[]>> messages = stompDecoder.decode(toByteBuffer(chunk));
assertThat(messages.size()).isEqualTo(0);
assertThat(messages).hasSize(0);
}
// SPR-13416
@@ -182,7 +182,7 @@ public class BufferingStompDecoderTests {
String chunk = "SEND\na:long\\";
List<Message<byte[]>> messages = stompDecoder.decode(toByteBuffer(chunk));
assertThat(messages.size()).isEqualTo(0);
assertThat(messages).hasSize(0);
}
@Test

6
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java
View File

@@ -597,7 +597,7 @@ public class DefaultStompSessionTests {
assertThat(received.get()).isNotNull();
assertThat(received.get()).isTrue();
assertThat(receivedHeaders.get()).isNotNull();
assertThat(receivedHeaders.get().get("foo").size()).isEqualTo(1);
assertThat(receivedHeaders.get().get("foo")).hasSize(1);
assertThat(receivedHeaders.get().get("foo").get(0)).isEqualTo("bar");
}
@@ -628,7 +628,7 @@ public class DefaultStompSessionTests {
assertThat(received.get()).isNotNull();
assertThat(received.get()).isTrue();
assertThat(receivedHeaders.get()).isNotNull();
assertThat(receivedHeaders.get().get("foo").size()).isEqualTo(1);
assertThat(receivedHeaders.get().get("foo")).hasSize(1);
assertThat(receivedHeaders.get().get("foo").get(0)).isEqualTo("bar");
}
@@ -688,7 +688,7 @@ public class DefaultStompSessionTests {
StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
headers = StompHeaders.readOnlyStompHeaders(accessor.getNativeHeaders());
assertThat(headers.size()).as(headers.toString()).isEqualTo(1);
assertThat(headers.get("foo").size()).isEqualTo(1);
assertThat(headers.get("foo")).hasSize(1);
assertThat(headers.get("foo").get(0)).isEqualTo("bar");
assertThat(this.session.isConnected()).isFalse();

16
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java
View File

@@ -92,7 +92,7 @@ class StompBrokerRelayMessageHandlerTests {
this.brokerRelay.start();
this.brokerRelay.handleMessage(connectMessage("sess1", "joe"));
assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2);
assertThat(this.tcpClient.getSentMessages()).hasSize(2);
StompHeaderAccessor headers1 = this.tcpClient.getSentHeaders(0);
assertThat(headers1.getCommand()).isEqualTo(StompCommand.CONNECT);
@@ -116,7 +116,7 @@ class StompBrokerRelayMessageHandlerTests {
this.brokerRelay.start();
this.brokerRelay.handleMessage(connectMessage("sess1", "joe"));
assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2);
assertThat(this.tcpClient.getSentMessages()).hasSize(2);
StompHeaderAccessor headers1 = this.tcpClient.getSentHeaders(0);
assertThat(headers1.getCommand()).isEqualTo(StompCommand.CONNECT);
@@ -143,7 +143,7 @@ class StompBrokerRelayMessageHandlerTests {
accessor.setDestination("/user/daisy/foo");
this.brokerRelay.handleMessage(MessageBuilder.createMessage(new byte[0], accessor.getMessageHeaders()));
assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2);
assertThat(this.tcpClient.getSentMessages()).hasSize(2);
StompHeaderAccessor headers = this.tcpClient.getSentHeaders(0);
assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT);
assertThat(headers.getSessionId()).isEqualTo(StompBrokerRelayMessageHandler.SYSTEM_SESSION_ID);
@@ -174,7 +174,7 @@ class StompBrokerRelayMessageHandlerTests {
accessor.setDestination("/user/daisy/foo");
this.brokerRelay.handleMessage(MessageBuilder.createMessage(new byte[0], accessor.getMessageHeaders()));
assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(3);
assertThat(this.tcpClient.getSentMessages()).hasSize(3);
assertThat(this.tcpClient.getSentHeaders(2).getMessageType()).isEqualTo(SimpMessageType.HEARTBEAT);
}
@@ -184,7 +184,7 @@ class StompBrokerRelayMessageHandlerTests {
this.brokerRelay.start();
this.brokerRelay.handleMessage(connectMessage("sess1", "joe"));
assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2);
assertThat(this.tcpClient.getSentMessages()).hasSize(2);
assertThat(this.tcpClient.getSentHeaders(0).getCommand()).isEqualTo(StompCommand.CONNECT);
assertThat(this.tcpClient.getSentHeaders(1).getCommand()).isEqualTo(StompCommand.CONNECT);
@@ -247,7 +247,7 @@ class StompBrokerRelayMessageHandlerTests {
MessageHeaders headers = accessor.getMessageHeaders();
this.tcpClient.handleMessage(MessageBuilder.createMessage(new byte[0], headers));
assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2);
assertThat(this.tcpClient.getSentMessages()).hasSize(2);
assertThat(this.tcpClient.getSentHeaders(0).getCommand()).isEqualTo(StompCommand.CONNECT);
assertThat(this.tcpClient.getSentHeaders(1).getCommand()).isEqualTo(StompCommand.SUBSCRIBE);
assertThat(this.tcpClient.getSentHeaders(1).getDestination()).isEqualTo("/topic/foo");
@@ -268,7 +268,7 @@ class StompBrokerRelayMessageHandlerTests {
Message<byte[]> connect = connectMessage("sess1", "joe");
this.brokerRelay.handleMessage(connect);
assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2);
assertThat(this.tcpClient.getSentMessages()).hasSize(2);
StompHeaderAccessor headers1 = this.tcpClient.getSentHeaders(0);
assertThat(headers1.getCommand()).isEqualTo(StompCommand.CONNECT);
@@ -280,7 +280,7 @@ class StompBrokerRelayMessageHandlerTests {
this.brokerRelay.handleMessage(connect);
assertThat(this.tcpClient.getSentMessages().size()).isEqualTo(2);
assertThat(this.tcpClient.getSentMessages()).hasSize(2);
assertThat(this.outboundChannel.getMessages()).isEmpty();
}

26
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompDecoderTests.java
View File

@@ -45,7 +45,7 @@ public class StompDecoderTests {
StompHeaderAccessor headers = StompHeaderAccessor.wrap(frame);
assertThat(headers.getCommand()).isEqualTo(StompCommand.DISCONNECT);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(0);
assertThat(headers.toNativeHeaderMap()).hasSize(0);
assertThat(frame.getPayload().length).isEqualTo(0);
}
@@ -55,7 +55,7 @@ public class StompDecoderTests {
StompHeaderAccessor headers = StompHeaderAccessor.wrap(frame);
assertThat(headers.getCommand()).isEqualTo(StompCommand.DISCONNECT);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(0);
assertThat(headers.toNativeHeaderMap()).hasSize(0);
assertThat(frame.getPayload().length).isEqualTo(0);
}
@@ -69,7 +69,7 @@ public class StompDecoderTests {
assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(2);
assertThat(headers.toNativeHeaderMap()).hasSize(2);
assertThat(headers.getFirstNativeHeader("accept-version")).isEqualTo("1.1");
assertThat(headers.getHost()).isEqualTo("github.org");
@@ -97,7 +97,7 @@ public class StompDecoderTests {
assertThat(headers.getCommand()).isEqualTo(StompCommand.SEND);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1);
assertThat(headers.toNativeHeaderMap()).hasSize(1);
assertThat(headers.getContentLength()).isEqualTo(Integer.valueOf(23));
String bodyText = new String(message.getPayload());
@@ -113,7 +113,7 @@ public class StompDecoderTests {
assertThat(headers.getCommand()).isEqualTo(StompCommand.SEND);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1);
assertThat(headers.toNativeHeaderMap()).hasSize(1);
assertThat(headers.getContentLength()).isEqualTo(Integer.valueOf(-1));
String bodyText = new String(message.getPayload());
@@ -127,7 +127,7 @@ public class StompDecoderTests {
assertThat(headers.getCommand()).isEqualTo(StompCommand.SEND);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1);
assertThat(headers.toNativeHeaderMap()).hasSize(1);
assertThat(headers.getContentLength()).isEqualTo(Integer.valueOf(0));
String bodyText = new String(frame.getPayload());
@@ -141,7 +141,7 @@ public class StompDecoderTests {
assertThat(headers.getCommand()).isEqualTo(StompCommand.SEND);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1);
assertThat(headers.toNativeHeaderMap()).hasSize(1);
assertThat(headers.getContentLength()).isEqualTo(Integer.valueOf(23));
String bodyText = new String(frame.getPayload());
@@ -155,7 +155,7 @@ public class StompDecoderTests {
assertThat(headers.getCommand()).isEqualTo(StompCommand.DISCONNECT);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(1);
assertThat(headers.toNativeHeaderMap()).hasSize(1);
assertThat(headers.getFirstNativeHeader("a:\r\n\\b")).isEqualTo("alpha:bravo\r\n\\");
}
@@ -169,7 +169,7 @@ public class StompDecoderTests {
assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(2);
assertThat(headers.toNativeHeaderMap()).hasSize(2);
assertThat(headers.getFirstNativeHeader("accept-version")).isEqualTo("1.1");
assertThat(headers.getFirstNativeHeader("key")).isEqualTo("\\value");
@@ -189,7 +189,7 @@ public class StompDecoderTests {
final List<Message<byte[]>> messages = decoder.decode(buffer);
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
assertThat(StompHeaderAccessor.wrap(messages.get(0)).getCommand()).isEqualTo(StompCommand.SEND);
}
@@ -201,7 +201,7 @@ public class StompDecoderTests {
final List<Message<byte[]>> messages = decoder.decode(buffer);
assertThat(messages.size()).isEqualTo(2);
assertThat(messages).hasSize(2);
assertThat(StompHeaderAccessor.wrap(messages.get(0)).getCommand()).isEqualTo(StompCommand.SEND);
assertThat(StompHeaderAccessor.wrap(messages.get(1)).getCommand()).isEqualTo(StompCommand.DISCONNECT);
}
@@ -216,7 +216,7 @@ public class StompDecoderTests {
assertThat(headers.getCommand()).isEqualTo(StompCommand.CONNECT);
assertThat(headers.toNativeHeaderMap().size()).isEqualTo(2);
assertThat(headers.toNativeHeaderMap()).hasSize(2);
assertThat(headers.getFirstNativeHeader("accept-version")).isEqualTo("1.1");
assertThat(headers.getFirstNativeHeader("key")).isEqualTo("");
@@ -272,7 +272,7 @@ public class StompDecoderTests {
final List<Message<byte[]>> messages = decoder.decode(buffer);
assertThat(messages.size()).isEqualTo(1);
assertThat(messages).hasSize(1);
assertThat(StompHeaderAccessor.wrap(messages.get(0)).getMessageType()).isEqualTo(SimpMessageType.HEARTBEAT);
}

6
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompHeaderAccessorTests.java
View File

@@ -123,7 +123,7 @@ public class StompHeaderAccessorTests {
Map<String, List<String>> actual = headers.toNativeHeaderMap();
assertThat(actual.size()).isEqualTo(2);
assertThat(actual).hasSize(2);
assertThat(actual.get(StompHeaderAccessor.STOMP_ID_HEADER).get(0)).isEqualTo("s1");
assertThat(actual.get(StompHeaderAccessor.STOMP_DESTINATION_HEADER).get(0)).isEqualTo("/d");
}
@@ -135,7 +135,7 @@ public class StompHeaderAccessorTests {
Map<String, List<String>> actual = headers.toNativeHeaderMap();
assertThat(actual.size()).isEqualTo(1);
assertThat(actual).hasSize(1);
assertThat(actual.get(StompHeaderAccessor.STOMP_ID_HEADER).get(0)).isEqualTo("s1");
}
@@ -193,7 +193,7 @@ public class StompHeaderAccessorTests {
headers.setNativeHeader("accountId", accountId.toLowerCase());
Map<String, List<String>> actual = headers.toNativeHeaderMap();
assertThat(actual.size()).isEqualTo(3);
assertThat(actual).hasSize(3);
assertThat(actual.get(StompHeaderAccessor.STOMP_ID_HEADER).get(0)).isEqualTo("s1");
assertThat(actual.get(StompHeaderAccessor.STOMP_DESTINATION_HEADER).get(0)).isEqualTo("/d");

20
spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java
View File

@@ -66,7 +66,7 @@ public class DefaultUserDestinationResolverTests {
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user123");
assertThat(actual.getSubscribeDestination()).isEqualTo(sourceDestination);
assertThat(actual.getUser()).isEqualTo(user.getName());
@@ -81,7 +81,7 @@ public class DefaultUserDestinationResolverTests {
Message<?> message = createMessage(SimpMessageType.SUBSCRIBE, user, "123", destination);
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("jms.queue.call-user123");
assertThat(actual.getSubscribeDestination()).isEqualTo(destination);
}
@@ -97,7 +97,7 @@ public class DefaultUserDestinationResolverTests {
Message<?> message = createMessage(SimpMessageType.SUBSCRIBE, user, "456", "/user/queue/foo");
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user456");
}
@@ -108,7 +108,7 @@ public class DefaultUserDestinationResolverTests {
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo(("/queue/foo-user" + "123"));
assertThat(actual.getSubscribeDestination()).isEqualTo(sourceDestination);
assertThat(actual.getUser()).isNull();
@@ -129,7 +129,7 @@ public class DefaultUserDestinationResolverTests {
Message<?> message = createMessage(SimpMessageType.UNSUBSCRIBE, user, "123", "/user/queue/foo");
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user123");
}
@@ -141,7 +141,7 @@ public class DefaultUserDestinationResolverTests {
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user123");
assertThat(actual.getSubscribeDestination()).isEqualTo("/user/queue/foo");
assertThat(actual.getUser()).isEqualTo(user.getName());
@@ -156,7 +156,7 @@ public class DefaultUserDestinationResolverTests {
Message<?> message = createMessage(SimpMessageType.MESSAGE, user, "123", destination);
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("jms.queue.call-user123");
assertThat(actual.getSubscribeDestination()).isEqualTo("/user/jms.queue.call");
}
@@ -176,7 +176,7 @@ public class DefaultUserDestinationResolverTests {
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user456");
assertThat(actual.getSubscribeDestination()).isEqualTo("/user/queue/foo");
assertThat(actual.getUser()).isEqualTo(otherUser.getName());
@@ -195,7 +195,7 @@ public class DefaultUserDestinationResolverTests {
Message<?> message = createMessage(SimpMessageType.MESSAGE, new TestPrincipal("joe"), null, destination);
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-useropenid123");
}
@@ -206,7 +206,7 @@ public class DefaultUserDestinationResolverTests {
UserDestinationResult actual = this.resolver.resolveDestination(message);
assertThat(actual.getSourceDestination()).isEqualTo(sourceDestination);
assertThat(actual.getTargetDestinations().size()).isEqualTo(1);
assertThat(actual.getTargetDestinations()).hasSize(1);
assertThat(actual.getTargetDestinations().iterator().next()).isEqualTo("/queue/foo-user123");
assertThat(actual.getSubscribeDestination()).isEqualTo("/user/queue/foo");
assertThat(actual.getUser()).isNull();

10
spring-messaging/src/test/java/org/springframework/messaging/simp/user/MultiServerUserRegistryTests.java
View File

@@ -78,12 +78,12 @@ class MultiServerUserRegistryTests {
SimpUser user = this.registry.getUser("joe");
assertThat(user).isNotNull();
assertThat(user.hasSessions()).isTrue();
assertThat(user.getSessions().size()).isEqualTo(1);
assertThat(user.getSessions()).hasSize(1);
SimpSession session = user.getSession("remote-sess");
assertThat(session).isNotNull();
assertThat(session.getId()).isEqualTo("remote-sess");
assertThat(session.getUser()).isSameAs(user);
assertThat(session.getSubscriptions().size()).isEqualTo(1);
assertThat(session.getSubscriptions()).hasSize(1);
SimpSubscription subscription = session.getSubscriptions().iterator().next();
assertThat(subscription.getId()).isEqualTo("remote-sub");
assertThat(subscription.getSession()).isSameAs(session);
@@ -115,7 +115,7 @@ class MultiServerUserRegistryTests {
assertThat(this.registry.getUserCount()).isEqualTo(3);
Set<SimpSubscription> matches = this.registry.findSubscriptions(s -> s.getDestination().equals("/match"));
assertThat(matches.size()).isEqualTo(2);
assertThat(matches).hasSize(2);
Iterator<SimpSubscription> iterator = matches.iterator();
Set<String> sessionIds = new HashSet<>(2);
sessionIds.add(iterator.next().getSession().getId());
@@ -147,13 +147,13 @@ class MultiServerUserRegistryTests {
assertThat(this.registry.getUserCount()).isEqualTo(1);
SimpUser user = this.registry.getUsers().iterator().next();
assertThat(user.hasSessions()).isTrue();
assertThat(user.getSessions().size()).isEqualTo(2);
assertThat(user.getSessions()).hasSize(2);
assertThat(user.getSessions()).containsExactlyInAnyOrder(localSession, remoteSession);
assertThat(user.getSession("sess123")).isSameAs(localSession);
assertThat(user.getSession("sess456")).isEqualTo(remoteSession);
user = this.registry.getUser("joe");
assertThat(user.getSessions().size()).isEqualTo(2);
assertThat(user.getSessions()).hasSize(2);
assertThat(user.getSessions()).containsExactlyInAnyOrder(localSession, remoteSession);
assertThat(user.getSession("sess123")).isSameAs(localSession);
assertThat(user.getSession("sess456")).isEqualTo(remoteSession);

4
spring-messaging/src/test/java/org/springframework/messaging/support/ChannelInterceptorTests.java
View File

@@ -60,7 +60,7 @@ public class ChannelInterceptorTests {
this.channel.addInterceptor(interceptor);
this.channel.send(MessageBuilder.withPayload("test").build());
assertThat(this.messageHandler.getMessages().size()).isEqualTo(1);
assertThat(this.messageHandler.getMessages()).hasSize(1);
Message<?> result = this.messageHandler.getMessages().get(0);
assertThat(result).isNotNull();
@@ -79,7 +79,7 @@ public class ChannelInterceptorTests {
assertThat(interceptor1.getCounter().get()).isEqualTo(1);
assertThat(interceptor2.getCounter().get()).isEqualTo(1);
assertThat(this.messageHandler.getMessages().size()).isEqualTo(0);
assertThat(this.messageHandler.getMessages()).hasSize(0);
assertThat(interceptor1.wasAfterCompletionInvoked()).isTrue();
assertThat(interceptor2.wasAfterCompletionInvoked()).isFalse();
}

20
spring-messaging/src/test/java/org/springframework/messaging/support/MessageHeaderAccessorTests.java
View File

@@ -44,7 +44,7 @@ public class MessageHeaderAccessorTests {
@Test
public void newEmptyHeaders() {
MessageHeaderAccessor accessor = new MessageHeaderAccessor();
assertThat(accessor.toMap().size()).isEqualTo(0);
assertThat(accessor.toMap()).hasSize(0);
}
@Test
@@ -57,7 +57,7 @@ public class MessageHeaderAccessorTests {
MessageHeaderAccessor accessor = new MessageHeaderAccessor(message);
MessageHeaders actual = accessor.getMessageHeaders();
assertThat(actual.size()).isEqualTo(3);
assertThat(actual).hasSize(3);
assertThat(actual.get("foo")).isEqualTo("bar");
assertThat(actual.get("bar")).isEqualTo("baz");
}
@@ -75,7 +75,7 @@ public class MessageHeaderAccessorTests {
accessor.setHeader("foo", "BAR");
MessageHeaders actual = accessor.getMessageHeaders();
assertThat(actual.size()).isEqualTo(3);
assertThat(actual).hasSize(3);
assertThat(actual.getId()).isNotEqualTo(message.getHeaders().getId());
assertThat(actual.get("foo")).isEqualTo("BAR");
assertThat(actual.get("bar")).isEqualTo("baz");
@@ -110,7 +110,7 @@ public class MessageHeaderAccessorTests {
accessor.removeHeaders("fo*");
MessageHeaders actual = accessor.getMessageHeaders();
assertThat(actual.size()).isEqualTo(2);
assertThat(actual).hasSize(2);
assertThat(actual.get("foo")).isNull();
assertThat(actual.get("bar")).isEqualTo("baz");
}
@@ -128,7 +128,7 @@ public class MessageHeaderAccessorTests {
accessor.copyHeaders(map2);
MessageHeaders actual = accessor.getMessageHeaders();
assertThat(actual.size()).isEqualTo(3);
assertThat(actual).hasSize(3);
assertThat(actual.get("foo")).isEqualTo("BAR");
assertThat(actual.get("bar")).isEqualTo("baz");
}
@@ -146,7 +146,7 @@ public class MessageHeaderAccessorTests {
accessor.copyHeadersIfAbsent(map2);
MessageHeaders actual = accessor.getMessageHeaders();
assertThat(actual.size()).isEqualTo(3);
assertThat(actual).hasSize(3);
assertThat(actual.get("foo")).isEqualTo("bar");
assertThat(actual.get("bar")).isEqualTo("baz");
}
@@ -157,7 +157,7 @@ public class MessageHeaderAccessorTests {
headers.copyHeaders(null);
headers.copyHeadersIfAbsent(null);
assertThat(headers.getMessageHeaders().size()).isEqualTo(1);
assertThat(headers.getMessageHeaders()).hasSize(1);
assertThat(headers.getMessageHeaders().keySet()).isEqualTo(Collections.singleton("id"));
}
@@ -174,9 +174,9 @@ public class MessageHeaderAccessorTests {
accessor.setHeader("foo", "bar3");
Map<String, Object> map3 = accessor.toMap();
assertThat(map1.size()).isEqualTo(1);
assertThat(map2.size()).isEqualTo(1);
assertThat(map3.size()).isEqualTo(1);
assertThat(map1).hasSize(1);
assertThat(map2).hasSize(1);
assertThat(map3).hasSize(1);
assertThat(map1.get("foo")).isEqualTo("bar1");
assertThat(map2.get("foo")).isEqualTo("bar2");

6
spring-messaging/src/test/java/org/springframework/messaging/support/NativeMessageHeaderAccessorTests.java
View File

@@ -67,7 +67,7 @@ public class NativeMessageHeaderAccessorTests {
NativeMessageHeaderAccessor headerAccessor = new NativeMessageHeaderAccessor(message);
Map<String, Object> actual = headerAccessor.toMap();
assertThat(actual.size()).isEqualTo(2);
assertThat(actual).hasSize(2);
assertThat(actual.get("a")).isEqualTo("b");
assertThat(actual.get(NativeMessageHeaderAccessor.NATIVE_HEADERS)).isNotNull();
assertThat(actual.get(NativeMessageHeaderAccessor.NATIVE_HEADERS)).isEqualTo(inputNativeHeaders);
@@ -79,7 +79,7 @@ public class NativeMessageHeaderAccessorTests {
NativeMessageHeaderAccessor headerAccessor = new NativeMessageHeaderAccessor((Message<?>) null);
Map<String, Object> actual = headerAccessor.toMap();
assertThat(actual.size()).isEqualTo(0);
assertThat(actual).hasSize(0);
Map<String, List<String>> actualNativeHeaders = headerAccessor.toNativeHeaderMap();
assertThat(actualNativeHeaders).isEqualTo(Collections.emptyMap());
@@ -104,7 +104,7 @@ public class NativeMessageHeaderAccessorTests {
Map<String, Object> actual = headerAccessor.toMap();
assertThat(actual.size()).isEqualTo(2);
assertThat(actual).hasSize(2);
assertThat(actual.get("a")).isEqualTo("B");
@SuppressWarnings("unchecked")