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.
This commit is contained in:
Gary Russell
2014-03-21 15:05:42 -04:00
parent 98d735d058
commit 9998880485
2 changed files with 4 additions and 3 deletions

View File

@@ -66,6 +66,7 @@ public class BrokerRunning extends TestWatcher {
finally {
if (client != null) {
try {
client.disconnect();
client.close();
}
catch (MqttException e) {

View File

@@ -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;