You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2011/03/22 02:45:05 UTC

svn commit: r1084048 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java

Author: rajith
Date: Tue Mar 22 01:45:04 2011
New Revision: 1084048

URL: http://svn.apache.org/viewvc?rev=1084048&view=rev
Log:
QPID-2930
I had checked in an incomplete test case with rev 1082719
I had made certain changes to the test case for testing another potential fix, but forgot to revert it back to the original before committing.
Re applied the changes to adequately test the issue.

Modified:
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java

Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java?rev=1084048&r1=1084047&r2=1084048&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java Tue Mar 22 01:45:04 2011
@@ -43,6 +43,8 @@ import javax.jms.Session;
 import javax.jms.Topic;
 
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Apache Software Foundation
@@ -176,19 +178,27 @@ public class JMSPropertiesTest extends Q
         Session ssn = (AMQSession) con.createSession(false, Session.CLIENT_ACKNOWLEDGE);
         con.start();
         
-        Topic topic = ssn.createTopic("amq.direct/test");
+        Topic topic = ssn.createTopic("ADDR:amq.direct/test");
         MessageConsumer consumer = ssn.createConsumer(topic);
         MessageProducer prod = ssn.createProducer(topic);
-        prod.send(ssn.createMessage());
+        Message m = ssn.createMessage();
+        m.setObjectProperty("x-amqp-0-10.routing-key", "routing-key".getBytes());
+        m.setObjectProperty("routing-key", "routing-key");
+        prod.send(m);
         
         Message msg = consumer.receive(1000);
         assertNotNull(msg);
         
     	Enumeration<String> enu = msg.getPropertyNames();
+    	Map<String,String> map = new HashMap<String,String>();
     	while (enu.hasMoreElements()) 
-    	{ 
+    	{    		
     		String name = enu.nextElement(); 
     		String value = msg.getStringProperty(name);
+    		map.put(name, value);
        } 
+    	
+       assertFalse("Property 'x-amqp-0-10.routing-key' should have been filtered out",map.containsKey("x-amqp-0-10.routing-key"));
+       assertTrue("Property routing-key should be present",map.containsKey("routing-key"));      
     }
 }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org