You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/01/31 02:58:10 UTC
activemq-artemis git commit: NO-JIRA: fixing a test
Repository: activemq-artemis
Updated Branches:
refs/heads/master 3480cc710 -> 57945d97e
NO-JIRA: fixing a test
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/57945d97
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/57945d97
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/57945d97
Branch: refs/heads/master
Commit: 57945d97e95eb0dbb0a73b50af8ad71de1dede1a
Parents: 3480cc7
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Jan 30 15:55:05 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Jan 30 16:08:38 2017 -0500
----------------------------------------------------------------------
.../tests/integration/stomp/StompTestWithInterceptors.java | 7 +++++++
.../integration/stomp/util/AbstractStompClientConnection.java | 4 ++--
.../integration/stomp/util/StompClientConnectionV11.java | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/57945d97/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithInterceptors.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithInterceptors.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithInterceptors.java
index 9bb9bf2..206e4ed 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithInterceptors.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestWithInterceptors.java
@@ -29,6 +29,7 @@ import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
import org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
+import org.apache.activemq.artemis.tests.util.Wait;
import org.junit.Assert;
import org.junit.Test;
@@ -105,7 +106,13 @@ public class StompTestWithInterceptors extends StompTestBase {
Thread.sleep(10);
}
+ Wait.waitFor(() -> {
+ return MyIncomingStompFrameInterceptor.incomingInterceptedFrames.size() == 4;
+ });
Assert.assertEquals(4, MyIncomingStompFrameInterceptor.incomingInterceptedFrames.size());
+ Wait.waitFor(() -> {
+ return MyOutgoingStompFrameInterceptor.outgoingInterceptedFrames.size() == 3;
+ });
Assert.assertEquals(3, MyOutgoingStompFrameInterceptor.outgoingInterceptedFrames.size());
for (int i = 0; i < MyIncomingStompFrameInterceptor.incomingInterceptedFrames.size(); i++) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/57945d97/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
index fa1ec73..707c8a1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/AbstractStompClientConnection.java
@@ -78,7 +78,7 @@ public abstract class AbstractStompClientConnection implements StompClientConnec
private ClientStompFrame sendFrameInternal(ClientStompFrame frame, boolean wicked) throws IOException, InterruptedException {
ClientStompFrame response = null;
- IntegrationTestLogger.LOGGER.info("Sending " + (wicked ? "*wicked* " : "") + "frame:\n" + frame);
+ IntegrationTestLogger.LOGGER.trace("Sending " + (wicked ? "*wicked* " : "") + "frame:\n" + frame);
ByteBuffer buffer;
if (wicked) {
buffer = frame.toByteBufferWithExtra("\n");
@@ -103,7 +103,7 @@ public abstract class AbstractStompClientConnection implements StompClientConnec
}
}
- IntegrationTestLogger.LOGGER.info("Received:\n" + response);
+ IntegrationTestLogger.LOGGER.trace("Received:\n" + response);
return response;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/57945d97/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
index cfc8f92..6ef88cb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
@@ -81,7 +81,7 @@ public class StompClientConnectionV11 extends StompClientConnectionV10 {
this.passcode = passcode;
this.connected = true;
} else {
- System.out.println("Connection failed with frame " + response);
+ System.err.println("Connection failed with frame " + response);
connected = false;
}
}