TUSCANY-2857 Correct handling of JMSDeliveryMode and JMSPriority

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@747867 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 9 deletions

diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
index 6fb6330a21..8902f1d32a 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/branches/sca-java-1.x/itest/jms/src/main/resources/policyHeaders/policyHeaders.composite
@@ -25,13 +25,13 @@
         <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />
         <reference name="myService" requires="priority.medium">
             <binding.jms uri="jms:ServiceQueue">
-               <!-- headers JMSType="myType"
+               <headers JMSType="myType"
                         JMSCorrelationID="xyz"
                         JMSDeliveryMode="PERSISTENT"
                         JMSTimeToLive="4321"	
                         JMSPriority="7">
                   <property name="headP1">myHeadP1</property>    
-               </headers-->
+               </headers>
             </binding.jms>
         </reference>
     </component>
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
index c0c90cea95..5e208a3081 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import javax.jms.DeliveryMode;
+import javax.jms.Message;
 
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.junit.After;
@@ -49,19 +50,16 @@ public class PolicyHeadersTestCase {
         // wait for up to 5 seconds but should wake up as soon as done
         synchronized(MsgServiceImpl.lock) {
             if (MsgServiceImpl.msg == null) {
-                MsgServiceImpl.lock.wait(5000);
+                MsgServiceImpl.lock.wait(5000); // For debugging set higher.
             }
         }
         assertNotNull(MsgServiceImpl.msg);
 
-
-        assertEquals(4, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ
-        /*
         assertEquals("myType", MsgServiceImpl.msg.getJMSType());
         assertEquals("xyz", MsgServiceImpl.msg.getJMSCorrelationID());
         assertEquals(DeliveryMode.PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
+        assertEquals(7, MsgServiceImpl.msg.getJMSPriority());
         assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
-        */
     }
 
     @Test
@@ -81,8 +79,8 @@ public class PolicyHeadersTestCase {
 
         assertEquals("op2Type", MsgServiceImpl.msg.getJMSType());
         assertEquals("op2CID", MsgServiceImpl.msg.getJMSCorrelationID());
-        // assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode()); // Doesn't seem to work with ActiveMQ
-        // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ
+        assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
+        assertEquals(3, MsgServiceImpl.msg.getJMSPriority());
         assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
         assertEquals("foo", MsgServiceImpl.msg.getStringProperty("op2P2"));
         assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));