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/15 10:41:20 UTC
svn commit: r1769772 [2/2] - in /qpid/java/branches/remove-queue-runner: ./
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/queue/
broker-plugins/management-http/src/main/java/resources/ broker-p...
Modified: qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java?rev=1769772&r1=1769771&r2=1769772&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java (original)
+++ qpid/java/branches/remove-queue-runner/systests/src/test/java/org/apache/qpid/systest/rest/MessagesRestTest.java Tue Nov 15 10:41:20 2016
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import javax.jms.BytesMessage;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
@@ -37,6 +38,7 @@ import javax.jms.MapMessage;
import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.Session;
+import javax.jms.StreamMessage;
import javax.servlet.http.HttpServletResponse;
import org.apache.qpid.jms.ListMessage;
@@ -51,9 +53,13 @@ public class MessagesRestTest extends Qp
* Message number to publish into queue
*/
private static final int MESSAGE_NUMBER = 12;
- public static final String STRING_PROP = "shortstring";
+ private static final String STRING_PROP = "shortstring";
// Dollar Pound Euro: 1 byte, 2 byte, and 3 byte UTF-8 encodings respectively
- public static final String STRING_VALUE = "\u0024 \u00A3 \u20AC";
+ private static final String STRING_VALUE = "\u0024 \u00A3 \u20AC";
+ private static final String GET_MESSAGE_CONTENT_BY_ID =
+ "queue/test/test/%s/getMessageContent?returnJson=%s&messageId=%d";
+ private static final String GET_MESSAGE_INFO_BY_ID = "queue/test/test/%s/getMessageInfoById?messageId=%d";
+ private static final String GET_MESSAGE_INFO = "queue/test/test/%s/getMessageInfo";
private Connection _connection;
private Session _session;
@@ -61,6 +67,7 @@ public class MessagesRestTest extends Qp
private long _startTime;
private long _ttl;
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -97,13 +104,13 @@ public class MessagesRestTest extends Qp
getDefaultBrokerConfiguration().setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT,
HttpPort.ALLOW_CONFIDENTIAL_OPERATIONS_ON_INSECURE_CHANNELS,
true);
-
}
public void testGet() throws Exception
{
String queueName = getTestQueueName();
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", MESSAGE_NUMBER, messages.size());
int position = 0;
@@ -127,16 +134,21 @@ public class MessagesRestTest extends Qp
// get message IDs
Long lastMessageId = getLastMessageIdAndVerifyMimeType(queueName, "text/plain");
- Map<String, Object> message = getRestTestHelper().getJsonAsMap("queue/test/test/" + queueName + "/getMessageInfoById?messageId=" + lastMessageId);
+ Map<String, Object> message = getRestTestHelper().getJsonAsMap(String.format(GET_MESSAGE_INFO_BY_ID,
+ queueName,
+ lastMessageId));
@SuppressWarnings("unchecked")
Map<String, Object> messageHeader = (Map<String, Object>) message.get("headers");
assertNotNull("Message headers are not found", messageHeader);
assertEquals("Unexpected message header value", STRING_VALUE, messageHeader.get(STRING_PROP));
// get content
- byte[] data = getRestTestHelper().getBytes("queue/test/test/" + queueName + "/getMessageContent?messageId=" + lastMessageId);
- assertTrue("Unexpected message for id " + lastMessageId + ":" + data.length, Arrays.equals(STRING_VALUE.getBytes(StandardCharsets.UTF_8), data));
-
+ byte[] data = getRestTestHelper().getBytes(String.format(GET_MESSAGE_CONTENT_BY_ID,
+ queueName,
+ false,
+ lastMessageId));
+ assertTrue("Unexpected message for id " + lastMessageId + ":" + data.length,
+ Arrays.equals(STRING_VALUE.getBytes(StandardCharsets.UTF_8), data));
}
public void testGetMapMessageContentAsJson() throws Exception
@@ -150,15 +162,62 @@ public class MessagesRestTest extends Qp
Long lastMessageId = getLastMessageIdAndVerifyMimeType(queueName, "amqp/map");
- Map<String, Object> jsonMessageData = getRestTestHelper().getJsonAsMap("queue/test/test/"
- + queueName
- + "/getMessageContent?returnJson=true&messageId="
- + lastMessageId);
+ Map<String, Object> jsonMessageData = getRestTestHelper().getJsonAsMap(String.format(
+ GET_MESSAGE_CONTENT_BY_ID,
+ queueName,
+ true,
+ lastMessageId));
assertEquals("Unexpected map content size", 2, jsonMessageData.size());
assertEquals("Unexpected testStringProperty", "My String", jsonMessageData.get("testStringProperty"));
assertEquals("Unexpected testIntProperty", 999999, jsonMessageData.get("testIntProperty"));
}
+ public void testGetStreamMessageContentAsJson() throws Exception
+ {
+ String queueName = getTestQueueName();
+ StreamMessage streamMessage = _session.createStreamMessage();
+ streamMessage.writeLong(Long.MAX_VALUE);
+ streamMessage.writeBoolean(true);
+ streamMessage.writeString("Hello world");
+ _producer.send(streamMessage);
+ _session.commit();
+
+ Long lastMessageId = getLastMessageIdAndVerifyMimeType(queueName, "jms/stream-message");
+
+ List<Object> jsonMessageData = getRestTestHelper().getJsonAsSimpleList(String.format(
+ GET_MESSAGE_CONTENT_BY_ID,
+ queueName,
+ true,
+ lastMessageId));
+ assertEquals("Unexpected list content size", 3, jsonMessageData.size());
+ assertEquals("Unexpected value at index 0", Long.MAX_VALUE, jsonMessageData.get(0));
+ assertEquals("Unexpected value at index 1", true, jsonMessageData.get(1));
+ assertEquals("Unexpected value at index 2", "Hello world", jsonMessageData.get(2));
+ }
+
+ public void testGetBytesMessageContentAsJson() throws Exception
+ {
+ String queueName = getTestQueueName();
+ BytesMessage bytesMessage = _session.createBytesMessage();
+ final byte[] payloadBytes = {1, 2, 3, 4};
+ bytesMessage.writeBytes(payloadBytes);
+ _producer.send(bytesMessage);
+ _session.commit();
+
+ Long lastMessageId = getLastMessageIdAndVerifyMimeType(queueName, "application/octet-stream");
+
+ List<Object> jsonMessageData = getRestTestHelper().getJsonAsSimpleList(String.format(
+ GET_MESSAGE_CONTENT_BY_ID,
+ queueName,
+ true,
+ lastMessageId));
+ assertEquals("Unexpected list content size", payloadBytes.length, jsonMessageData.size());
+ for(int i = 0; i < payloadBytes.length; i++)
+ {
+ assertEquals("Unexpected value at index " + i, ((Number)payloadBytes[i]).intValue(), jsonMessageData.get(i));
+ }
+ }
+
public void testGetListMessageContentAsJson() throws Exception
{
String queueName = getTestQueueName();
@@ -170,13 +229,14 @@ public class MessagesRestTest extends Qp
Long lastMessageId = getLastMessageIdAndVerifyMimeType(queueName, "amqp/list");
- List<Object> jsonMessageData = getRestTestHelper().getJsonAsSimpleList("queue/test/test/"
- + queueName
- + "/getMessageContent?returnJson=true&messageId="
- + lastMessageId);
- assertEquals("Unexpected map content size", 2, jsonMessageData.size());
- assertEquals("Unexpected value at index 1", "My String", jsonMessageData.get(1));
+ List<Object> jsonMessageData = getRestTestHelper().getJsonAsSimpleList(String.format(
+ GET_MESSAGE_CONTENT_BY_ID,
+ queueName,
+ true,
+ lastMessageId));
+ assertEquals("Unexpected list size", 2, jsonMessageData.size());
assertEquals("Unexpected value at index 0", 999999, jsonMessageData.get(0));
+ assertEquals("Unexpected value at index 1", "My String", jsonMessageData.get(1));
}
public void testPostMoveMessages() throws Exception
@@ -203,11 +263,14 @@ public class MessagesRestTest extends Qp
messagesData.put("messageIds", movedMessageIds);
messagesData.put("destination", queueName2);
-
- getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/moveMessages", "POST", messagesData, HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/moveMessages",
+ "POST",
+ messagesData,
+ HttpServletResponse.SC_OK);
// check messages on target queue
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName2 + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName2));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", movedMessageIds.size(), messages.size());
for (Long id : movedMessageIds)
@@ -217,7 +280,7 @@ public class MessagesRestTest extends Qp
}
// check messages on original queue
- messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ messages = getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", ids.size(), messages.size());
for (Long id : ids)
@@ -239,18 +302,20 @@ public class MessagesRestTest extends Qp
Destination queue2 = _session.createQueue(queueName2);
_session.createConsumer(queue2);
-
// move messages
Map<String, Object> messagesData = new HashMap<>();
messagesData.put("selector", "index % 2 = 0");
messagesData.put("destination", queueName2);
-
- getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/moveMessages", "POST", messagesData, HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/moveMessages",
+ "POST",
+ messagesData,
+ HttpServletResponse.SC_OK);
// check messages on target queue
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName2 + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName2));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", MESSAGE_NUMBER / 2, messages.size());
final List<Long> movedMessageIds = getMesssageIds(queueName2);
@@ -262,7 +327,7 @@ public class MessagesRestTest extends Qp
}
// check messages on original queue
- messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ messages = getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", MESSAGE_NUMBER / 2, messages.size());
@@ -271,7 +336,6 @@ public class MessagesRestTest extends Qp
Map<String, Object> message = getRestTestHelper().find("id", id.intValue(), messages);
assertMessageAttributes(message);
assertMessageAttributeValues(message, false);
-
}
for (Long id : movedMessageIds)
{
@@ -288,21 +352,22 @@ public class MessagesRestTest extends Qp
Destination queue2 = _session.createQueue(queueName2);
_session.createConsumer(queue2);
-
// get message IDs
List<Long> ids = getMesssageIds(queueName);
-
// move messages
Map<String, Object> messagesData = new HashMap<>();
messagesData.put("destination", queueName2);
-
- getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/moveMessages", "POST", messagesData, HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/moveMessages",
+ "POST",
+ messagesData,
+ HttpServletResponse.SC_OK);
// check messages on target queue
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName2 + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName2));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", MESSAGE_NUMBER, messages.size());
final List<Long> movedMessageIds = getMesssageIds(queueName2);
@@ -313,10 +378,9 @@ public class MessagesRestTest extends Qp
}
// check messages on original queue
- messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ messages = getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", 0, messages.size());
-
}
@@ -343,10 +407,14 @@ public class MessagesRestTest extends Qp
messagesData.put("messageIds", copyMessageIds);
messagesData.put("destination", queueName2);
- getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/copyMessages", "POST", messagesData, HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/copyMessages",
+ "POST",
+ messagesData,
+ HttpServletResponse.SC_OK);
// check messages on target queue
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName2 + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName2));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", copyMessageIds.size(), messages.size());
for (Long id : copyMessageIds)
@@ -356,7 +424,7 @@ public class MessagesRestTest extends Qp
}
// check messages on original queue
- messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ messages = getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", MESSAGE_NUMBER, messages.size());
for (Long id : ids)
@@ -384,10 +452,14 @@ public class MessagesRestTest extends Qp
messagesData.put("limit", 1);
messagesData.put("destination", queueName2);
- getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/copyMessages", "POST", messagesData, HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/copyMessages",
+ "POST",
+ messagesData,
+ HttpServletResponse.SC_OK);
// check messages on target queue
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName2 + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName2));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", 1, messages.size());
for (Long id : getMesssageIds(queueName2))
@@ -398,10 +470,9 @@ public class MessagesRestTest extends Qp
}
// check messages on original queue
- messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ messages = getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", MESSAGE_NUMBER, messages.size());
-
}
@@ -424,10 +495,14 @@ public class MessagesRestTest extends Qp
// delete messages
Map<String, Object> parameters = new HashMap<>();
parameters.put("messageIds", deleteMessageIds);
- getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/deleteMessages", "POST", parameters, HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/deleteMessages",
+ "POST",
+ parameters,
+ HttpServletResponse.SC_OK);
// check messages on queue
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", ids.size(), messages.size());
for (Long id : ids)
@@ -450,32 +525,35 @@ public class MessagesRestTest extends Qp
List<Long> ids = getMesssageIds(queueName);
// delete half of the messages
- int deleteNumber = MESSAGE_NUMBER/2;
+ int deleteNumber = MESSAGE_NUMBER / 2;
// delete messages
Map<String, Object> parameters = new HashMap<>();
parameters.put("limit", deleteNumber);
- getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/deleteMessages", "POST", parameters, HttpServletResponse.SC_OK);
+ getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/deleteMessages",
+ "POST",
+ parameters,
+ HttpServletResponse.SC_OK);
// check messages on queue
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
assertNotNull("Messages are not found", messages);
- assertEquals("Unexpected number of messages", MESSAGE_NUMBER/2, messages.size());
-
+ assertEquals("Unexpected number of messages", MESSAGE_NUMBER / 2, messages.size());
}
-
public void testClearQueue() throws Exception
{
String queueName = getTestQueueName();
// clear queue
getRestTestHelper().submitRequest("queue/test/test/" + queueName + "/clearQueue", "POST",
- Collections.<String, Object>emptyMap(), HttpServletResponse.SC_OK);
+ Collections.<String, Object>emptyMap(), HttpServletResponse.SC_OK);
// check messages on queue
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
assertNotNull("Messages are not found", messages);
assertEquals("Unexpected number of messages", 0, messages.size());
}
@@ -483,7 +561,8 @@ public class MessagesRestTest extends Qp
private List<Long> getMesssageIds(String queueName) throws IOException
{
- List<Map<String, Object>> messages = getRestTestHelper().getJsonAsList("queue/test/test/" + queueName + "/getMessageInfo");
+ List<Map<String, Object>> messages =
+ getRestTestHelper().getJsonAsList(String.format(GET_MESSAGE_INFO, queueName));
List<Long> ids = new ArrayList<>();
for (Map<String, Object> message : messages)
{
@@ -512,7 +591,7 @@ public class MessagesRestTest extends Qp
else
{
assertEquals("Unexpected message attribute expirationTime", ((Number) message.get("timestamp")).longValue()
- + _ttl, message.get("expirationTime"));
+ + _ttl, message.get("expirationTime"));
assertEquals("Unexpected message attribute priority", 5, message.get("priority"));
assertEquals("Unexpected message attribute persistent", Boolean.FALSE, message.get("persistent"));
}
@@ -530,7 +609,8 @@ public class MessagesRestTest extends Qp
assertNotNull("Unexpected message attribute id", message.get("id"));
assertNotNull("Message arrivalTime cannot be null", message.get("arrivalTime"));
assertNotNull("Message timestamp cannot be null", message.get("timestamp"));
- assertTrue("Message arrivalTime cannot be null", ((Number) message.get("arrivalTime")).longValue() > _startTime);
+ assertTrue("Message arrivalTime cannot be null",
+ ((Number) message.get("arrivalTime")).longValue() > _startTime);
assertNotNull("Message messageId cannot be null", message.get("messageId"));
assertNotNull("Unexpected message attribute mimeType", message.get("mimeType"));
assertNotNull("Unexpected message attribute userId", message.get("userId"));
Modified: qpid/java/branches/remove-queue-runner/test-profiles/apache-ci.test.overridden.properties
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/test-profiles/apache-ci.test.overridden.properties?rev=1769772&r1=1769771&r2=1769772&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/test-profiles/apache-ci.test.overridden.properties (original)
+++ qpid/java/branches/remove-queue-runner/test-profiles/apache-ci.test.overridden.properties Tue Nov 15 10:41:20 2016
@@ -21,7 +21,7 @@
qpid.port.protocol_handshake_timeout=10000
-FailoverBehaviourTest.brokerStartupTime=60000
+SpawnedBrokerHolder.brokerStartupTime=60000
FailoverBaseCase.defaultFailoverTime=15000
qpid.test_nowait_for_ports=true
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org