You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/24 09:14:51 UTC
svn commit: r1771095 [1/2] - in /qpid/java/trunk: ./
broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/
client/src/test/java/org/apache/qpid/jndi/ qpid-systests-parent/ systests/
systests/src/main/java/org/apache/qpid/...
Author: rgodfrey
Date: Thu Nov 24 09:14:51 2016
New Revision: 1771095
URL: http://svn.apache.org/viewvc?rev=1771095&view=rev
Log:
QPID-7546 : Add a java-mms.1-0 profile
Added:
qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes
qpid/java/trunk/test-profiles/Java10Excludes
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
qpid/java/trunk/test-profiles/test-provider-1-0.properties (with props)
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
qpid/java/trunk/pom.xml
qpid/java/trunk/qpid-systests-parent/pom.xml
qpid/java/trunk/systests/pom.xml
qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/MessageCompressionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/JMSXUserIDTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/TopicPublisherCloseTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ct/DurableSubscriberTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/FaultTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/utils/FailoverBaseCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ConnectionEstablishmentTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java Thu Nov 24 09:14:51 2016
@@ -165,8 +165,9 @@ public abstract class MessageConverter_t
}
}
- static Map fixMapValues(final Map<String, Object> map)
+ static Map fixMapValues(Map<String, Object> map)
{
+ map = new LinkedHashMap<>(map);
for(Map.Entry<String,Object> entry : map.entrySet())
{
entry.setValue(fixValue(entry.getValue()));
@@ -194,8 +195,9 @@ public abstract class MessageConverter_t
}
}
- static List fixListValues(final List list)
+ static List fixListValues(List list)
{
+ list = new ArrayList(list);
ListIterator iterator = list.listIterator();
while(iterator.hasNext())
{
Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java Thu Nov 24 09:14:51 2016
@@ -44,6 +44,13 @@ public class PropertiesFileInitialContex
{
private static final String CONNECTION_URL = "amqp://username:password@clientid/test?brokerlist='tcp://testContextFromProviderURL:5672'";
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ setTestSystemProperty("java.naming.provider.url", null);
+ }
+
public void testQueueNamesWithTrailingSpaces() throws Exception
{
Context ctx = prepareContext();
Modified: qpid/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/pom.xml (original)
+++ qpid/java/trunk/pom.xml Thu Nov 24 09:14:51 2016
@@ -81,7 +81,7 @@
<java.target>1.7</java.target>
<!-- enforcer plugin config properties -->
- <supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp|java-json.0-9-1|java-json.0-10)</supported-test-profiles-regex>
+ <supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-mms.1-0|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp|java-json.0-9-1|java-json.0-10)</supported-test-profiles-regex>
<!-- surefire forked jvm arguments -->
<argLine>-Xmx512m</argLine>
@@ -110,6 +110,8 @@
<profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
<profile.broker.clean.between.tests>true</profile.broker.clean.between.tests>
<profile.test_receive_timeout>1000</profile.test_receive_timeout>
+ <profile.java.naming.factory.initial>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</profile.java.naming.factory.initial>
+ <profile.java.naming.provider.url>test-profiles${file.separator}test-provider.properties</profile.java.naming.provider.url>
<dollar.sign>$</dollar.sign>
<at.sign>@</at.sign>
@@ -353,7 +355,6 @@
<systemPropertyVariables>
<!-- Defaults -->
<QPID_HOME>${qpid.home}</QPID_HOME>
- <java.naming.factory.initial>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
<broker.config>${qpid.home}${file.separator}etc${file.separator}config-systests.json</broker.config>
<max_prefetch>1000</max_prefetch>
<qpid.dest_syntax>BURL</qpid.dest_syntax>
@@ -389,6 +390,8 @@
<test.output.dir>${test.output.dir}</test.output.dir>
<broker.clean.between.tests>true</broker.clean.between.tests>
<qpid.test_receive_timeout>${profile.test_receive_timeout}</qpid.test_receive_timeout>
+ <java.naming.factory.initial>${profile.java.naming.factory.initial}</java.naming.factory.initial>
+ <java.naming.provider.url>${profile.java.naming.provider.url}</java.naming.provider.url>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -776,6 +779,28 @@
</properties>
</profile>
+ <profile>
+ <id>java-mms.1-0</id>
+ <activation>
+ <property>
+ <name>profile</name>
+ <value>java-mms.1-0</value>
+ </property>
+ </activation>
+ <properties>
+ <profile>java-mms.1-0</profile>
+ <profile.specific.excludes>JavaTransientExcludes Java10Excludes Java10BrokenTestsExcludes Java10UninvestigatedTestsExcludes</profile.specific.excludes>
+ <profile.broker.version>v1_0</profile.broker.version>
+ <profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10","AMQP_1_0"]</profile.test.amqp_port_protocols>
+ <profile.broker.persistent>false</profile.broker.persistent>
+ <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
+ <profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
+ <profile.java.naming.factory.initial>org.apache.qpid.jms.jndi.JmsInitialContextFactory</profile.java.naming.factory.initial>
+ <profile.java.naming.provider.url>test-profiles${file.separator}test-provider-1-0.properties</profile.java.naming.provider.url>
+
+ </properties>
+ </profile>
+
<!--
Split store profiles.
Virtual host configuration can be overridden by setting blueprint property like below
Modified: qpid/java/trunk/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-systests-parent/pom.xml?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/qpid-systests-parent/pom.xml (original)
+++ qpid/java/trunk/qpid-systests-parent/pom.xml Thu Nov 24 09:14:51 2016
@@ -82,7 +82,6 @@
integration-test phase below instead -->
<skip>true</skip>
<systemPropertyVariables>
- <java.naming.provider.url>test-profiles${file.separator}test-provider.properties</java.naming.provider.url>
<test.output.dir>${test.output.dir}</test.output.dir>
</systemPropertyVariables>
</configuration>
Modified: qpid/java/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/pom.xml?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/pom.xml (original)
+++ qpid/java/trunk/systests/pom.xml Thu Nov 24 09:14:51 2016
@@ -51,6 +51,12 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jms-client</artifactId>
+ <version>${qpid-jms-client-version}</version>
+ </dependency>
+
<!-- jca deps -->
<dependency>
<groupId>org.apache.qpid</groupId>
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Thu Nov 24 09:14:51 2016
@@ -32,7 +32,6 @@ import javax.jms.JMSException;
import junit.framework.TestCase;
-import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.server.model.Binding;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
@@ -218,7 +217,7 @@ public class Asserts
}
}
- public static void assertConnection(Map<String, Object> connectionData, AMQConnection connection)
+ public static void assertConnection(Map<String, Object> connectionData, final int sessions)
throws JMSException
{
assertNotNull("Unexpected connection data", connectionData);
@@ -229,6 +228,7 @@ public class Asserts
Connection.LIFETIME_POLICY,
Connection.INCOMING,
Connection.REMOTE_PROCESS_NAME,
+ Connection.REMOTE_PROCESS_PID,
Connection.LOCAL_ADDRESS,
Connection.PROPERTIES,
ConfiguredObject.TYPE,
@@ -242,8 +242,6 @@ public class Asserts
assertEquals("Unexpected value for connection attribute " + Connection.PORT,
TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT, connectionData.get(Connection.PORT));
- assertEquals("Unexpected value of connection attribute " + Connection.SESSION_COUNT_LIMIT,
- (int) connection.getMaximumChannelCount(), connectionData.get(Connection.SESSION_COUNT_LIMIT));
assertEquals("Unexpected value of connection attribute " + Connection.CLIENT_ID, "clientid",
connectionData.get(Connection.CLIENT_ID));
assertEquals("Unexpected value of connection attribute " + Connection.PRINCIPAL, "guest",
@@ -260,7 +258,7 @@ public class Asserts
"messagesIn",
"messagesOut",
"sessionCount");
- assertEquals("Unexpected value of connection statistics attribute sessionCount ", 1,
+ assertEquals("Unexpected value of connection statistics attribute sessionCount ", sessions,
statistics.get("sessionCount"));
}
Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Thu Nov 24 09:14:51 2016
@@ -18,27 +18,16 @@
package org.apache.qpid.test.utils;
import java.io.File;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.StreamMessage;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
+import javax.jms.*;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -107,9 +96,10 @@ public class QpidBrokerTestCase extends
private final Map<String, String> _propertiesSetForBroker = new HashMap<>();
private final List<Connection> _connections = new ArrayList<>();
- protected AMQConnectionFactory _connectionFactory;
+ protected ConnectionFactory _connectionFactory;
private BrokerHolder _defaultBroker;
private MessageType _messageType = MessageType.TEXT;
+ private Hashtable _initialContextEnvironment = new Hashtable();
@Override
public void runBare() throws Throwable
@@ -204,6 +194,11 @@ public class QpidBrokerTestCase extends
return BROKER_PROTOCOL.equals(Protocol.AMQP_0_10);
}
+ public boolean isBroker10()
+ {
+ return BROKER_PROTOCOL.equals(Protocol.AMQP_1_0);
+ }
+
public Protocol getBrokerProtocol()
{
return BROKER_PROTOCOL;
@@ -223,7 +218,7 @@ public class QpidBrokerTestCase extends
*/
public InitialContext getInitialContext() throws NamingException
{
- return new InitialContext();
+ return new InitialContext(_initialContextEnvironment);
}
/**
@@ -233,7 +228,7 @@ public class QpidBrokerTestCase extends
* @return A connection factory
* @throws NamingException if there is an error getting the factory
*/
- public AMQConnectionFactory getConnectionFactory() throws NamingException
+ public ConnectionFactory getConnectionFactory() throws NamingException
{
if (_connectionFactory == null)
{
@@ -256,9 +251,41 @@ public class QpidBrokerTestCase extends
* @return A connection factory
* @throws NamingException if there is an error getting the factory
*/
- public AMQConnectionFactory getConnectionFactory(String factoryName) throws NamingException
+ public ConnectionFactory getConnectionFactory(String factoryName) throws NamingException
{
- return (AMQConnectionFactory) getInitialContext().lookup(factoryName);
+ return getConnectionFactory(factoryName, "test", "clientid");
+ }
+ public ConnectionFactory getConnectionFactory(String factoryName, String vhost, String clientId) throws NamingException
+ {
+
+ if(isBroker10())
+ {
+ if("failover".equals(factoryName))
+ {
+ _initialContextEnvironment.put("property.connectionfactory.failover.remoteURI",
+ "failover:(amqp://localhost:"
+ + System.getProperty("test.port")
+ + ",amqp://localhost:"
+ + System.getProperty("test.port.alt")
+ + ")?failover.maxReconnectAttempts=20&amqp.vhost="
+ + vhost
+ + "&jms.clientID="
+ + clientId
+ + "&jms.forceSyncSend=true");
+ }
+ else if("default".equals(factoryName))
+ {
+ _initialContextEnvironment.put("property.connectionfactory.default.remoteURI",
+ "amqp://localhost:"
+ + System.getProperty("test.port")
+ + "?amqp.vhost="
+ + vhost
+ + "&jms.clientID="
+ + clientId);
+
+ }
+ }
+ return (ConnectionFactory) getInitialContext().lookup(factoryName);
}
public Connection getConnection() throws JMSException, NamingException
@@ -269,7 +296,7 @@ public class QpidBrokerTestCase extends
public Connection getConnectionWithOptions(Map<String, String> options)
throws URLSyntaxException, NamingException, JMSException
{
- ConnectionURL curl = new AMQConnectionURL(getConnectionFactory().getConnectionURLString());
+ ConnectionURL curl = new AMQConnectionURL(((AMQConnectionFactory)getConnectionFactory()).getConnectionURLString());
for (Map.Entry<String, String> entry : options.entrySet())
{
curl.setOption(entry.getKey(), entry.getValue());
@@ -284,7 +311,7 @@ public class QpidBrokerTestCase extends
public Connection getConnectionForVHost(String vhost)
throws URLSyntaxException, NamingException, JMSException
{
- ConnectionURL curl = new AMQConnectionURL(getConnectionFactory().getConnectionURLString());
+ ConnectionURL curl = new AMQConnectionURL(((AMQConnectionFactory)getConnectionFactory()).getConnectionURLString());
curl.setVirtualHost(vhost);
curl = new AMQConnectionURL(curl.toString());
@@ -330,6 +357,28 @@ public class QpidBrokerTestCase extends
return new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, getTestQueueName());
}
+ public Queue createTestQueue(Session session) throws JMSException
+ {
+ return createTestQueue(session, getTestQueueName());
+ }
+
+ public Queue createTestQueue(Session session, String queueName) throws JMSException
+ {
+ if(isBroker10())
+ {
+ createEntityUsingAmqpManagement(queueName, session, "org.apache.qpid.Queue");
+
+ return session.createQueue(queueName);
+ }
+ else
+ {
+
+ AMQQueue amqQueue = new AMQQueue(ExchangeDefaults.DIRECT_EXCHANGE_NAME, queueName);
+ session.createConsumer(amqQueue).close();
+ return amqQueue;
+ }
+ }
+
/**
* Return a Topic specific for this test.
* Uses getTestQueueName() as the name of the topic
@@ -339,6 +388,105 @@ public class QpidBrokerTestCase extends
return new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, getTestQueueName());
}
+ protected Topic createTopic(final Connection con, final String topicName) throws JMSException
+ {
+ if(isBroker10())
+ {
+ Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ createEntityUsingAmqpManagement(topicName, session, "org.apache.qpid.TopicExchange");
+
+ return session.createTopic(topicName);
+
+ }
+ else
+ {
+ return new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, topicName);
+ }
+ }
+
+ protected Topic createTopicOnDirect(final Connection con, String topicName) throws JMSException, URISyntaxException
+ {
+ if(isBroker10())
+ {
+ Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ return session.createTopic("amq.direct/"+topicName);
+ }
+ else
+ {
+ return new AMQTopic(
+ "direct://amq.direct/"+topicName+"/"+topicName+"?routingkey='"+topicName+"',exclusive='true',autodelete='true'");
+ }
+ }
+
+
+ protected Topic createTopicOnFanout(final Connection con, String topicName) throws JMSException, URISyntaxException
+ {
+ if(isBroker10())
+ {
+ Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ return session.createTopic("amq.fanout/"+topicName);
+ }
+ else
+ {
+ return new AMQTopic(
+ "fanout://amq.fanout/"+topicName+"/"+topicName+"?routingkey='"+topicName+"',exclusive='true',autodelete='true'");
+ }
+ }
+
+ private void createEntityUsingAmqpManagement(final String name, final Session session, final String type)
+ throws JMSException
+ {
+ MessageProducer producer = session.createProducer(session.createQueue("$management"));
+
+ MapMessage createMessage = session.createMapMessage();
+ createMessage.setStringProperty("type", type);
+ createMessage.setStringProperty("operation", "CREATE");
+ createMessage.setString("name", name);
+ createMessage.setString("object-path", name);
+ producer.send(createMessage);
+ }
+
+
+ protected List managementQueryObjects(final Session session, final String type) throws JMSException
+ {
+ MessageProducer producer = session.createProducer(session.createQueue("$management"));
+ final TemporaryQueue responseQ = session.createTemporaryQueue();
+ MessageConsumer consumer = session.createConsumer(responseQ);
+ MapMessage message = session.createMapMessage();
+ message.setStringProperty("identity", "self");
+ message.setStringProperty("type", "org.amqp.management");
+ message.setStringProperty("operation", "QUERY");
+ message.setStringProperty("entityType", type);
+ message.setString("attributeNames", "[]");
+ message.setJMSReplyTo(responseQ);
+
+ producer.send(message);
+
+ Message response = consumer.receive();
+ try
+ {
+ if (response instanceof MapMessage)
+ {
+ return (List) ((MapMessage) response).getObject("results");
+ }
+ else if (response instanceof ObjectMessage)
+ {
+ Object body = ((ObjectMessage) response).getObject();
+ if (body instanceof Map)
+ {
+ return (List) ((Map) body).get("results");
+ }
+ }
+ throw new IllegalArgumentException("Cannot parse the results from a management query");
+ }
+ finally
+ {
+ consumer.close();
+ responseQ.delete();
+ }
+ }
+
+
/**
* Send messages to the given destination.
* <p/>
@@ -473,9 +621,9 @@ public class QpidBrokerTestCase extends
{
try
{
- if (getConnectionFactory().getConnectionURL().getBrokerCount() > 0)
+ if (((AMQConnectionFactory)getConnectionFactory()).getConnectionURL().getBrokerCount() > 0)
{
- return getConnectionFactory().getConnectionURL().getBrokerDetails(0);
+ return ((AMQConnectionFactory)getConnectionFactory()).getConnectionURL().getBrokerDetails(0);
}
else
{
@@ -705,7 +853,15 @@ public class QpidBrokerTestCase extends
QpidException, NamingException
{
_logger.debug("get connection for id " + id);
- Connection con = getConnectionFactory().createConnection(username, password, id);
+ Connection con;
+ if(isBroker10())
+ {
+ con = getConnectionFactory("default", "test", id).createConnection(username, password);
+ }
+ else
+ {
+ con = ((AMQConnectionFactory)getConnectionFactory()).createConnection(username, password, id);
+ }
//add the connection in the list of connections
_connections.add(con);
return con;
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java Thu Nov 24 09:14:51 2016
@@ -61,7 +61,7 @@ public class AMQQueueDeferredOrderingTes
public ASyncProducer(Queue q, int start, int end) throws JMSException
{
- this.session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ this.session = con.createSession(true, Session.SESSION_TRANSACTED);
this._logger.info("Create Consumer of Q1");
this.producer = this.session.createProducer(q);
this.start = start;
@@ -76,7 +76,7 @@ public class AMQQueueDeferredOrderingTes
for (int i = start; i < end && !_shutdownThreads; i++)
{
producer.send(session.createTextMessage(Integer.toString(i)));
- ((AMQSession<?, ?>)session).sync();
+ session.commit();
}
this._logger.info("Sent " + (end - start) + " messages");
}
@@ -99,7 +99,7 @@ public class AMQQueueDeferredOrderingTes
_logger.info("Create Session");
session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
_logger.info("Create Q");
- queue = getTestQueue();
+ queue = createTestQueue(session);
_logger.info("Create Consumer of Q");
consumer = session.createConsumer(queue);
_logger.info("Start Connection");
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java Thu Nov 24 09:14:51 2016
@@ -57,7 +57,7 @@ public class AsynchMessageListenerTest e
_consumerConnection = getConnection();
_consumerConnection.start();
_consumerSession = _consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- _queue = _consumerSession.createQueue(_testQueueName);
+ _queue = createTestQueue(_consumerSession);
_consumer = _consumerSession.createConsumer(_queue);
// Populate queue
@@ -107,7 +107,8 @@ public class AsynchMessageListenerTest e
catch (JMSException e)
{
// PASS
- assertEquals("A listener has already been set.", e.getMessage());
+ String message = e.getMessage();
+ assertTrue("A listener has already been set.".equals(message) || "Cannot synchronously receive a message when a MessageListener is set".equals(message));
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java Thu Nov 24 09:14:51 2016
@@ -1162,7 +1162,7 @@ public class FailoverBehaviourTest exten
private AMQConnection createConnectionWithFailover(Map<String,String> connectionOptions) throws NamingException, JMSException, URLSyntaxException
{
- BrokerDetails origBrokerDetails = getConnectionFactory("default").getConnectionURL().getBrokerDetails(0);
+ BrokerDetails origBrokerDetails = ((AMQConnectionFactory)getConnectionFactory("default")).getConnectionURL().getBrokerDetails(0);
String retries = "200";
String connectdelay = "1000";
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/jms/xa/XAResourceTest.java Thu Nov 24 09:14:51 2016
@@ -44,7 +44,7 @@ public class XAResourceTest extends Abst
public void testIsSameRMJoin() throws Exception
{
- XAConnectionFactory factory = getConnectionFactory(FACTORY_NAME);
+ XAConnectionFactory factory = (XAConnectionFactory) getConnectionFactory(FACTORY_NAME);
XAConnection conn1 = factory.createXAConnection("guest", "guest");
XAConnection conn2 = factory.createXAConnection("guest", "guest");
XAConnection conn3 = factory.createXAConnection("guest", "guest");
@@ -89,7 +89,7 @@ public class XAResourceTest extends Abst
*/
public void testIsSameRMSingleCF() throws Exception
{
- XAConnectionFactory factory = getConnectionFactory(FACTORY_NAME);
+ XAConnectionFactory factory = (XAConnectionFactory) getConnectionFactory(FACTORY_NAME);
XAConnection conn = factory.createXAConnection("guest","guest");
XASession session = conn.createXASession();
XAResource xaResource1 = session.getXAResource();
@@ -115,10 +115,10 @@ public class XAResourceTest extends Abst
secondBroker.start();
setTestSystemProperty("test.port.alt", String.valueOf(secondBroker.getAmqpPort()));
- ConnectionURL url = getConnectionFactory(FACTORY_NAME).getConnectionURL();
+ ConnectionURL url = ((AMQConnectionFactory)getConnectionFactory(FACTORY_NAME)).getConnectionURL();
XAConnectionFactory factory = new AMQConnectionFactory(url);
XAConnectionFactory factory2 = new AMQConnectionFactory(url);
- XAConnectionFactory factory3 = getConnectionFactory(ALT_FACTORY_NAME);
+ XAConnectionFactory factory3 = (XAConnectionFactory) getConnectionFactory(ALT_FACTORY_NAME);
XAConnection conn = factory.createXAConnection("guest", "guest");
XAConnection conn2 = factory2.createXAConnection("guest", "guest");
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/ra/QpidRAXAResourceTest.java Thu Nov 24 09:14:51 2016
@@ -41,7 +41,7 @@ public class QpidRAXAResourceTest extend
QpidRAManagedConnection mc = (QpidRAManagedConnection)mcf.createManagedConnection(null, null);
AMQXAResource xa1 = (AMQXAResource)mc.getXAResource();
- XAConnectionFactory factory = getConnectionFactory(FACTORY_NAME);
+ XAConnectionFactory factory = (XAConnectionFactory) getConnectionFactory(FACTORY_NAME);
XAConnection connection = factory.createXAConnection("guest", "guest");
XASession s2 = connection.createXASession();
AMQXAResource xaResource = (AMQXAResource)connection.createXASession().getXAResource();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java Thu Nov 24 09:14:51 2016
@@ -31,6 +31,8 @@ import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
import javax.jms.TopicSubscriber;
import javax.naming.NamingException;
@@ -38,11 +40,9 @@ import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.AMQTopic;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class TimeToLiveTest extends QpidBrokerTestCase
@@ -251,12 +251,12 @@ public class TimeToLiveTest extends Qpid
public void testPassiveTTLwithDurableSubscription() throws Exception
{
//Create Client 1
- Connection clientConnection = getConnection();
+ TopicConnection clientConnection = (TopicConnection) getConnection();
Session clientSession = clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Create and close the durable subscriber
- AMQTopic topic = new AMQTopic((AMQConnection) clientConnection, getTestQueueName());
+ Topic topic = createTopic(clientConnection, getTestQueueName());
TopicSubscriber durableSubscriber = clientSession.createDurableSubscriber(topic, getTestQueueName(),"testprop='TimeToLiveTest'", false);
durableSubscriber.close();
@@ -348,11 +348,11 @@ public class TimeToLiveTest extends Qpid
public void testActiveTTLwithDurableSubscription() throws Exception
{
//Create Client 1
- Connection clientConnection = getConnection();
+ TopicConnection clientConnection = (TopicConnection) getConnection();
Session clientSession = clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
// Create and close the durable subscriber
- AMQTopic topic = new AMQTopic((AMQConnection) clientConnection, getTestQueueName());
+ Topic topic = createTopic(clientConnection, getTestQueueName());
TopicSubscriber durableSubscriber = clientSession.createDurableSubscriber(topic, "MyDurableTTLSubscription","testprop='TimeToLiveTest'", false);
durableSubscriber.close();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/MessageCompressionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/MessageCompressionTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/MessageCompressionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/MessageCompressionTest.java Thu Nov 24 09:14:51 2016
@@ -44,6 +44,7 @@ import javax.naming.NamingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Maps;
+import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.client.AMQConnectionURL;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.jms.ConnectionURL;
@@ -131,7 +132,7 @@ public class MessageCompressionTest exte
String messageText = createMessageText();
Connection senderConnection = getConnection(senderCompresses);
- String virtualPath = getConnectionFactory().getVirtualPath();
+ String virtualPath = ((AMQConnectionFactory)getConnectionFactory()).getVirtualPath();
String testQueueName = getTestQueueName();
createAndBindQueue(virtualPath, testQueueName);
@@ -194,7 +195,7 @@ public class MessageCompressionTest exte
String messageText = createMessageText();
Connection senderConnection = getConnection(true);
- String virtualPath = getConnectionFactory().getVirtualPath();
+ String virtualPath = ((AMQConnectionFactory)getConnectionFactory()).getVirtualPath();
String testQueueName = getTestQueueName();
createAndBindQueue(virtualPath, testQueueName);
@@ -223,7 +224,7 @@ public class MessageCompressionTest exte
String messageText = createMessageText();
Connection senderConnection = getConnection(true);
- String virtualPath = getConnectionFactory().getVirtualPath();
+ String virtualPath = ((AMQConnectionFactory)getConnectionFactory()).getVirtualPath();
String testQueueName = getTestQueueName();
createAndBindQueue(virtualPath, testQueueName);
@@ -251,7 +252,7 @@ public class MessageCompressionTest exte
String messageText = createMessageText();
Connection senderConnection = getConnection(true);
- String virtualPath = getConnectionFactory().getVirtualPath();
+ String virtualPath = ((AMQConnectionFactory)getConnectionFactory()).getVirtualPath();
String testQueueName = getTestQueueName();
createAndBindQueue(virtualPath, testQueueName);
@@ -289,7 +290,7 @@ public class MessageCompressionTest exte
doActualSetUp();
Connection senderConnection = getConnection(true);
- String virtualPath = getConnectionFactory().getVirtualPath();
+ String virtualPath = ((AMQConnectionFactory)getConnectionFactory()).getVirtualPath();
String testQueueName = getTestQueueName();
createAndBindQueue(virtualPath, testQueueName);
@@ -316,7 +317,7 @@ public class MessageCompressionTest exte
doActualSetUp();
Connection senderConnection = getConnection(true);
- String virtualPath = getConnectionFactory().getVirtualPath();
+ String virtualPath = ((AMQConnectionFactory)getConnectionFactory()).getVirtualPath();
String testQueueName = getTestQueueName();
createAndBindQueue(virtualPath, testQueueName);
@@ -452,7 +453,7 @@ public class MessageCompressionTest exte
private Connection getConnection(final boolean compress) throws URLSyntaxException, NamingException, JMSException
{
- AMQConnectionURL url = new AMQConnectionURL(getConnectionFactory().getConnectionURLString());
+ AMQConnectionURL url = new AMQConnectionURL(((AMQConnectionFactory)getConnectionFactory()).getConnectionURLString());
url.setOption(ConnectionURL.OPTIONS_COMPRESS_MESSAGES,String.valueOf(compress));
url = new AMQConnectionURL(url.toString());
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=1771095&r1=1771094&r2=1771095&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 Thu Nov 24 09:14:51 2016
@@ -26,17 +26,20 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
import javax.jms.JMSException;
import javax.jms.MapMessage;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
import javax.jms.Queue;
import javax.jms.Session;
-import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.queue.PriorityQueue;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -56,17 +59,29 @@ public class AmqpManagementTest extends
_connection.start();
_session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- _queue = _session.createQueue("ADDR:$management");
- _replyAddress = _session.createQueue("ADDR:!response");
- _replyConsumer = _session.createQueue(
- "ADDR:$management ; {assert : never, node: { type: queue }, link:{name: \"!response\"}}");
+ if(isBroker10())
+ {
+ _queue = _session.createQueue("$management");
+ _replyAddress = _session.createTemporaryQueue();
+ _replyConsumer = _replyAddress;
+ }
+ else
+ {
+ _queue = _session.createQueue("ADDR:$management");
+ _replyAddress = _session.createQueue("ADDR:!response");
+ _replyConsumer = _session.createQueue(
+ "ADDR:$management ; {assert : never, node: { type: queue }, link:{name: \"!response\"}}");
+ }
_consumer = _session.createConsumer(_replyConsumer);
_producer = _session.createProducer(_queue);
}
private void setupBrokerManagementConnection() throws Exception
{
- AMQConnectionFactory management = getConnectionFactory("management");
+ ConnectionFactory management =
+ isBroker10() ? getConnectionFactory("default", "$management", UUID.randomUUID().toString())
+ : getConnectionFactory("management");
+
_connection = management.createConnection(GUEST_USERNAME, GUEST_PASSWORD);
setupSession();
}
@@ -98,11 +113,49 @@ public class AmqpManagementTest extends
assertTrue("The response message does not have a status code",
Collections.list(responseMessage.getPropertyNames()).contains("statusCode"));
assertEquals("The response code did not indicate success", 200, responseMessage.getIntProperty("statusCode"));
- assertTrue("The response was not a MapMessage", responseMessage instanceof MapMessage);
- assertNotNull("The response did not include the org.amqp.Management type",
- ((MapMessage) responseMessage).getObject("org.amqp.management"));
- assertNotNull("The response did not include the org.apache.qpid.Port type",
- ((MapMessage) responseMessage).getObject("org.apache.qpid.Port"));
+
+ checkResponseIsMapType(responseMessage);
+ assertNotNull("The response did not include the org.amqp.Management type", getValueFromMapResponse(responseMessage, "org.amqp.management"));
+ assertNotNull("The response did not include the org.apache.qpid.Port type", getValueFromMapResponse(responseMessage, "org.apache.qpid.Port"));
+
+ }
+
+ private void checkResponseIsMapType(final Message responseMessage) throws JMSException
+ {
+ if (isBroker10())
+ {
+ assertTrue("The response was not an Object Message", responseMessage instanceof ObjectMessage);
+ assertTrue("The Object Message did not contain a Map",
+ ((ObjectMessage) responseMessage).getObject() instanceof Map);
+ }
+ else
+ {
+ assertTrue("The response was not a MapMessage", responseMessage instanceof MapMessage);
+ }
+ }
+
+ Object getValueFromMapResponse(final Message responseMessage, String name) throws JMSException
+ {
+ if (isBroker10())
+ {
+ return ((Map)((ObjectMessage)responseMessage).getObject()).get(name);
+ }
+ else
+ {
+ return ((MapMessage) responseMessage).getObject(name);
+ }
+ }
+
+ Collection getMapResponseKeys(final Message responseMessage) throws JMSException
+ {
+ if (isBroker10())
+ {
+ return ((Map)((ObjectMessage)responseMessage).getObject()).keySet();
+ }
+ else
+ {
+ return Collections.list(((MapMessage) responseMessage).getMapNames());
+ }
}
// test get types on $management
@@ -126,12 +179,12 @@ public class AmqpManagementTest extends
assertTrue("The response message does not have a status code",
Collections.list(responseMessage.getPropertyNames()).contains("statusCode"));
assertEquals("The response code did not indicate success", 200, responseMessage.getIntProperty("statusCode"));
- assertTrue("The response was not a MapMessage", responseMessage instanceof MapMessage);
- ArrayList resultMessageKeys = Collections.list(((MapMessage) responseMessage).getMapNames());
+ checkResponseIsMapType(responseMessage);
+ ArrayList resultMessageKeys = new ArrayList(getMapResponseKeys(responseMessage));
assertEquals("The response map has two entries", 2, resultMessageKeys.size());
assertTrue("The response map does not contain attribute names", resultMessageKeys.contains("attributeNames"));
assertTrue("The response map does not contain results ", resultMessageKeys.contains("results"));
- Object attributeNames = ((MapMessage)responseMessage).getObject("attributeNames");
+ Object attributeNames = getValueFromMapResponse(responseMessage, "attributeNames");
assertTrue("The attribute names are not a list", attributeNames instanceof Collection);
Collection attributeNamesCollection = (Collection)attributeNames;
assertTrue("The attribute names do not contain identity", attributeNamesCollection.contains("identity"));
@@ -155,12 +208,12 @@ public class AmqpManagementTest extends
assertTrue("The response message does not have a status code",
Collections.list(responseMessage.getPropertyNames()).contains("statusCode"));
assertEquals("The response code did not indicate success", 200, responseMessage.getIntProperty("statusCode"));
- assertTrue("The response was not a MapMessage", responseMessage instanceof MapMessage);
- resultMessageKeys = Collections.list(((MapMessage) responseMessage).getMapNames());
+ checkResponseIsMapType(responseMessage);
+ resultMessageKeys = new ArrayList(getMapResponseKeys(responseMessage));
assertEquals("The response map has two entries", 2, resultMessageKeys.size());
assertTrue("The response map does not contain attribute names", resultMessageKeys.contains("attributeNames"));
assertTrue("The response map does not contain results ", resultMessageKeys.contains("results"));
- attributeNames = ((MapMessage)responseMessage).getObject("attributeNames");
+ attributeNames = getValueFromMapResponse(responseMessage, "attributeNames");
assertTrue("The attribute names are not a list", attributeNames instanceof Collection);
attributeNamesCollection = (Collection)attributeNames;
assertEquals("The attributeNames are no as expected", Arrays.asList("name", "identity", "type"), attributeNamesCollection);
@@ -181,7 +234,7 @@ public class AmqpManagementTest extends
_producer.send(message);
responseMessage = _consumer.receive(getReceiveTimeout());
- final Collection directExchanges = (Collection) ((MapMessage) responseMessage).getObject("results");
+ final Collection directExchanges = (Collection) getValueFromMapResponse(responseMessage, "results");
assertTrue("There are the same number of results when searching for direct exchanges as when searching for all exchanges", directExchanges.size() < numberOfExchanges);
assertTrue("The list of direct exchanges is not a proper subset of the list of all exchanges", results.containsAll(directExchanges));
}
@@ -320,11 +373,11 @@ public class AmqpManagementTest extends
assertTrue("The response message does not have a status code",
Collections.list(responseMessage.getPropertyNames()).contains("statusCode"));
assertEquals("The response code did not indicate success", 201, responseMessage.getIntProperty("statusCode"));
- assertTrue("The response was not a MapMessage", responseMessage instanceof MapMessage);
- assertEquals("The created queue was not a priority queue", "org.apache.qpid.PriorityQueue", ((MapMessage)responseMessage).getString("type"));
- assertEquals("The created queue was not a standard queue", "priority", ((MapMessage)responseMessage).getString("qpid-type"));
- assertEquals("the created queue did not have the correct number of priorities", 13, ((MapMessage)responseMessage).getInt(PriorityQueue.PRIORITIES));
- Object identity = ((MapMessage) responseMessage).getObject("identity");
+ checkResponseIsMapType(responseMessage);
+ assertEquals("The created queue was not a priority queue", "org.apache.qpid.PriorityQueue", getValueFromMapResponse(responseMessage, "type"));
+ assertEquals("The created queue was not a standard queue", "priority", getValueFromMapResponse(responseMessage, "qpid-type"));
+ assertEquals("the created queue did not have the correct number of priorities", 13, Integer.valueOf(getValueFromMapResponse(responseMessage, PriorityQueue.PRIORITIES).toString()).intValue());
+ Object identity = getValueFromMapResponse(responseMessage, "identity");
// Trying to create a second queue with the same name should cause a conflict
message = _session.createMapMessage();
@@ -355,8 +408,8 @@ public class AmqpManagementTest extends
assertTrue("The response message does not have a status code",
Collections.list(responseMessage.getPropertyNames()).contains("statusCode"));
assertEquals("The response code did not indicate success", 200, responseMessage.getIntProperty("statusCode"));
- assertEquals("the queue did not have the correct number of priorities", 13, ((MapMessage)responseMessage).getInt(PriorityQueue.PRIORITIES));
- assertEquals("the queue did not have the expected path", getTestName(), ((MapMessage)responseMessage).getString("object-path"));
+ assertEquals("the queue did not have the correct number of priorities", 13, Integer.valueOf(getValueFromMapResponse(responseMessage, PriorityQueue.PRIORITIES).toString()).intValue());
+ assertEquals("the queue did not have the expected path", getTestName(), getValueFromMapResponse(responseMessage, "object-path"));
message = _session.createMapMessage();
@@ -374,8 +427,8 @@ public class AmqpManagementTest extends
assertTrue("The response message does not have a status code",
Collections.list(responseMessage.getPropertyNames()).contains("statusCode"));
assertEquals("The response code did not indicate success", 200, responseMessage.getIntProperty("statusCode"));
- assertTrue("The response was not a MapMessage", responseMessage instanceof MapMessage);
- assertEquals("The updated queue did not have the correct alerting threshold", 250L, ((MapMessage)responseMessage).getLong(ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES));
+ checkResponseIsMapType(responseMessage);
+ assertEquals("The updated queue did not have the correct alerting threshold", 250L, Long.valueOf(getValueFromMapResponse(responseMessage, ALERT_THRESHOLD_QUEUE_DEPTH_MESSAGES).toString()).longValue());
message = _session.createMapMessage();
@@ -427,8 +480,8 @@ public class AmqpManagementTest extends
assertTrue("The response message does not have a status code",
Collections.list(responseMessage.getPropertyNames()).contains("statusCode"));
assertEquals("Incorrect response code", 200, responseMessage.getIntProperty("statusCode"));
- assertTrue("The response was not a MapMessage", responseMessage instanceof MapMessage);
- assertEquals("The name of the virtual host is not as expected", "test", ((MapMessage)responseMessage).getString("name"));
+ checkResponseIsMapType(responseMessage);
+ assertEquals("The name of the virtual host is not as expected", "test", getValueFromMapResponse(responseMessage, "name"));
}
// create a virtual host from $management
@@ -514,8 +567,8 @@ public class AmqpManagementTest extends
assertTrue("The response message does not have a status code",
Collections.list(responseMessage.getPropertyNames()).contains("statusCode"));
assertEquals("Incorrect response code", 201, responseMessage.getIntProperty("statusCode"));
- assertTrue("The response was not a MapMessage", responseMessage instanceof MapMessage);
- assertEquals("The created queue did not have the correct type", "org.apache.qpid.LastValueQueue", ((MapMessage)responseMessage).getString("type"));
+ checkResponseIsMapType(responseMessage);
+ assertEquals("The created queue did not have the correct type", "org.apache.qpid.LastValueQueue", getValueFromMapResponse(responseMessage, "type"));
}
// create a queue using the AMQP type
@@ -538,8 +591,8 @@ public class AmqpManagementTest extends
assertTrue("The response message does not have a status code",
Collections.list(responseMessage.getPropertyNames()).contains("statusCode"));
assertEquals("Incorrect response code", 201, responseMessage.getIntProperty("statusCode"));
- assertTrue("The response was not a MapMessage", responseMessage instanceof MapMessage);
- assertEquals("The created queue did not have the correct type", "sorted", ((MapMessage)responseMessage).getString("qpid-type"));
+ checkResponseIsMapType(responseMessage);
+ assertEquals("The created queue did not have the correct type", "sorted", getValueFromMapResponse(responseMessage, "qpid-type"));
}
// attempt to create an exchange without a type
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/ConnectionRestTest.java Thu Nov 24 09:14:51 2016
@@ -32,7 +32,6 @@ import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.servlet.http.HttpServletResponse;
-import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -102,14 +101,14 @@ public class ConnectionRestTest extends
{
List<Map<String, Object>> connections = getRestTestHelper().getJsonAsList("connection");
assertEquals("Unexpected number of connections", 1, connections.size());
- Asserts.assertConnection(connections.get(0), (AMQConnection) _connection);
+ Asserts.assertConnection(connections.get(0), isBroker10() ? 2 : 1);
}
public void testGetVirtualHostConnections() throws Exception
{
List<Map<String, Object>> connections = getRestTestHelper().getJsonAsList("virtualhost/test/test/getConnections");
assertEquals("Unexpected number of connections", 1, connections.size());
- Asserts.assertConnection(connections.get(0), (AMQConnection) _connection);
+ Asserts.assertConnection(connections.get(0), isBroker10() ? 2 : 1);
}
public void testGetConnectionByName() throws Exception
@@ -221,7 +220,7 @@ public class ConnectionRestTest extends
private void assertConnection(Map<String, Object> connectionDetails) throws JMSException
{
- Asserts.assertConnection(connectionDetails, (AMQConnection) _connection);
+ Asserts.assertConnection(connectionDetails, isBroker10() ? 2 : 1);
@SuppressWarnings("unchecked")
Map<String, Object> statistics = (Map<String, Object>) connectionDetails.get(Asserts.STATISTICS_ATTRIBUTE);
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java Thu Nov 24 09:14:51 2016
@@ -74,9 +74,8 @@ public class MessagesRestTest extends Qp
_startTime = System.currentTimeMillis();
_connection = getConnection();
_session = _connection.createSession(true, Session.SESSION_TRANSACTED);
- String queueName = getTestQueueName();
- Destination queue = _session.createQueue(queueName);
- _session.createConsumer(queue).close();
+ Destination queue = createTestQueue(_session);
+ _session.commit();
_producer = _session.createProducer(queue);
_ttl = TimeUnit.DAYS.toMillis(1);
@@ -243,8 +242,8 @@ public class MessagesRestTest extends Qp
{
String queueName = getTestQueueName();
String queueName2 = queueName + "_2";
- Destination queue2 = _session.createQueue(queueName2);
- _session.createConsumer(queue2);
+ Destination queue2 = createTestQueue(_session, queueName2);
+ _session.commit();
// get message IDs
List<Long> ids = getMesssageIds(queueName);
@@ -299,9 +298,8 @@ public class MessagesRestTest extends Qp
{
String queueName = getTestQueueName();
String queueName2 = queueName + "_2";
- Destination queue2 = _session.createQueue(queueName2);
- _session.createConsumer(queue2);
-
+ createTestQueue(_session, queueName2);
+ _session.commit();
// move messages
Map<String, Object> messagesData = new HashMap<>();
@@ -349,9 +347,8 @@ public class MessagesRestTest extends Qp
{
String queueName = getTestQueueName();
String queueName2 = queueName + "_2";
- Destination queue2 = _session.createQueue(queueName2);
- _session.createConsumer(queue2);
-
+ createTestQueue(_session, queueName2);
+ _session.commit();
// get message IDs
List<Long> ids = getMesssageIds(queueName);
@@ -388,9 +385,8 @@ public class MessagesRestTest extends Qp
{
String queueName = getTestQueueName();
String queueName2 = queueName + "_2";
- Destination queue2 = _session.createQueue(queueName2);
- _session.createConsumer(queue2);
-
+ Destination queue2 = createTestQueue(_session, queueName2);
+ _session.commit();
// get message IDs
List<Long> ids = getMesssageIds(queueName);
@@ -443,8 +439,8 @@ public class MessagesRestTest extends Qp
{
String queueName = getTestQueueName();
String queueName2 = queueName + "_2";
- Destination queue2 = _session.createQueue(queueName2);
- _session.createConsumer(queue2);
+ Destination queue2 = createTestQueue(_session, queueName2);
+ _session.commit();
// copy messages
Map<String, Object> messagesData = new HashMap<>();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PublishMessageRestTest.java Thu Nov 24 09:14:51 2016
@@ -19,12 +19,12 @@
*/
package org.apache.qpid.systest.rest;
-import static org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet.SC_UNPROCESSABLE_ENTITY;
-
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -62,9 +62,10 @@ public class PublishMessageRestTest exte
_connection = getConnection();
_connection.start();
- _session = _connection.createSession(true, Session.SESSION_TRANSACTED);
+ _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
_queueName = getTestQueueName();
- Destination queue = _session.createQueue(_queueName);
+ Destination queue = createTestQueue(_session);
+
_consumer = _session.createConsumer(queue);
_publishMessageOpUrl = String.format("virtualhost/%s/%s/publishMessage", TEST1_VIRTUALHOST, TEST1_VIRTUALHOST);
@@ -95,12 +96,23 @@ public class PublishMessageRestTest exte
assertNull("Unexpected JMSCorrelationID", message.getJMSCorrelationID());
assertEquals("Unexpected JMSExpiration", 0, message.getJMSExpiration());
assertNotSame("Unexpected JMSTimestamp", 0, message.getJMSTimestamp());
- assertFalse("Unexpected number of mesage properties", message.getPropertyNames().hasMoreElements());
+
+ // remove any JMSX properties which may be added by the client library
+ ArrayList propertyNames = new ArrayList(Collections.list(message.getPropertyNames()));
+ Iterator iter = propertyNames.iterator();
+ while(iter.hasNext())
+ {
+ if(iter.next().toString().startsWith("JMSX"))
+ {
+ iter.remove();
+ }
+ }
+ assertTrue("Unexpected number of mesage properties: " + propertyNames, propertyNames.isEmpty());
}
public void testPublishMessageWithPropertiesAndHeaders() throws Exception
{
- final String messageId = UUID.randomUUID().toString();
+ final String messageId = "ID:" + UUID.randomUUID().toString();
final long tomorrow = TimeUnit.DAYS.toMillis(1) + System.currentTimeMillis();
final Map<String, Object> headers = new HashMap<>();
headers.put("stringprop", "mystring");
@@ -119,7 +131,7 @@ public class PublishMessageRestTest exte
Message message = _consumer.receive(getLongReceiveTimeout());
assertNotNull("Expected message not received", message);
- final String jmsMessageID = message.getJMSMessageID().replaceFirst("ID:", "");
+ final String jmsMessageID = message.getJMSMessageID();
assertEquals("Unexpected JMSMessageID", messageId, jmsMessageID);
assertEquals("Unexpected JMSExpiration", tomorrow, message.getJMSExpiration());
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java Thu Nov 24 09:14:51 2016
@@ -51,8 +51,6 @@ public class QueueRestTest extends QpidR
private static final int MESSAGE_PAYLOAD_SIZE = 6;
private static final int ENQUEUED_MESSAGES = 1;
private static final int DEQUEUED_MESSAGES = 1;
- private static final int ENQUEUED_BYTES = MESSAGE_PAYLOAD_SIZE;
- private static final int DEQUEUED_BYTES = MESSAGE_PAYLOAD_SIZE;
private Connection _connection;
@@ -61,8 +59,8 @@ public class QueueRestTest extends QpidR
super.setUp();
_connection = getConnection();
Session session = _connection.createSession(true, Session.SESSION_TRANSACTED);
- String queueName = getTestQueueName();
- Destination queue = session.createQueue(queueName);
+ Destination queue = createTestQueue(session);
+ session.commit();
MessageConsumer consumer = session.createConsumer(queue);
MessageProducer producer = session.createProducer(queue);
@@ -89,13 +87,18 @@ public class QueueRestTest extends QpidR
Map<String, Object> queueDetails = getRestTestHelper().find(Queue.NAME, name, queues);
Asserts.assertQueue(name, "standard", queueDetails);
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> bindings = (List<Map<String, Object>>) queueDetails.get(QUEUE_ATTRIBUTE_BINDINGS);
- assertNotNull("Queue bindings are not found", bindings);
- assertEquals("Unexpected number of bindings", 1, bindings.size());
-
- Map<String, Object> directExchangeBinding = getRestTestHelper().find(Binding.EXCHANGE, "amq.direct", bindings);
- Asserts.assertBinding(name, "amq.direct", directExchangeBinding);
+ if(!isBroker10())
+ {
+ @SuppressWarnings("unchecked")
+ List<Map<String, Object>> bindings =
+ (List<Map<String, Object>>) queueDetails.get(QUEUE_ATTRIBUTE_BINDINGS);
+ assertNotNull("Queue bindings are not found", bindings);
+ assertEquals("Unexpected number of bindings", 1, bindings.size());
+
+ Map<String, Object> directExchangeBinding =
+ getRestTestHelper().find(Binding.EXCHANGE, "amq.direct", bindings);
+ Asserts.assertBinding(name, "amq.direct", directExchangeBinding);
+ }
}
}
@@ -106,14 +109,21 @@ public class QueueRestTest extends QpidR
Asserts.assertQueue(queueName, "standard", queueDetails);
assertStatistics(queueDetails);
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> bindings = (List<Map<String, Object>>) queueDetails.get(QUEUE_ATTRIBUTE_BINDINGS);
- assertNotNull("Queue bindings are not found", bindings);
- assertEquals("Unexpected number of bindings", 1, bindings.size());
-
- Map<String, Object> directExchangeBinding = getRestTestHelper().find(Binding.EXCHANGE, "amq.direct", bindings);
- Asserts.assertBinding(queueName, "amq.direct", directExchangeBinding);
+ // For 1.0 we won't have bound the queue to an exchange
+ if(!isBroker10())
+ {
+ @SuppressWarnings("unchecked")
+ List<Map<String, Object>> bindings = (List<Map<String, Object>>) queueDetails.get(QUEUE_ATTRIBUTE_BINDINGS);
+ assertNotNull("Queue bindings are not found", bindings);
+ assertEquals("Unexpected number of bindings", isBroker10() ? 0 : 1, bindings.size());
+ if (!isBroker10())
+ {
+ Map<String, Object> directExchangeBinding =
+ getRestTestHelper().find(Binding.EXCHANGE, "amq.direct", bindings);
+ Asserts.assertBinding(queueName, "amq.direct", directExchangeBinding);
+ }
+ }
@SuppressWarnings("unchecked")
List<Map<String, Object>> consumers = (List<Map<String, Object>>) queueDetails.get(QUEUE_ATTRIBUTE_CONSUMERS);
assertNotNull("Queue consumers are not found", consumers);
@@ -176,7 +186,7 @@ public class QueueRestTest extends QpidR
@SuppressWarnings("unchecked")
List<Map<String, Object>> bindings = (List<Map<String, Object>>) queueDetails.get(QUEUE_ATTRIBUTE_BINDINGS);
assertNotNull("Queue bindings are not found", bindings);
- assertEquals("Unexpected number of bindings", exchanges.length + 1, bindings.size());
+ assertEquals("Unexpected number of bindings", exchanges.length + (isBroker10() ? 0 : 1), bindings.size());
Map<String, Object> searchAttributes = new HashMap<String, Object>();
searchAttributes.put(Binding.NAME, bindingName);
@@ -241,20 +251,20 @@ public class QueueRestTest extends QpidR
statistics.get("consumerCount"));
assertEquals("Unexpected queue statistics attribute " + "consumerCountWithCredit", 1,
statistics.get("consumerCountWithCredit"));
- assertEquals("Unexpected queue statistics attribute " + "bindingCount", 1, statistics.get("bindingCount"));
+ assertEquals("Unexpected queue statistics attribute " + "bindingCount", isBroker10() ? 0 : 1, statistics.get("bindingCount"));
assertEquals("Unexpected queue statistics attribute " + "persistentDequeuedMessages", DEQUEUED_MESSAGES,
statistics.get("persistentDequeuedMessages"));
assertEquals("Unexpected queue statistics attribute " + "totalDequeuedMessages", DEQUEUED_MESSAGES,
statistics.get("totalDequeuedMessages"));
- assertEquals("Unexpected queue statistics attribute " + "totalDequeuedBytes", DEQUEUED_BYTES,
+ assertEquals("Unexpected queue statistics attribute " + "totalDequeuedBytes", isBroker10() ? 164 : MESSAGE_PAYLOAD_SIZE,
statistics.get("totalDequeuedBytes"));
- assertEquals("Unexpected queue statistics attribute " + "persistentDequeuedBytes", DEQUEUED_BYTES,
+ assertEquals("Unexpected queue statistics attribute " + "persistentDequeuedBytes", isBroker10() ? 164 : MESSAGE_PAYLOAD_SIZE,
statistics.get("totalDequeuedBytes"));
- assertEquals("Unexpected queue statistics attribute " + "persistentEnqueuedBytes", ENQUEUED_BYTES
- + DEQUEUED_BYTES, statistics.get("persistentEnqueuedBytes"));
- assertEquals("Unexpected queue statistics attribute " + "totalEnqueuedBytes", ENQUEUED_BYTES + DEQUEUED_BYTES,
+ assertEquals("Unexpected queue statistics attribute " + "persistentEnqueuedBytes", isBroker10() ? 328 : 2*MESSAGE_PAYLOAD_SIZE,
+ statistics.get("persistentEnqueuedBytes"));
+ assertEquals("Unexpected queue statistics attribute " + "totalEnqueuedBytes", isBroker10() ? 328 : 2*MESSAGE_PAYLOAD_SIZE,
statistics.get("totalEnqueuedBytes"));
- assertEquals("Unexpected queue statistics attribute " + "queueDepthBytes", ENQUEUED_BYTES,
+ assertEquals("Unexpected queue statistics attribute " + "queueDepthBytes", isBroker10() ? 164 : MESSAGE_PAYLOAD_SIZE,
statistics.get("queueDepthBytes"));
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java Thu Nov 24 09:14:51 2016
@@ -37,7 +37,6 @@ import javax.servlet.http.HttpServletRes
import org.junit.Assert;
-import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
@@ -57,7 +56,7 @@ public class VirtualHostRestTest extends
public static final String EMPTY_VIRTUALHOSTNODE_NAME = "emptyVHN";
- private AMQConnection _connection;
+ private Connection _connection;
@Override
protected void customizeConfiguration() throws Exception
@@ -81,9 +80,9 @@ public class VirtualHostRestTest extends
public void testGetHost() throws Exception
{
// create AMQP connection to get connection JSON details
- _connection = (AMQConnection) getConnection();
- Session session = _connection.createSession(true, Session.SESSION_TRANSACTED);
- session.createConsumer(getTestQueue());
+ _connection = getConnection();
+ Session session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ createTestQueue(session);
Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("virtualhost/test");
Asserts.assertVirtualHost("test", hostDetails);
@@ -114,7 +113,7 @@ public class VirtualHostRestTest extends
@SuppressWarnings("unchecked")
List<Map<String, Object>> connections = getRestTestHelper().getJsonAsList("virtualhost/test/test/getConnections");
assertEquals("Unexpected number of connections", 1, connections.size());
- Asserts.assertConnection(connections.get(0), _connection);
+ Asserts.assertConnection(connections.get(0), isBroker10() ? 2 : 1);
}
public void testCreateProvidedVirtualHost() throws Exception
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java Thu Nov 24 09:14:51 2016
@@ -335,7 +335,7 @@ public class AddressBasedDestinationTest
setTestSystemProperty("test.port.alt", String.valueOf(alternativePort));
- AMQConnection connection = null;
+ Connection connection = null;
try
{
connection = getConnectionFactory("failover").createConnection(GUEST_USERNAME, GUEST_PASSWORD);
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/JMSXUserIDTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/JMSXUserIDTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/JMSXUserIDTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/JMSXUserIDTest.java Thu Nov 24 09:14:51 2016
@@ -35,8 +35,8 @@ public class JMSXUserIDTest extends Qpid
public void testJMSXUserIDIsSetByDefault() throws Exception
{
Connection connection = getConnection();
- Destination destination = getTestQueue();
Session session = connection.createSession(true, Session.SESSION_TRANSACTED);
+ Destination destination = createTestQueue(session);
MessageConsumer consumer = session.createConsumer(destination);
MessageProducer producer = session.createProducer(destination);
TextMessage message = session.createTextMessage("test");
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java Thu Nov 24 09:14:51 2016
@@ -20,11 +20,6 @@
*/
package org.apache.qpid.test.unit.basic;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-
import javax.jms.Connection;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
@@ -32,6 +27,9 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+
/**
* @author Apache Software Foundation
*/
@@ -54,14 +52,14 @@ public class PubSubTwoConnectionTest ext
public void testTwoConnections() throws Exception
{
- AMQConnection con1 = (AMQConnection) getConnection("guest", "guest");
+ Connection con1 = getConnection("guest", "guest");
- Topic topic = new AMQTopic(con1, "MyTopic");
+ Topic topic = createTopic(con1, "MyTopic");
Session session1 = con1.createSession(false, AMQSession.NO_ACKNOWLEDGE);
MessageProducer producer = session1.createProducer(topic);
- Connection con2 = (AMQConnection) getConnection("guest", "guest") ;
+ Connection con2 = getConnection("guest", "guest") ;
Session session2 = con2.createSession(false, AMQSession.NO_ACKNOWLEDGE);
MessageConsumer consumer = session2.createConsumer(topic);
con2.start();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java Thu Nov 24 09:14:51 2016
@@ -20,8 +20,13 @@
*/
package org.apache.qpid.test.unit.client;
+import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.QueueReceiver;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.jms.TopicSession;
import javax.jms.TopicSubscriber;
import org.apache.qpid.AMQChannelClosedException;
@@ -29,7 +34,6 @@ import org.apache.qpid.client.AMQConnect
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.AMQTopic;
import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.protocol.ErrorCodes;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -38,26 +42,27 @@ import org.apache.qpid.test.utils.QpidBr
public class AMQSessionTest extends QpidBrokerTestCase
{
- private static AMQSession _session;
- private static AMQTopic _topic;
+ private static Session _session;
+ private static Topic _topic;
private static AMQQueue _queue;
- private static AMQConnection _connection;
+ private static Connection _connection;
protected void setUp() throws Exception
{
super.setUp();
- _connection = (AMQConnection) getConnection();
- _topic = new AMQTopic(_connection, "mytopic");
- _queue = new AMQQueue(_connection, "myqueue");
- _session = (AMQSession) _connection.createSession(true, AMQSession.SESSION_TRANSACTED);
+ _connection = getConnection();
+ _topic = createTopic(_connection, "mytopic");
+ _queue = new AMQQueue((AMQConnection) _connection, "myqueue");
+ _session = _connection.createSession(true, AMQSession.SESSION_TRANSACTED);
}
public void testCreateSubscriber() throws JMSException
{
- TopicSubscriber subscriber = _session.createSubscriber(_topic);
+ TopicSession topicSession = (TopicSession)_session;
+ TopicSubscriber subscriber = topicSession.createSubscriber(_topic);
assertEquals("Topic names should match from TopicSubscriber", _topic.getTopicName(), subscriber.getTopic().getTopicName());
- subscriber = _session.createSubscriber(_topic, "abc", false);
+ subscriber = topicSession.createSubscriber(_topic, "abc", false);
assertEquals("Topic names should match from TopicSubscriber with selector",
_topic.getTopicName(),
subscriber.getTopic().getTopicName());
@@ -74,43 +79,38 @@ public class AMQSessionTest extends Qpid
_session.unsubscribe("mysubname2");
}
- public void testCreateQueueReceiver() throws JMSException
- {
- QueueReceiver receiver = _session.createQueueReceiver(_queue);
- assertEquals("Queue names should match from QueueReceiver", _queue.getQueueName(), receiver.getQueue().getQueueName());
-
- receiver = _session.createQueueReceiver(_queue, "abc");
- assertEquals("Queue names should match from QueueReceiver with selector", _queue.getQueueName(), receiver.getQueue().getQueueName());
- }
public void testCreateReceiver() throws JMSException
{
- QueueReceiver receiver = _session.createReceiver(_queue);
+ QueueSession session = (QueueSession) _session;
+
+ QueueReceiver receiver = session.createReceiver(_queue);
assertEquals("Queue names should match from QueueReceiver", _queue.getQueueName(), receiver.getQueue().getQueueName());
- receiver = _session.createReceiver(_queue, "abc");
+ receiver = session.createReceiver(_queue, "abc");
assertEquals("Queue names should match from QueueReceiver with selector", _queue.getQueueName(), receiver.getQueue().getQueueName());
}
public void testQueueDepthForQueueWithDepth() throws Exception
{
AMQDestination dest = (AMQDestination) _session.createQueue(getTestQueueName());
+ AMQSession amqSession = (AMQSession)_session;
_session.createConsumer(dest).close();
-
- long depth = _session.getQueueDepth(dest);
+ long depth = amqSession.getQueueDepth(dest);
assertEquals("Unexpected queue depth for empty queue", 0 , depth);
sendMessage(_session, dest, 1);
- depth = _session.getQueueDepth(dest);
+ depth = amqSession.getQueueDepth(dest);
assertEquals("Unexpected queue depth for empty queue", 1, depth);
}
public void testQueueDepthForQueueThatDoesNotExist() throws Exception
{
AMQDestination dest = (AMQDestination) _session.createQueue(getTestQueueName());
+ AMQSession amqSession = (AMQSession)_session;
- long depth = _session.getQueueDepth(dest);
+ long depth = amqSession.getQueueDepth(dest);
assertEquals("Unexpected queue depth for non-existent queue", 0 , depth);
}
@@ -119,13 +119,14 @@ public class AMQSessionTest extends Qpid
_session.close();
setTestClientSystemProperty(ClientProperties.QPID_USE_LEGACY_GETQUEUEDEPTH_BEHAVIOUR, "true");
- _session = (AMQSession) _connection.createSession(true, AMQSession.SESSION_TRANSACTED);
+ _session = _connection.createSession(true, AMQSession.SESSION_TRANSACTED);
+ AMQSession amqSession = (AMQSession)_session;
AMQDestination dest = (AMQDestination) _session.createQueue(getTestQueueName());
try
{
- _session.getQueueDepth(dest);
+ amqSession.getQueueDepth(dest);
fail("Exception not thrown");
}
catch(AMQChannelClosedException cce)
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java?rev=1771095&r1=1771094&r2=1771095&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java Thu Nov 24 09:14:51 2016
@@ -21,10 +21,6 @@
package org.apache.qpid.test.unit.client.temporaryqueue;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -34,6 +30,10 @@ import javax.jms.Session;
import javax.jms.TemporaryQueue;
import javax.jms.TextMessage;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+
/**
* Tests the behaviour of {@link TemporaryQueue}.
*/
@@ -77,7 +77,7 @@ public class TemporaryQueueTest extends
catch (JMSException je)
{
//pass
- assertEquals("Cannot consume from a temporary destination created on another connection", je.getMessage());
+ assertEquals(isBroker10() ? "Can't consume from a temporary destination created using another connection" : "Cannot consume from a temporary destination created on another connection", je.getMessage());
}
}
@@ -185,7 +185,14 @@ public class TemporaryQueueTest extends
catch (JMSException je)
{
//pass
- assertEquals("Temporary Queue has consumers so cannot be deleted", je.getMessage());
+ if(isBroker10())
+ {
+ assertEquals("A consumer is consuming from the temporary destination", je.getMessage());
+ }
+ else
+ {
+ assertEquals("Temporary Queue has consumers so cannot be deleted", je.getMessage());
+ }
}
consumer.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org