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

Fix minor test issues

Browse Source 
Issue: SPR-12615
This commit is contained in:
Rossen Stoyanchev
2015-01-20 17:14:20 -05:00
parent bb78c76b8c
commit 497944f0dd
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,7 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> actual = this.registry.findSubscriptions(message(dest)); MultiValueMap<String, String> actual = this.registry.findSubscriptions(message(dest));
assertEquals("Expected three elements " + actual, 2, actual.size()); assertEquals("Expected two elements: " + actual, 2, actual.size());
assertEquals(subscriptionIds, sort(actual.get(sessIds.get(1)))); assertEquals(subscriptionIds, sort(actual.get(sessIds.get(1))));
assertEquals(subscriptionIds, sort(actual.get(sessIds.get(2)))); assertEquals(subscriptionIds, sort(actual.get(sessIds.get(2))));
} }
@@ -310,7 +310,7 @@ public class DefaultSubscriptionRegistryTests {
MultiValueMap<String, String> actual = this.registry.findSubscriptions(message(dest)); MultiValueMap<String, String> actual = this.registry.findSubscriptions(message(dest));
assertEquals("Expected three elements " + actual, 1, actual.size()); assertEquals("Expected one element: " + actual, 1, actual.size());
assertEquals(subscriptionIds, sort(actual.get(sessIds.get(2)))); assertEquals(subscriptionIds, sort(actual.get(sessIds.get(2))));
} }

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.springframework.messaging.simp.broker; package org.springframework.messaging.simp.broker;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -84,12 +85,12 @@ public class SimpleBrokerMessageHandlerTests {
this.messageHandler.handleMessage(createMessage("/bar", "message2")); this.messageHandler.handleMessage(createMessage("/bar", "message2"));
verify(this.clientOutboundChannel, times(6)).send(this.messageCaptor.capture()); verify(this.clientOutboundChannel, times(6)).send(this.messageCaptor.capture());
assertCapturedMessage("sess1", "sub1", "/foo"); assertTrue(messageCaptured("sess1", "sub1", "/foo"));
assertCapturedMessage("sess1", "sub2", "/foo"); assertTrue(messageCaptured("sess1", "sub2", "/foo"));
assertCapturedMessage("sess2", "sub1", "/foo"); assertTrue(messageCaptured("sess2", "sub1", "/foo"));
assertCapturedMessage("sess2", "sub2", "/foo"); assertTrue(messageCaptured("sess2", "sub2", "/foo"));
assertCapturedMessage("sess1", "sub3", "/bar"); assertTrue(messageCaptured("sess1", "sub3", "/bar"));
assertCapturedMessage("sess2", "sub3", "/bar"); assertTrue(messageCaptured("sess2", "sub3", "/bar"));
} }
@Test @Test
@@ -124,9 +125,9 @@ public class SimpleBrokerMessageHandlerTests {
assertEquals(sess1, SimpMessageHeaderAccessor.getSessionId(captured.getHeaders())); assertEquals(sess1, SimpMessageHeaderAccessor.getSessionId(captured.getHeaders()));
assertEquals("joe", SimpMessageHeaderAccessor.getUser(captured.getHeaders()).getName()); assertEquals("joe", SimpMessageHeaderAccessor.getUser(captured.getHeaders()).getName());
assertCapturedMessage(sess2, "sub1", "/foo"); assertTrue(messageCaptured(sess2, "sub1", "/foo"));
assertCapturedMessage(sess2, "sub2", "/foo"); assertTrue(messageCaptured(sess2, "sub2", "/foo"));
assertCapturedMessage(sess2, "sub3", "/bar"); assertTrue(messageCaptured(sess2, "sub3", "/bar"));
} }
@Test @Test
@@ -149,7 +150,7 @@ public class SimpleBrokerMessageHandlerTests {
} }
protected Message<String> createSubscriptionMessage(String sessionId, String subcriptionId, String destination) { private Message<String> createSubscriptionMessage(String sessionId, String subcriptionId, String destination) {
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.SUBSCRIBE); SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.SUBSCRIBE);
headers.setSubscriptionId(subcriptionId); headers.setSubscriptionId(subcriptionId);
headers.setDestination(destination); headers.setDestination(destination);
@@ -157,20 +158,20 @@ public class SimpleBrokerMessageHandlerTests {
return MessageBuilder.createMessage("", headers.getMessageHeaders()); return MessageBuilder.createMessage("", headers.getMessageHeaders());
} }
protected Message<String> createConnectMessage(String sessionId) { private Message<String> createConnectMessage(String sessionId) {
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT); SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
headers.setSessionId(sessionId); headers.setSessionId(sessionId);
headers.setUser(new TestPrincipal("joe")); headers.setUser(new TestPrincipal("joe"));
return MessageBuilder.createMessage("", headers.getMessageHeaders()); return MessageBuilder.createMessage("", headers.getMessageHeaders());
} }
protected Message<String> createMessage(String destination, String payload) { private Message<String> createMessage(String destination, String payload) {
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.MESSAGE); SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.MESSAGE);
headers.setDestination(destination); headers.setDestination(destination);
return MessageBuilder.createMessage("", headers.getMessageHeaders()); return MessageBuilder.createMessage("", headers.getMessageHeaders());
} }
protected boolean assertCapturedMessage(String sessionId, String subcriptionId, String destination) { private boolean messageCaptured(String sessionId, String subcriptionId, String destination) {
for (Message<?> message : this.messageCaptor.getAllValues()) { for (Message<?> message : this.messageCaptor.getAllValues()) {
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.wrap(message); SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.wrap(message);
if (sessionId.equals(headers.getSessionId())) { if (sessionId.equals(headers.getSessionId())) {