Fix minor test issues

Issue: SPR-12615

Author: rstoyanchev

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

@@ -266,7 +266,7 @@ public void unregisterSubscription() {
 
 		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(2))));
 	}
@@ -310,7 +310,7 @@ public void unregisterAllSubscriptions() {
 
 		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))));
 	}
 

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

@@ -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");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.messaging.simp.broker;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -84,12 +85,12 @@ public void subcribePublish() {
 		this.messageHandler.handleMessage(createMessage("/bar", "message2"));
 
 		verify(this.clientOutboundChannel, times(6)).send(this.messageCaptor.capture());
-		assertCapturedMessage("sess1", "sub1", "/foo");
-		assertCapturedMessage("sess1", "sub2", "/foo");
-		assertCapturedMessage("sess2", "sub1", "/foo");
-		assertCapturedMessage("sess2", "sub2", "/foo");
-		assertCapturedMessage("sess1", "sub3", "/bar");
-		assertCapturedMessage("sess2", "sub3", "/bar");
+		assertTrue(messageCaptured("sess1", "sub1", "/foo"));
+		assertTrue(messageCaptured("sess1", "sub2", "/foo"));
+		assertTrue(messageCaptured("sess2", "sub1", "/foo"));
+		assertTrue(messageCaptured("sess2", "sub2", "/foo"));
+		assertTrue(messageCaptured("sess1", "sub3", "/bar"));
+		assertTrue(messageCaptured("sess2", "sub3", "/bar"));
 	}
 
 	@Test
@@ -124,9 +125,9 @@ public void subcribeDisconnectPublish() {
 		assertEquals(sess1, SimpMessageHeaderAccessor.getSessionId(captured.getHeaders()));
 		assertEquals("joe", SimpMessageHeaderAccessor.getUser(captured.getHeaders()).getName());
 
-		assertCapturedMessage(sess2, "sub1", "/foo");
-		assertCapturedMessage(sess2, "sub2", "/foo");
-		assertCapturedMessage(sess2, "sub3", "/bar");
+		assertTrue(messageCaptured(sess2, "sub1", "/foo"));
+		assertTrue(messageCaptured(sess2, "sub2", "/foo"));
+		assertTrue(messageCaptured(sess2, "sub3", "/bar"));
 	}
 
 	@Test
@@ -149,28 +150,28 @@ public void connect() {
 	}
 
 
-	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);
 		headers.setSubscriptionId(subcriptionId);
 		headers.setDestination(destination);
 		headers.setSessionId(sessionId);
 		return MessageBuilder.createMessage("", headers.getMessageHeaders());
 	}
 
-	protected Message<String> createConnectMessage(String sessionId) {
+	private Message<String> createConnectMessage(String sessionId) {
 		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
 		headers.setSessionId(sessionId);
 		headers.setUser(new TestPrincipal("joe"));
 		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);
 		headers.setDestination(destination);
 		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()) {
 			SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.wrap(message);
 			if (sessionId.equals(headers.getSessionId())) {