[jbossws-commits] JBossWS SVN: r3552 - in branches/jbossws-2.0/jbossws-core/src/test: resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2007-06-12 08:47:14 -0400 (Tue, 12 Jun 2007)
New Revision: 3552

Modified:
   branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
   branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
Log:
Fix ws-addressing tests

Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java	2007-06-12 12:46:53 UTC (rev 3551)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/SOAPAddressingPropertiesTestCase.java	2007-06-12 12:47:14 UTC (rev 3552)
@@ -31,11 +31,13 @@
 import javax.xml.soap.MessageFactory;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.ws.addressing.AddressingBuilder;
+import javax.xml.ws.addressing.AddressingException;
 import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
 import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
 
 import org.jboss.util.xml.DOMUtils;
 import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.ws.extensions.addressing.soap.SOAPAddressingPropertiesImpl;
 
 /**
  * Test the SOAPAddressingProperties
@@ -72,6 +74,21 @@
          "  <env:Body/>" +
          "</env:Envelope>";
 
+	private String ERRORNOUS_XML = "<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'>\n" +
+			" <soap:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" +
+			"<wsa:Action></wsa:Action>\n" +
+			"<wsa:MessageID>urn:uuid:1fa5a31f-bbe7-4ad5-8b92-d765f4a32dc9</wsa:MessageID>\n" +
+			"<wsa:ReplyTo>\n" +
+			"<wsa:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>\n" +
+			"<wsa:ReferenceParameters>\n" +
+			"<ns1:clientid xmlns:ns1=\"http://somens\">clientid-1</ns1:clientid>\n" +
+			"</wsa:ReferenceParameters>\n" +
+			"</wsa:ReplyTo>\n" +
+			"<wsa:To>http://mycomp:8080/testws</wsa:To>\n" +
+			"</soap:Header>" +
+			" <soap:Body/>\n" +
+			"</soap:Envelope>";
+
    public void setUp() throws Exception
    {
       super.setUp();
@@ -132,4 +149,22 @@
       
       assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv));
    }
+
+	public void testReplyToWithoutAction() throws Exception
+	{
+		MessageFactory mf = MessageFactory.newInstance();
+		SOAPMessage message = mf.createMessage(null, new ByteArrayInputStream(ERRORNOUS_XML.getBytes()));
+
+		SOAPAddressingPropertiesImpl props = new SOAPAddressingPropertiesImpl();
+		try
+		{
+			props.readHeaders(message);
+			fail("ERRORNOUS_XML should cause a parsing exception due to missing wsa:Action value");
+		}
+		catch (AddressingException e)
+		{
+			// expected an exception
+    }
+
+  }
 }

Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml	2007-06-12 12:46:53 UTC (rev 3551)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/jboss-client.xml	2007-06-12 12:47:14 UTC (rev 3552)
@@ -6,7 +6,6 @@
   <jndi-name>replyto-client</jndi-name>
   <service-ref>
     <service-ref-name>service/ReplyToService</service-ref-name>
-    <config-name>Standard WSAddressing Client</config-name>
     <wsdl-override>http://@jboss.bind.address@:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl</wsdl-override>
   </service-ref>
 </jboss-client>