commit c5488e7f52fb00e5a371a5a957ca7c5156efedd4
author Keith Wall <kwall@apache.org> Tue Jan 16 12:22:07 2018 +0000
committer Keith Wall <kwall@apache.org> Tue Jan 16 12:22:07 2018 +0000
tree 8d3a4a23b7c245081d37a2dc356c909ffa4feb36
parent 139f1c9f23681c2cf1e155b809a6bfb4f547170c

QPID-8074: [JMS AMQP 0-x][System Tests] Exclude org.apache.qpid.systest.connection.HeartbeatTest#testUnidirectionalHeartbeating from CPP

systests/src/test/java/org/apache/qpid/systest/connection/HeartbeatTest.java

diff --git a/systests/src/test/java/org/apache/qpid/systest/connection/HeartbeatTest.java b/systests/src/test/java/org/apache/qpid/systest/connection/HeartbeatTest.java
index 2123d93..edcfb92 100644
--- a/systests/src/test/java/org/apache/qpid/systest/connection/HeartbeatTest.java
+++ b/systests/src/test/java/org/apache/qpid/systest/connection/HeartbeatTest.java
@@ -19,9 +19,13 @@
 package org.apache.qpid.systest.connection;
 
 import static org.apache.qpid.configuration.ClientProperties.QPID_HEARTBEAT_INTERVAL;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeThat;
 
 import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
@@ -128,6 +132,9 @@
     @Test
     public void testUnidirectionalHeartbeating() throws Exception
     {
+        assumeThat("QPID-2796 : JMS client for AMQP 0-10 only sends heartbeats in response to heartbeats "
+                   + "fromthe server, not timeout based.",
+                   getBrokerAdmin().getBrokerType(), is(equalTo(BrokerAdmin.BrokerType.BROKERJ)));
         System.setProperty(QPID_HEARTBEAT_INTERVAL,"1");
         AMQConnection receiveConn = (AMQConnection) getConnection();
         AMQConnection sendConn = (AMQConnection) getConnection();