From 8d04e2be8ec66ac54a1d62f2a2ba50320bfc0802 Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Mon, 28 Jul 2014 15:57:08 -0400 Subject: [PATCH] Remove unneeded broker stop / start at test begin. --- .../activemq/transport/mqtt/MQTTTest.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java index fc91f273d5..8734d65d0e 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java @@ -16,6 +16,14 @@ */ package org.apache.activemq.transport.mqtt; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.net.ProtocolException; import java.util.ArrayList; import java.util.Arrays; @@ -27,6 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; + import javax.jms.BytesMessage; import javax.jms.Connection; import javax.jms.Destination; @@ -35,13 +44,6 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.broker.region.policy.LastImageSubscriptionRecoveryPolicy; import org.apache.activemq.broker.region.policy.PolicyEntry; @@ -1045,9 +1047,6 @@ public class MQTTTest extends MQTTTestSupport { @Test(timeout = 60 * 1000) public void testPublishDollarTopics() throws Exception { - stopBroker(); - startBroker(); - MQTT mqtt = createMQTTConnection(); final String clientId = "publishDollar"; mqtt.setClientId(clientId); @@ -1123,7 +1122,6 @@ public class MQTTTest extends MQTTTestSupport { } jmsConn.close(); - } @Test(timeout = 30 * 10000)