You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/02/23 17:11:05 UTC
svn commit: r1784178 [3/3] - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/logging/messages/
broker-core/src/main/java/org/apache/qpid/server/message/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/...
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java?rev=1784178&r1=1784177&r2=1784178&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/QueueRestACLTest.java Thu Feb 23 17:11:04 2017
@@ -126,15 +126,13 @@ public class QueueRestACLTest extends Qp
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(Queue.NAME, _queueName);
- attributes.put(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 100000);
- attributes.put(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 80000);
+ attributes.put(Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES, 100000);
responseCode = getRestTestHelper().submitRequest(_queueUrl, "PUT", attributes);
assertEquals("Setting of queue attribites should be allowed", 200, responseCode);
Map<String, Object> queueData = getRestTestHelper().getJsonAsSingletonList(_queueUrl);
- assertEquals("Unexpected " + Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 100000, queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES) );
- assertEquals("Unexpected " + Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 80000, queueData.get(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES) );
+ assertEquals("Unexpected " + Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES, 100000, queueData.get(Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES));
}
public void testSetQueueAttributesDenied() throws Exception
@@ -148,15 +146,13 @@ public class QueueRestACLTest extends Qp
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(Queue.NAME, _queueName);
- attributes.put(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 100000);
- attributes.put(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 80000);
+ attributes.put(Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES, 100000);
responseCode = getRestTestHelper().submitRequest(_queueUrl, "PUT", attributes);
assertEquals("Setting of queue attribites should be allowed", 403, responseCode);
Map<String, Object> queueData = getRestTestHelper().getJsonAsSingletonList(_queueUrl);
- assertEquals("Unexpected " + Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 0, queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES) );
- assertEquals("Unexpected " + Queue.QUEUE_FLOW_RESUME_SIZE_BYTES, 0, queueData.get(Queue.QUEUE_FLOW_RESUME_SIZE_BYTES) );
+ assertEquals("Unexpected " + Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES, -1, queueData.get(Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES));
}
private int createQueue() 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=1784178&r1=1784177&r2=1784178&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 Feb 23 17:11:04 2017
@@ -877,10 +877,12 @@ public class AddressBasedDestinationTest
prod.send(ssn.createTextMessage("Test2"));
TextMessage msg = (TextMessage)browseCons.receive(1000);
- assertEquals("Didn't receive the first message",msg.getText(),"Test1");
+ assertNotNull("Didn't receive the first message", msg);
+ assertEquals("Unexpected first message", msg.getText(),"Test1");
msg = (TextMessage)browseCons.receive(1000);
- assertEquals("Didn't receive the first message",msg.getText(),"Test2");
+ assertNotNull("Didn't receive the second message", msg);
+ assertEquals("Unexpected second message",msg.getText(),"Test2");
browseCons.close();
prod.send(ssn.createTextMessage("Test3"));
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java?rev=1784178&r1=1784177&r2=1784178&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java Thu Feb 23 17:11:04 2017
@@ -27,16 +27,12 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class QueuePolicyTest extends QpidBrokerTestCase
{
- private static final Logger _logger = LoggerFactory.getLogger(QueuePolicyTest.class);
private Connection _connection;
@Override
@@ -112,10 +108,12 @@ public class QueuePolicyTest extends Qpi
_connection.start();
TextMessage msg = (TextMessage)consumer.receive(1000);
- assertEquals("The consumer should receive the msg with body='Test2'","Test2",msg.getText());
+ assertNotNull("The consumer should receive the msg with body='Test2'", msg);
+ assertEquals("Unexpected first message","Test2",msg.getText());
msg = (TextMessage)consumer.receive(1000);
- assertEquals("The consumer should receive the msg with body='Test3'","Test3",msg.getText());
+ assertNotNull("The consumer should receive the msg with body='Test3'", msg);
+ assertEquals("Unexpected second message","Test3", msg.getText());
}
protected void assertAMQException(final String message, final int expected, final AMQException e)
Modified: qpid/java/trunk/test-profiles/Java10Excludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1784178&r1=1784177&r2=1784178&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10Excludes (original)
+++ qpid/java/trunk/test-profiles/Java10Excludes Thu Feb 23 17:11:04 2017
@@ -23,6 +23,7 @@ org.apache.qpid.jndi.PropertiesFileIniti
// Exclude Address based tests
org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#*
org.apache.qpid.test.client.destination.AddressBasedDestinationTest#*
+org.apache.qpid.test.client.queue.QueuePolicyTest#*
// Exclude Tests requiring XA
org.apache.qpid.test.unit.xa.FaultTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org