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 2018/06/20 15:39:47 UTC
activemq-artemis git commit: ARTEMIS-1924 small tweaks on HeartBeat
test
Repository: activemq-artemis
Updated Branches:
refs/heads/2.6.x 9133e22c1 -> 358bf7d4e
ARTEMIS-1924 small tweaks on HeartBeat test
(cherry picked from commit 6f72e0b4e53c03e468426678ed372fadf8cca0ee)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/358bf7d4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/358bf7d4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/358bf7d4
Branch: refs/heads/2.6.x
Commit: 358bf7d4e26be6cdff5186799e22e09a739d36dc
Parents: 9133e22
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jun 20 10:20:42 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jun 20 11:39:41 2018 -0400
----------------------------------------------------------------------
.../integration/amqp/AmqpNoHearbeatsTest.java | 27 ++++++++++++--------
1 file changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/358bf7d4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpNoHearbeatsTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpNoHearbeatsTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpNoHearbeatsTest.java
index 6e35c02..a7e82d0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpNoHearbeatsTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpNoHearbeatsTest.java
@@ -40,6 +40,11 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class AmqpNoHearbeatsTest extends AmqpClientTestSupport {
+ private static final int OK = 0x33;
+
+ @Parameterized.Parameter(0)
+ public boolean useOverride;
+
@Parameterized.Parameters(name = "useOverride={0}")
public static Collection<Object[]> parameters() {
return Arrays.asList(new Object[][] {
@@ -47,8 +52,6 @@ public class AmqpNoHearbeatsTest extends AmqpClientTestSupport {
});
}
- @Parameterized.Parameter(0)
- public boolean useOverride;
@Override
protected void addConfiguration(ActiveMQServer server) {
@@ -88,8 +91,6 @@ public class AmqpNoHearbeatsTest extends AmqpClientTestSupport {
connection.close();
}
- private static final String QUEUE_NAME = "queue://testHeartless";
-
// This test is validating a scenario where the client will leave with connection reset
// This is done by setting soLinger=0 on the socket, which will make the system to issue a connection.reset instead of sending a
// disconnect.
@@ -112,14 +113,14 @@ public class AmqpNoHearbeatsTest extends AmqpClientTestSupport {
connection.getStateInspector().assertValid();
AmqpSession session = connection.createSession();
- AmqpReceiver receiver = session.createReceiver(QUEUE_NAME);
+ AmqpReceiver receiver = session.createReceiver(getQueueName());
// This test needs a remote process exiting without closing the socket
// with soLinger=0 on the socket so it will issue a connection.reset
- Process p = SpawnedVMSupport.spawnVM(AmqpNoHearbeatsTest.class.getName(), "testConnectionReset");
- Assert.assertEquals(33, p.waitFor());
+ Process p = SpawnedVMSupport.spawnVM(AmqpNoHearbeatsTest.class.getName(), getTestName(), getQueueName());
+ Assert.assertEquals(OK, p.waitFor());
- AmqpSender sender = session.createSender(QUEUE_NAME);
+ AmqpSender sender = session.createSender(getQueueName());
for (int i = 0; i < 10; i++) {
AmqpMessage msg = new AmqpMessage();
@@ -137,18 +138,22 @@ public class AmqpNoHearbeatsTest extends AmqpClientTestSupport {
}
public static void main(String[] arg) {
- if (arg.length > 0 && arg[0].equals("testConnectionReset")) {
+ if (arg.length == 2 && arg[0].startsWith("testCloseConsumerOnConnectionReset")) {
try {
+ String queueName = arg[1];
AmqpClient client = new AmqpClient(new URI("tcp://127.0.0.1:5672?transport.soLinger=0"), null, null);
AmqpConnection connection = client.connect();
AmqpSession session = connection.createSession();
- AmqpReceiver receiver = session.createReceiver(QUEUE_NAME);
+ AmqpReceiver receiver = session.createReceiver(queueName);
receiver.flow(10);
- System.exit(33);
+ System.exit(OK);
} catch (Throwable e) {
e.printStackTrace();
System.exit(-1);
}
+ } else {
+ System.err.println("Test " + arg[0] + " unkown");
+ System.exit(-2);
}
}