[jboss-svn-commits] JBossWS SVN: r1172 - in tags/jbossws-1.0.3.SP1: . src/test/ant src/test/java/org/jboss/test/ws/jaxrpc/jbws1186 src/test/resources/jaxrpc/jbws1186/WEB-INF

[jboss-svn-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-10-09 07:05:49 -0400 (Mon, 09 Oct 2006)
New Revision: 1172

Added:
   tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.java
Modified:
   tags/jbossws-1.0.3.SP1/build.xml
   tags/jbossws-1.0.3.SP1/src/test/ant/build-jars.xml
   tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java
   tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.java
   tags/jbossws-1.0.3.SP1/src/test/resources/jaxrpc/jbws1186/WEB-INF/web.xml
   tags/jbossws-1.0.3.SP1/src/test/resources/jaxrpc/jbws1186/WEB-INF/webservices.xml
Log:
[JBWS-1186] The prefix "xsi" for attribute "xsi:nil" is not bound.
Expand test case to test response message

Modified: tags/jbossws-1.0.3.SP1/build.xml
===================================================================
--- tags/jbossws-1.0.3.SP1/build.xml	2006-10-09 10:56:27 UTC (rev 1171)
+++ tags/jbossws-1.0.3.SP1/build.xml	2006-10-09 11:05:49 UTC (rev 1172)
@@ -522,6 +522,7 @@
 
   <!-- Deploy to jboss/thirdparty -->
   <target name="deploy-to-thirdparty" if="jboss.source.dist.available">
+    <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
     <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
     <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
   </target>

Modified: tags/jbossws-1.0.3.SP1/src/test/ant/build-jars.xml
===================================================================
--- tags/jbossws-1.0.3.SP1/src/test/ant/build-jars.xml	2006-10-09 10:56:27 UTC (rev 1171)
+++ tags/jbossws-1.0.3.SP1/src/test/ant/build-jars.xml	2006-10-09 11:05:49 UTC (rev 1172)
@@ -826,6 +826,7 @@
       <classes dir="${build.test.dir}/classes">
         <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpoint.class"/>
+        <include name="org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.class"/>
         <include name="org/jboss/test/ws/jaxrpc/jbws1186/UserType.class"/>
       </classes>
       <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF">

Modified: tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java
===================================================================
--- tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java	2006-10-09 10:56:27 UTC (rev 1171)
+++ tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/JBWS1186TestCase.java	2006-10-09 11:05:49 UTC (rev 1172)
@@ -96,10 +96,10 @@
    {
       UserType userType = new UserType();
       UserType retObj = port.echo(null, userType);
-      assertEquals("null null", retObj.getName());
+      assertNull("null expected", retObj);
    }
 
-   public void testAccessMessage() throws Exception
+   public void testMessageAccess() throws Exception
    {
       MessageFactory factory = MessageFactory.newInstance();
       
@@ -121,7 +121,6 @@
       SOAPMessage resMessage = con.call(reqMessage, "http://" + getServerHost() + ":8080/jaxrpc-jbws1186");
       SOAPElement soapElement = (SOAPElement)resMessage.getSOAPBody().getChildElements().next();
       soapElement = (SOAPElement)soapElement.getChildElements().next();
-      soapElement = (SOAPElement)soapElement.getChildElements().next();
-      assertEquals("null null", soapElement.getValue());
+      assertEquals("1", soapElement.getAttribute("xsi:nil"));
    }
 }

Copied: tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.java (from rev 1171, branches/tdiesler/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.java)

Modified: tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.java
===================================================================
--- tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.java	2006-10-09 10:56:27 UTC (rev 1171)
+++ tags/jbossws-1.0.3.SP1/src/test/java/org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.java	2006-10-09 11:05:49 UTC (rev 1172)
@@ -32,7 +32,12 @@
    public UserType echo(String message, UserType ut) throws RemoteException
    {
       log.info("echo: " + message);
-      ut.setName(message + " " + ut.getName());
+      
+      if (message != null || ut.getName() != null)
+         ut.setName(message + " " + ut.getName());
+      else
+         ut = null;
+      
       return ut;
    }
 

Modified: tags/jbossws-1.0.3.SP1/src/test/resources/jaxrpc/jbws1186/WEB-INF/web.xml
===================================================================
--- tags/jbossws-1.0.3.SP1/src/test/resources/jaxrpc/jbws1186/WEB-INF/web.xml	2006-10-09 10:56:27 UTC (rev 1171)
+++ tags/jbossws-1.0.3.SP1/src/test/resources/jaxrpc/jbws1186/WEB-INF/web.xml	2006-10-09 11:05:49 UTC (rev 1172)
@@ -4,11 +4,12 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
   version="2.4">
-
+  
   <servlet>
     <servlet-name>TestEndpoint</servlet-name>
     <servlet-class>org.jboss.test.ws.jaxrpc.jbws1186.TestEndpointImpl</servlet-class>
   </servlet>
+  
   <servlet-mapping>
     <servlet-name>TestEndpoint</servlet-name>
     <url-pattern>/*</url-pattern>

Modified: tags/jbossws-1.0.3.SP1/src/test/resources/jaxrpc/jbws1186/WEB-INF/webservices.xml
===================================================================
--- tags/jbossws-1.0.3.SP1/src/test/resources/jaxrpc/jbws1186/WEB-INF/webservices.xml	2006-10-09 10:56:27 UTC (rev 1171)
+++ tags/jbossws-1.0.3.SP1/src/test/resources/jaxrpc/jbws1186/WEB-INF/webservices.xml	2006-10-09 11:05:49 UTC (rev 1172)
@@ -10,6 +10,10 @@
    <service-impl-bean>
     <servlet-link>TestEndpoint</servlet-link>
    </service-impl-bean>
+    <handler>
+      <handler-name>ServerHandler</handler-name>
+      <handler-class>org.jboss.test.ws.jaxrpc.jbws1186.ServerHandler</handler-class>
+    </handler>
   </port-component>
  </webservice-description>
 </webservices>
\ No newline at end of file