You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/02/13 23:23:04 UTC
svn commit: r1782896 -
/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
Author: kwall
Date: Mon Feb 13 23:23:04 2017
New Revision: 1782896
URL: http://svn.apache.org/viewvc?rev=1782896&view=rev
Log:
QPID-7603: Skip AmqpManagementTest tests properly when run with pre 6.3.x Qpid JMS Client 0-x
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java?rev=1782896&r1=1782895&r2=1782896&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java Mon Feb 13 23:23:04 2017
@@ -56,6 +56,25 @@ public class AmqpManagementTest extends
private MessageProducer _producer;
private boolean _runTest = true;
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ if (isBroker10())
+ {
+ _runTest = true;
+ }
+ else
+ {
+ Connection con = getConnection();
+ final ConnectionMetaData metaData = con.getMetaData();
+ // TODO: Older Qpid JMS Client 0-x (<=6.1.x) didn't support management addresses.
+ _runTest = !( metaData.getProviderMajorVersion() < 6 || (metaData.getProviderMajorVersion() == 6 && metaData.getProviderMinorVersion() <= 1));
+ con.close();
+ }
+ }
+
private void setupSession() throws Exception
{
_connection.start();
@@ -70,9 +89,6 @@ public class AmqpManagementTest extends
else
{
final ConnectionMetaData metaData = _connection.getMetaData();
- // TODO: Qpid JMS Client 0-x didn't suppport these addresses.
- _runTest = !( metaData.getProviderMajorVersion() < 6 || (metaData.getProviderMajorVersion() == 6 && metaData.getProviderMinorVersion() <= 1));
- getLogger().debug("Run test {}", _runTest);
_queue = _session.createQueue("ADDR:$management");
_replyAddress = _session.createQueue("ADDR:!response");
_replyConsumer = _session.createQueue(
@@ -101,11 +117,11 @@ public class AmqpManagementTest extends
// test get types on $management
public void testGetTypesOnBrokerManagement() throws Exception
{
- setupBrokerManagementConnection();
if (!_runTest)
{
return;
}
+ setupBrokerManagementConnection();
Message message = _session.createBytesMessage();
@@ -171,12 +187,12 @@ public class AmqpManagementTest extends
// test get types on $management
public void testQueryBrokerManagement() throws Exception
{
- setupBrokerManagementConnection();
if (!_runTest)
{
return;
}
+ setupBrokerManagementConnection();
MapMessage message = _session.createMapMessage();
@@ -259,12 +275,12 @@ public class AmqpManagementTest extends
// test get types on a virtual host
public void testGetTypesOnVhostManagement() throws Exception
{
- setupVirtualHostManagementConnection();
if (!_runTest)
{
return;
}
+ setupVirtualHostManagementConnection();
Message message = _session.createBytesMessage();
@@ -298,12 +314,12 @@ public class AmqpManagementTest extends
// create / update / read / delete a queue via $management
public void testCreateQueueOnBrokerManagement() throws Exception
{
- setupBrokerManagementConnection();
if (!_runTest)
{
return;
}
+ setupBrokerManagementConnection();
MapMessage message = _session.createMapMessage();
@@ -381,12 +397,12 @@ public class AmqpManagementTest extends
public void testCreateQueueOnVhostManagement() throws Exception
{
- setupVirtualHostManagementConnection();
if (!_runTest)
{
return;
}
+ setupVirtualHostManagementConnection();
MapMessage message = _session.createMapMessage();
@@ -496,11 +512,11 @@ public class AmqpManagementTest extends
// read virtual host from virtual host management
public void testReadVirtualHost() throws Exception
{
- setupVirtualHostManagementConnection();
if (!_runTest)
{
return;
}
+ setupVirtualHostManagementConnection();
MapMessage message = _session.createMapMessage();
@@ -532,12 +548,11 @@ public class AmqpManagementTest extends
// create a virtual host from $management
public void testCreateVirtualHost() throws Exception
{
- setupBrokerManagementConnection();
-
if (!_runTest)
{
return;
}
+ setupBrokerManagementConnection();
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.JsonVirtualHostNode");
@@ -580,12 +595,11 @@ public class AmqpManagementTest extends
// attempt to delete the virtual host via the virtual host
public void testDeleteVirtualHost() throws Exception
{
- setupVirtualHostManagementConnection();
-
if (!_runTest)
{
return;
}
+ setupVirtualHostManagementConnection();
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.VirtualHost");
@@ -605,11 +619,11 @@ public class AmqpManagementTest extends
// create a queue with the qpid type
public void testCreateQueueWithQpidType() throws Exception
{
- setupVirtualHostManagementConnection();
if (!_runTest)
{
return;
}
+ setupVirtualHostManagementConnection();
MapMessage message = _session.createMapMessage();
@@ -634,12 +648,11 @@ public class AmqpManagementTest extends
// create a queue using the AMQP type
public void testCreateQueueWithAmqpType() throws Exception
{
- setupVirtualHostManagementConnection();
-
if (!_runTest)
{
return;
}
+ setupVirtualHostManagementConnection();
MapMessage message = _session.createMapMessage();
@@ -664,12 +677,11 @@ public class AmqpManagementTest extends
// attempt to create an exchange without a type
public void testCreateExchangeWithoutType() throws Exception
{
- setupVirtualHostManagementConnection();
-
if (!_runTest)
{
return;
}
+ setupVirtualHostManagementConnection();
MapMessage message = _session.createMapMessage();
@@ -693,11 +705,11 @@ public class AmqpManagementTest extends
// attempt to create a connection
public void testCreateConnectionOnVhostManagement() throws Exception
{
- setupVirtualHostManagementConnection();
if (!_runTest)
{
return;
}
+ setupVirtualHostManagementConnection();
MapMessage message = _session.createMapMessage();
@@ -718,11 +730,11 @@ public class AmqpManagementTest extends
public void testCreateConnectionOnBrokerManagement() throws Exception
{
- setupBrokerManagementConnection();
if (!_runTest)
{
return;
}
+ setupBrokerManagementConnection();
MapMessage message = _session.createMapMessage();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org