Fix StompIntegrationTests as is in the master

https://build.spring.io/browse/INT-AT42SIO-247/
This commit is contained in:
Artem Bilan
2016-08-17 10:28:35 -04:00
parent c637f841e1
commit ec778ac844

View File

@@ -31,7 +31,6 @@ import java.util.Collections;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -57,7 +56,6 @@ import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer;
import org.springframework.integration.test.support.LogAdjustingTestSupport;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.integration.transformer.ExpressionEvaluatingTransformer;
import org.springframework.integration.websocket.ClientWebSocketContainer;
import org.springframework.integration.websocket.IntegrationWebSocketContainer;
@@ -108,7 +106,7 @@ import org.springframework.web.socket.sockjs.client.WebSocketTransport;
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class StompIntegrationTests extends LogAdjustingTestSupport {
@Value("#{server.serverContext}")
@@ -133,12 +131,6 @@ public class StompIntegrationTests extends LogAdjustingTestSupport {
super("org.springframework", "org.springframework.integration", "org.apache.catalina");
}
@Before
public void setup() {
this.webSocketInputChannel.clear();
this.webSocketEvents.clear();
}
@Test
public void sendMessageToController() throws Exception {
@@ -331,7 +323,6 @@ public class StompIntegrationTests extends LogAdjustingTestSupport {
StompHeaderAccessor stompHeaderAccessor = StompHeaderAccessor.create(StompCommand.MESSAGE);
stompHeaderAccessor.setDestination(destination);
Message<byte[]> message = MessageBuilder.createMessage(new byte[0], stompHeaderAccessor.toMessageHeaders());
Object sessions = TestUtils.getPropertyValue(subscriptionRegistry, "subscriptionRegistry.sessions");
MultiValueMap<String, String> subscriptions = subscriptionRegistry.findSubscriptions(message);
return !subscriptions.isEmpty();
}