Updated Branches: refs/heads/trunk d29bab50e -> 18e163de5
Added @Ignore to testReceiveMessageSentWhileOffline as it was failing regularly on both. See AMQ-4712 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/18e163de Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/18e163de Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/18e163de Branch: refs/heads/trunk Commit: 18e163de5e12fe8b88e5ce0b60cec461948573a5 Parents: d29bab5 Author: Kevin Earls <[email protected]> Authored: Tue Jan 21 15:10:26 2014 +0100 Committer: Kevin Earls <[email protected]> Committed: Tue Jan 21 15:10:26 2014 +0100 ---------------------------------------------------------------------- .../activemq/transport/mqtt/MQTTNioTest.java | 11 +++++++++++ .../activemq/transport/mqtt/MQTTSSLTest.java | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/18e163de/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNioTest.java ---------------------------------------------------------------------- diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNioTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNioTest.java index b64a84f..c89c84e 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNioTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNioTest.java @@ -24,12 +24,16 @@ import org.apache.activemq.security.*; import org.apache.activemq.util.Wait; import org.fusesource.mqtt.client.BlockingConnection; import org.fusesource.mqtt.client.MQTT; +import org.junit.Ignore; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.BlockJUnit4ClassRunner; import java.util.LinkedList; import static org.junit.Assert.assertTrue; +@RunWith(BlockJUnit4ClassRunner.class) public class MQTTNioTest extends MQTTTest { @Override @@ -37,6 +41,13 @@ public class MQTTNioTest extends MQTTTest { return "mqtt+nio"; } + @Ignore("See AMQ-4712") + @Override + @Test + public void testReceiveMessageSentWhileOffline() throws Exception { + super.testReceiveMessageSentWhileOffline(); + } + @Test public void testPingOnMQTTNIO() throws Exception { addMQTTConnector("maxInactivityDuration=-1"); http://git-wip-us.apache.org/repos/asf/activemq/blob/18e163de/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java ---------------------------------------------------------------------- diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java index 8cf8db4..c98f921 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java @@ -25,9 +25,18 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import org.fusesource.mqtt.client.MQTT; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.BlockJUnit4ClassRunner; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +@RunWith(BlockJUnit4ClassRunner.class) public class MQTTSSLTest extends MQTTTest { + private static final Logger LOG = LoggerFactory.getLogger(MQTTSSLTest.class); + public void setUp() throws Exception { String basedir = basedir().getPath(); System.setProperty("javax.net.ssl.trustStore", basedir+"/src/test/resources/client.keystore"); @@ -44,6 +53,14 @@ public class MQTTSSLTest extends MQTTTest { return "mqtt+ssl"; } + @Ignore("See AMQ-4712") + @Override + @Test + public void testReceiveMessageSentWhileOffline() throws Exception { + super.testReceiveMessageSentWhileOffline(); + } + + protected MQTT createMQTTConnection() throws Exception { MQTT mqtt = new MQTT(); mqtt.setConnectAttemptsMax(1);
