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

Upgrades to the latest dependencies and fixes

Browse Source 
* Spring AMQP 2.1 B-S and fix imports for moved classes
* Reactor GA
* SF-5.1 B-S and exclude `org.springframework` from all the
Spring Security dependencies
* the latest Hibernate and JPA and fix the test query for the
appropriate actual syntax
* latest SSHD and add required dependency for `sshd-sftp`
* latest Groovy and extra dependency for the `groovy-dateutil`
* latest Smack for XMPP and appropriate code fixes for compatibility
* Fix `StompIntegrationTests` to use `AFTER_EACH_TEST_METHOD`:
when session is disconnected on the server, we can't interact with it
anymore
This commit is contained in:
Artem Bilan
2018-09-20 14:16:39 -04:00
committed by Gary Russell
parent 8582d402ce
commit b931112776
13 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java
View File

@@ -109,7 +109,7 @@ import org.springframework.web.socket.sockjs.client.WebSocketTransport;
*/
@ContextConfiguration(classes = StompIntegrationTests.ClientConfig.class)
@RunWith(SpringRunner.class)
@DirtiesContext
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
public class StompIntegrationTests {
@Value("#{server.serverContext}")
@@ -197,7 +197,6 @@ public class StompIntegrationTests {
@Test
public void sendMessageToBrokerAndReceiveReplyViaTopic() throws Exception {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SUBSCRIBE);
headers.setSubscriptionId("subs1");
headers.setDestination("/topic/foo");
@@ -222,8 +221,7 @@ public class StompIntegrationTests {
}
@Test
public void sendSubscribeToControllerAndReceiveReply() throws Exception {
public void sendSubscribeToControllerAndReceiveReply() {
String destHeader = "/app/number";
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SUBSCRIBE);
@@ -284,7 +282,6 @@ public class StompIntegrationTests {
@Test
public void sendMessageToGateway() throws Exception {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SUBSCRIBE);
headers.setSubscriptionId("subs1");
headers.setDestination("/user/queue/answer");
@@ -395,11 +392,12 @@ public class StompIntegrationTests {
producer.setOutputChannel(webSocketEvents());
return producer;
}
}
// WebSocket Server part
@Target({ ElementType.TYPE })
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Controller
private @interface IntegrationTestController {
@@ -429,6 +427,7 @@ public class StompIntegrationTests {
public String handleException(IllegalArgumentException ex) {
return "Got error: " + ex.getMessage();
}
}
@IntegrationTestController
@@ -444,6 +443,7 @@ public class StompIntegrationTests {
public int number() {
return 42;
}
}