Author: ningjiang
Date: Mon Dec 27 05:12:55 2010
New Revision: 1052998
URL: http://svn.apache.org/viewvc?rev=1052998&view=rev
Log:
Merged revisions 1052993-1052994 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1052993 | ningjiang | 2010-12-27 11:38:20 +0800 (Mon, 27 Dec 2010) | 1 line
Polish the JMSEndpointTest accorrding to the SOAP over JMS spec
........
r1052994 | ningjiang | 2010-12-27 12:00:14 +0800 (Mon, 27 Dec 2010) | 1 line
Remove the System.out.println of JMSEndpointTest
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 27 05:12:55 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java?rev=1052998&r1=1052997&r2=1052998&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/JMSEndpointTest.java
Mon Dec 27 05:12:55 2010
@@ -39,6 +39,7 @@ public class JMSEndpointTest extends Ass
public void testQueueParameters() throws Exception {
JMSEndpoint endpoint =
resolveEndpoint("jms:queue:Foo.Bar?foo=bar&foo2=bar2");
assertTrue(endpoint instanceof JMSQueueEndpoint);
+ System.out.println("The Request URI is " + endpoint.getRequestURI());
assertEquals(endpoint.getDestinationName(), "Foo.Bar");
assertEquals(endpoint.getJmsVariant(), JMSURIConstants.QUEUE);
assertEquals(endpoint.getParameters().size(), 2);
@@ -122,14 +123,24 @@ public class JMSEndpointTest extends Ass
public void testRequestUri() throws Exception {
JMSEndpoint endpoint = resolveEndpoint("jms:jndi:Foo.Bar?" +
"jndiInitialContextFactory"
+
"=org.apache.activemq.jndi.ActiveMQInitialContextFactory"
+ + "&targetService=greetMe"
+ + "&replyToName=replyQueue"
+ + "&timeToLive=1000"
+ + "&priority=3"
+ "&foo=bar"
+ "&foo2=bar2");
assertTrue(endpoint instanceof JMSJNDIEndpoint);
- assertEquals(endpoint.getParameters().size(), 2);
+ assertEquals(endpoint.getParameters().size(), 3);
String requestUri = endpoint.getRequestURI();
+ // Checking what's the request uri should have
assertTrue(requestUri.startsWith("jms:jndi:Foo.Bar?"));
assertTrue(requestUri.contains("foo=bar"));
assertTrue(requestUri.contains("foo2=bar2"));
+ // Cheching what's the request uri should not have
+ assertFalse(requestUri.contains("jndiInitialContextFactory"));
+ assertFalse(requestUri.contains("targetService"));
+ assertFalse(requestUri.contains("replyToName"));
+ assertFalse(requestUri.contains("priority=3"));
}
private JMSEndpoint resolveEndpoint(String uri) {
