This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 193103d NO-JIRA Test Fixes after latest changes
193103d is described below
commit 193103d9af2c3295971188aa37dac538c9eaaa03
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Tue Mar 12 20:09:35 2019 -0400
NO-JIRA Test Fixes after latest changes
---
.../artemis/tests/integration/mqtt/imported/MQTTTest.java | 12 ------------
.../tests/integration/remoting/DirectDeliverTest.java | 3 ++-
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
index 5b35f33..660f88c 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTest.java
@@ -23,7 +23,6 @@ import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import java.io.EOFException;
-import java.lang.reflect.Field;
import java.net.ProtocolException;
import java.net.URI;
import java.util.ArrayList;
@@ -45,7 +44,6 @@ import
org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.artemis.core.postoffice.QueueBinding;
-import org.apache.activemq.artemis.core.protocol.mqtt.MQTTSession;
import org.apache.activemq.artemis.core.protocol.mqtt.MQTTUtil;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.Queue;
@@ -66,7 +64,6 @@ import org.fusesource.mqtt.client.Tracer;
import org.fusesource.mqtt.codec.MQTTFrame;
import org.fusesource.mqtt.codec.PUBLISH;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -82,15 +79,6 @@ public class MQTTTest extends MQTTTestSupport {
private static final String AMQP_URI = "tcp://localhost:61616";
- @Override
- @Before
- public void setUp() throws Exception {
- Field sessions = MQTTSession.class.getDeclaredField("SESSIONS");
- sessions.setAccessible(true);
- sessions.set(null, new ConcurrentHashMap<>());
- super.setUp();
- }
-
@Test
public void testConnectWithLargePassword() throws Exception {
for (String version : Arrays.asList("3.1", "3.1.1")) {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
index 9fa0024..deb862a 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DirectDeliverTest.java
@@ -36,6 +36,7 @@ import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.core.server.impl.QueueImpl;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -98,7 +99,7 @@ public class DirectDeliverTest extends ActiveMQTestBase {
Queue queue = (Queue) binding.getBindable();
- assertTrue(queue.isDirectDeliver());
+ Assert.assertFalse(queue.isDirectDeliver());
ClientProducer prod = session.createProducer(foo);
