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/27 23:58:54 UTC
svn commit: r1771666 - in /qpid/java/trunk:
systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java
test-profiles/Java10UninvestigatedTestsExcludes
Author: rgodfrey
Date: Sun Nov 27 23:58:53 2016
New Revision: 1771666
URL: http://svn.apache.org/viewvc?rev=1771666&view=rev
Log:
QPID-7546 : UTF8Test
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
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=1771666&r1=1771665&r2=1771666&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 Sun Nov 27 23:58:53 2016
@@ -554,6 +554,29 @@ public class QpidBrokerTestCase extends
}
}
+ protected void performOperationUsingAmqpManagement(final String name, final String operation, final Session session, final String type, Map<String,Object> arguments)
+ throws JMSException
+ {
+ MessageProducer producer = session.createProducer(session.createQueue(isBroker10() ? "$management" : "ADDR:$management"));
+
+ MapMessage opMessage = session.createMapMessage();
+ opMessage.setStringProperty("type", type);
+ opMessage.setStringProperty("operation", operation);
+ opMessage.setStringProperty("index", "object-path");
+
+ opMessage.setStringProperty("key", name);
+ for(Map.Entry<String,Object> argument : arguments.entrySet())
+ {
+ opMessage.setObjectProperty(argument.getKey(), argument.getValue());
+ }
+
+ producer.send(opMessage);
+ if(session.getTransacted())
+ {
+ session.commit();
+ }
+ }
+
protected List managementQueryObjects(final Session session, final String type) throws JMSException
{
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java?rev=1771666&r1=1771665&r2=1771666&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java Sun Nov 27 23:58:53 2016
@@ -20,7 +20,12 @@
*/
package org.apache.qpid.test.unit.message;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
import javax.jms.Connection;
import javax.jms.Destination;
@@ -29,10 +34,8 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.naming.InitialContext;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Properties;
+
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
/**
@@ -67,13 +70,14 @@ public class UTF8Test extends QpidBroker
{
Connection con = getConnection();
Session sess = con.createSession(false, javax.jms.Session.AUTO_ACKNOWLEDGE);
- final Destination dest = getDestination(exchangeName, routingKey, queueName);
+ final Destination receivingDestination = getReceivingDestination(exchangeName, routingKey, queueName, sess);
+ final Destination sendingDestination = getSendingDestination(exchangeName, routingKey, queueName, sess);
- final MessageConsumer msgCons = sess.createConsumer(dest);
+ final MessageConsumer msgCons = sess.createConsumer(receivingDestination);
con.start();
// Send data
- MessageProducer msgProd = sess.createProducer(dest);
+ MessageProducer msgProd = sess.createProducer(sendingDestination);
TextMessage message = sess.createTextMessage(data);
message.setStringProperty("stringProperty", data);
msgProd.send(message);
@@ -85,15 +89,45 @@ public class UTF8Test extends QpidBroker
assertEquals(data, message.getStringProperty("stringProperty"));
}
- private Destination getDestination(String exch, String routkey, String qname) throws Exception
+ private Destination getReceivingDestination(String exch, String routkey, String qname, final Session session) throws Exception
{
Properties props = new Properties();
- props.setProperty("destination.directUTF8Queue",
- "direct://" + exch + "//" + qname + "?autodelete='false'&durable='false'"
- + "&routingkey='" + routkey + "'");
+ if(isBroker10())
+ {
+ props.setProperty("queue.recvDest", qname);
+ createTestQueue(session, qname);
+ }
+ else
+ {
+ props.setProperty("destination.recvDest",
+ "direct://" + exch + "//" + qname + "?autodelete='false'&durable='false'"
+ + "&routingkey='" + routkey + "'");
+ }
+ // Get our connection context
+ InitialContext ctx = new InitialContext(props);
+ return (Destination) ctx.lookup("recvDest");
+ }
+ private Destination getSendingDestination(String exch, String routkey, String qname, final Session session) throws Exception
+ {
+ Properties props = new Properties();
+ if(isBroker10())
+ {
+ props.setProperty("topic.sendDest", exch +"/" + routkey);
+ createEntityUsingAmqpManagement(exch, session, "org.apache.qpid.DirectExchange");
+ final Map<String, Object> arguments = new HashMap<>();
+ arguments.put("queue",qname);
+ arguments.put("bindingKey", routkey);
+ performOperationUsingAmqpManagement(exch, "bind", session, "org.apache.qpid.DirectExchange", arguments);
+ }
+ else
+ {
+ props.setProperty("destination.sendDest",
+ "direct://" + exch + "//" + qname + "?autodelete='false'&durable='false'"
+ + "&routingkey='" + routkey + "'");
+ }
// Get our connection context
InitialContext ctx = new InitialContext(props);
- return (Destination) ctx.lookup("directUTF8Queue");
+ return (Destination) ctx.lookup("sendDest");
}
}
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771666&r1=1771665&r2=1771666&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Sun Nov 27 23:58:53 2016
@@ -50,7 +50,6 @@ org.apache.qpid.server.queue.ConsumerPri
org.apache.qpid.server.queue.ArrivalTimeFilterTest#*
org.apache.qpid.server.message.MessageProtocolConversionTest#*
org.apache.qpid.test.unit.topic.DurableSubscriptionTest#*
-org.apache.qpid.test.unit.message.UTF8Test#*
org.apache.qpid.test.unit.close.MessageConsumerCloseTest#*
org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*
org.apache.qpid.test.unit.client.MaxDeliveryCountTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org