From 38ef6dec50b124a8cb39a024a7fa2d29442cbe33 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 29 Oct 2014 17:20:22 -0400 Subject: [PATCH] Fix test issue with Set iteration order --- ...SocketMessageBrokerConfigurationSupportTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java index 74fd23c02c..e59704e859 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java @@ -22,7 +22,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -117,21 +116,21 @@ public class WebSocketMessageBrokerConfigurationSupportTests { assertEquals(ImmutableMessageChannelInterceptor.class, interceptors.get(interceptors.size()-1).getClass()); assertEquals(1, handlers.size()); - assertTrue(handlers.iterator().next() instanceof SubProtocolWebSocketHandler); + assertTrue(handlers.contains(config.getBean(SubProtocolWebSocketHandler.class))); } @Test public void brokerChannel() { ApplicationContext config = createConfig(TestChannelConfig.class, TestConfigurer.class); TestChannel channel = config.getBean("brokerChannel", TestChannel.class); - Iterator handlers = channel.getSubscribers().iterator(); + Set handlers = channel.getSubscribers(); List interceptors = channel.getInterceptors(); assertEquals(ImmutableMessageChannelInterceptor.class, interceptors.get(interceptors.size()-1).getClass()); - assertEquals(SimpleBrokerMessageHandler.class, handlers.next().getClass()); - assertEquals(UserDestinationMessageHandler.class, handlers.next().getClass()); - assertFalse(handlers.hasNext()); + assertEquals(2, handlers.size()); + assertTrue(handlers.contains(config.getBean(SimpleBrokerMessageHandler.class))); + assertTrue(handlers.contains(config.getBean(UserDestinationMessageHandler.class))); } @Test @@ -212,6 +211,7 @@ public class WebSocketMessageBrokerConfigurationSupportTests { @MessageMapping("/foo") @SendTo("/bar") + @SuppressWarnings("unused") public String handleMessage() { return "bar"; }