From 99988804852ca76bcf64d86c687d31543c1d4e41 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 21 Mar 2014 15:05:42 -0400 Subject: [PATCH] INT-3336 Fix MQTT Test Rule JIRA: https://jira.spring.io/browse/INT-3336 Disconnect the client after verifying the broker is available. Change the rule to a class level rule in DownstreamExceptionTests. --- .../org/springframework/integration/mqtt/BrokerRunning.java | 1 + .../integration/mqtt/DownstreamExceptionTests.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BrokerRunning.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BrokerRunning.java index e9be4042c7..acaac2fbc9 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BrokerRunning.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BrokerRunning.java @@ -66,6 +66,7 @@ public class BrokerRunning extends TestWatcher { finally { if (client != null) { try { + client.disconnect(); client.close(); } catch (MqttException e) { diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java index 3e7ca345f4..1a2213f04a 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java @@ -30,7 +30,7 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; -import org.junit.Rule; +import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.invocation.InvocationOnMock; @@ -57,8 +57,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @DirtiesContext public class DownstreamExceptionTests { - @Rule - public final BrokerRunning brokerRunning = BrokerRunning.isRunning(1883); + @ClassRule + public static final BrokerRunning brokerRunning = BrokerRunning.isRunning(1883); @Autowired private Service service;