Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java?rev=1515079&r1=1515078&r2=1515079&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java Sun Aug 18 09:13:02 2013 @@ -28,6 +28,7 @@ import org.apache.qpid.management.common import org.apache.qpid.management.common.mbeans.ManagedQueue; import org.apache.qpid.server.queue.AMQQueueFactory; import org.apache.qpid.server.queue.NotificationCheckTest; +import org.apache.qpid.server.queue.QueueArgumentsConverter; import org.apache.qpid.server.queue.SimpleAMQQueue; import org.apache.qpid.server.queue.SimpleAMQQueueTest; import org.apache.qpid.test.client.destination.AddressBasedDestinationTest; @@ -168,7 +169,7 @@ public class QueueManagementTest extends public void testNewQueueWithDescription() throws Exception { String queueName = getTestQueueName(); - Map<String, Object> arguments = Collections.singletonMap(AMQQueueFactory.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION); + Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION); ((AMQSession<?, ?>)_session).createQueue(AMQShortString.valueOf(queueName), false, true, false, arguments); final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName); @@ -181,7 +182,7 @@ public class QueueManagementTest extends public void testQueueDescriptionSurvivesRestart() throws Exception { String queueName = getTestQueueName(); - Map<String, Object> arguments = Collections.singletonMap(AMQQueueFactory.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION); + Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.X_QPID_DESCRIPTION, (Object)TEST_QUEUE_DESCRIPTION); ((AMQSession<?, ?>)_session).createQueue(AMQShortString.valueOf(queueName), false, true, false, arguments); @@ -195,7 +196,7 @@ public class QueueManagementTest extends } /** - * Tests queue creation with {@link AMQQueueFactory#X_QPID_MAXIMUM_DELIVERY_COUNT} argument. Also tests + * Tests queue creation with {@link QueueArgumentsConverter#X_QPID_MAXIMUM_DELIVERY_COUNT} argument. Also tests * that the attribute is exposed correctly through {@link ManagedQueue#getMaximumDeliveryCount()}. */ public void testCreateQueueWithMaximumDeliveryCountSet() throws Exception @@ -204,7 +205,7 @@ public class QueueManagementTest extends final ManagedBroker managedBroker = _jmxUtils.getManagedBroker(VIRTUAL_HOST); final Integer deliveryCount = 1; - final Map<String, Object> arguments = Collections.singletonMap(AMQQueueFactory.X_QPID_MAXIMUM_DELIVERY_COUNT, (Object)deliveryCount); + final Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.X_QPID_MAXIMUM_DELIVERY_COUNT, (Object)deliveryCount); managedBroker.createNewQueue(queueName, null, true, arguments); // Ensure the queue exists @@ -225,10 +226,10 @@ public class QueueManagementTest extends final Long maximumQueueDepth = 300l; final Long maximumMessageAge = 400l; final Map<String, Object> arguments = new HashMap<String, Object>(); - arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_MESSAGE_COUNT, maximumMessageCount); - arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_MESSAGE_SIZE, maximumMessageSize); - arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_QUEUE_DEPTH, maximumQueueDepth); - arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_MESSAGE_AGE, maximumMessageAge); + arguments.put(QueueArgumentsConverter.X_QPID_MAXIMUM_MESSAGE_COUNT, maximumMessageCount); + arguments.put(QueueArgumentsConverter.X_QPID_MAXIMUM_MESSAGE_SIZE, maximumMessageSize); + arguments.put(QueueArgumentsConverter.X_QPID_MAXIMUM_QUEUE_DEPTH, maximumQueueDepth); + arguments.put(QueueArgumentsConverter.X_QPID_MAXIMUM_MESSAGE_AGE, maximumMessageAge); managedBroker.createNewQueue(queueName, null, true, arguments); @@ -642,7 +643,7 @@ public class QueueManagementTest extends final ManagedBroker managedBroker = _jmxUtils.getManagedBroker(VIRTUAL_HOST); final Object messageGroupKey = "test"; - final Map<String, Object> arguments = Collections.singletonMap(SimpleAMQQueue.QPID_GROUP_HEADER_KEY, messageGroupKey); + final Map<String, Object> arguments = Collections.singletonMap(QueueArgumentsConverter.QPID_GROUP_HEADER_KEY, messageGroupKey); managedBroker.createNewQueue(queueName, null, true, arguments); final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName); @@ -659,8 +660,8 @@ public class QueueManagementTest extends final Object messageGroupKey = "test"; final Map<String, Object> arguments = new HashMap<String, Object>(2); - arguments.put(SimpleAMQQueue.QPID_GROUP_HEADER_KEY, messageGroupKey); - arguments.put(SimpleAMQQueue.QPID_SHARED_MSG_GROUP, SimpleAMQQueue.SHARED_MSG_GROUP_ARG_VALUE); + arguments.put(QueueArgumentsConverter.QPID_GROUP_HEADER_KEY, messageGroupKey); + arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP, SimpleAMQQueue.SHARED_MSG_GROUP_ARG_VALUE); managedBroker.createNewQueue(queueName, null, true, arguments); final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java?rev=1515079&r1=1515078&r2=1515079&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java Sun Aug 18 09:13:02 2013 @@ -37,6 +37,7 @@ import org.apache.qpid.server.model.Exch import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.queue.AMQQueueFactory; +import org.apache.qpid.server.queue.QueueArgumentsConverter; import org.apache.qpid.server.virtualhost.StandardVirtualHostFactory; import org.apache.qpid.test.utils.TestFileUtils; import org.apache.qpid.util.FileUtils; @@ -291,7 +292,7 @@ public class VirtualHostRestTest extends Asserts.assertQueue(queueName , "lvq", lvqQueue); assertEquals("Unexpected value of queue attribute " + Queue.DURABLE, Boolean.TRUE, lvqQueue.get(Queue.DURABLE)); - assertEquals("Unexpected lvq key attribute", AMQQueueFactory.QPID_LVQ_KEY, lvqQueue.get(Queue.LVQ_KEY)); + assertEquals("Unexpected lvq key attribute", AMQQueueFactory.QPID_DEFAULT_LVQ_KEY, lvqQueue.get(Queue.LVQ_KEY)); } public void testPutCreateSortedQueueWithoutKey() throws Exception @@ -460,7 +461,7 @@ public class VirtualHostRestTest extends String queueName = getTestQueueName(); Map<String, Object> attributes = new HashMap<String, Object>(); - attributes.put(AMQQueueFactory.X_QPID_DLQ_ENABLED, true); + attributes.put(Queue.CREATE_DLQ_ON_CREATION, true); //verify the starting state Map<String, Object> hostDetails = getRestTestHelper().getJsonAsSingletonList("/rest/virtualhost/test"); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java?rev=1515079&r1=1515078&r2=1515079&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java Sun Aug 18 09:13:02 2013 @@ -200,8 +200,8 @@ public class AddressBasedDestinationTest "{" + "exclusive: true," + "arguments: {" + - "'qpid.max_size': 1000," + - "'qpid.max_count': 100" + + "'qpid.alert_size': 1000," + + "'qpid.alert_count': 100" + "}" + "}, " + "x-bindings: [{exchange : 'amq.direct', key : test}, " + @@ -401,7 +401,7 @@ public class AddressBasedDestinationTest "x-declare: " + "{ " + "auto-delete: true," + - "arguments: {'qpid.max_count': 100}" + + "arguments: {'qpid.alert_count': 100}" + "}, " + "x-bindings: [{exchange : 'amq.direct', key : test}, " + "{exchange : 'amq.topic', key : 'a.#'}," + @@ -485,7 +485,7 @@ public class AddressBasedDestinationTest { Hashtable<String,String> map = new Hashtable<String,String>(); map.put("destination.myQueue1", "ADDR:my-queue/hello; {create: always, node: " + - "{x-declare: {auto-delete: true, arguments : {'qpid.max_size': 1000}}}}"); + "{x-declare: {auto-delete: true, arguments : {'qpid.alert_size': 1000}}}}"); map.put("destination.myQueue2", "ADDR:my-queue2; { create: receiver }"); @@ -603,7 +603,7 @@ public class AddressBasedDestinationTest String addr = "ADDR:amq.direct/x512; {" + "link : {name : 'MY.RESP.QUEUE', " + "x-declare : { auto-delete: true, exclusive: true, " + - "arguments : {'qpid.max_size': 1000, 'qpid.policy_type': ring} } } }"; + "arguments : {'qpid.alert_size': 1000, 'qpid.policy_type': ring} } } }"; queue = ssn.createQueue(addr); cons = ssn.createConsumer(queue); @@ -1403,7 +1403,7 @@ public class AddressBasedDestinationTest Session ssn = _connection.createSession(false,Session.AUTO_ACKNOWLEDGE); String xDeclareArgs = "x-declare: { exclusive: false, auto-delete: false," + "alternate-exchange: 'amq.fanout'," + - "arguments: {'qpid.max_size': 1000,'qpid.max_count': 100}" + + "arguments: {'qpid.alert_size': 1000,'qpid.alert_count': 100}" + "}"; String addr = "ADDR:amq.topic/test; {link: {name:my-queue, durable:true," + xDeclareArgs + "}}"; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
