[Jboss-cvs] JBossAS SVN: r56103 - in branches/JBossWS4EE/testsuite/src: main/org/jboss/test/webservice/jbws349 resources/webservice/jbws349/WEB-INF

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

Author: heiko.braun at jboss.com
Date: 2006-08-21 11:12:02 -0400 (Mon, 21 Aug 2006)
New Revision: 56103

Modified:
   branches/JBossWS4EE/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java
   branches/JBossWS4EE/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java
   branches/JBossWS4EE/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml
Log:
Testcase for JBWS-1096

Modified: branches/JBossWS4EE/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java
===================================================================
--- branches/JBossWS4EE/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java	2006-08-21 15:11:01 UTC (rev 56102)
+++ branches/JBossWS4EE/testsuite/src/main/org/jboss/test/webservice/jbws349/JBWS349TestCase.java	2006-08-21 15:12:02 UTC (rev 56103)
@@ -23,6 +23,7 @@
 
 import javax.naming.InitialContext;
 import javax.xml.rpc.Service;
+import javax.xml.rpc.Stub;
 
 import junit.framework.Test;
 
@@ -63,16 +64,16 @@
 
    public void testAssetCreate() throws Exception
    {
-      Event event = new AssetCreate("id", 1, "templ");
+      Event event = new AssetCreate("AssetCreate", 1, "templ");
       AssetCreateResult retObj = (AssetCreateResult)endpoint.processEvent(event);
-      assertEquals("123", retObj.getId());
+      assertEquals("AssetCreate", retObj.getId());
    }
 
    public void testAssetRead() throws Exception
    {
-      Event event = new AssetRead("id");
+      Event event = new AssetRead("AssetRead");
       AssetReadResult retObj = (AssetReadResult)endpoint.processEvent(event);
-      assertEquals("123", retObj.getId());
+      assertEquals("AssetRead", retObj.getId());
       assertEquals("body", retObj.getBody());
    }
    
@@ -80,7 +81,7 @@
    {
       try
       {
-         Event event = new Event("id");
+         Event event = new Event("Event");
          endpoint.processEvent(event);
          fail("EventException expected");
       }

Modified: branches/JBossWS4EE/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java
===================================================================
--- branches/JBossWS4EE/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java	2006-08-21 15:11:01 UTC (rev 56102)
+++ branches/JBossWS4EE/testsuite/src/main/org/jboss/test/webservice/jbws349/ServiceFacadeEndpointImpl.java	2006-08-21 15:12:02 UTC (rev 56103)
@@ -35,11 +35,11 @@
       Result res;
       if (event instanceof AssetCreate)
       {
-         res = new AssetCreateResult("123");
+         res = new AssetCreateResult(event.getId());
       }
       else if (event instanceof AssetRead)
       {
-         res = new AssetReadResult("123", "body");
+         res = new AssetReadResult(event.getId(), "body");
       }
       else
       {

Modified: branches/JBossWS4EE/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/JBossWS4EE/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml	2006-08-21 15:11:01 UTC (rev 56102)
+++ branches/JBossWS4EE/testsuite/src/resources/webservice/jbws349/WEB-INF/jaxrpc-mapping.xml	2006-08-21 15:12:02 UTC (rev 56103)
@@ -27,10 +27,6 @@
     <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:AssetCreate</root-type-qname>
     <qname-scope>complexType</qname-scope>
     <variable-mapping>
-      <java-variable-name>id</java-variable-name>
-      <xml-element-name>id</xml-element-name>
-    </variable-mapping>
-    <variable-mapping>
       <java-variable-name>nextStep</java-variable-name>
       <xml-element-name>nextStep</xml-element-name>
     </variable-mapping>
@@ -43,10 +39,6 @@
     <java-type>org.jboss.test.webservice.jbws349.AssetRead</java-type>
     <root-type-qname xmlns:typeNS="http://siterefresh.refreshsoftware.com/types">typeNS:AssetRead</root-type-qname>
     <qname-scope>complexType</qname-scope>
-    <variable-mapping>
-      <java-variable-name>id</java-variable-name>
-      <xml-element-name>id</xml-element-name>
-    </variable-mapping>
   </java-xml-type-mapping>
  <java-xml-type-mapping>
     <java-type>org.jboss.test.webservice.jbws349.AssetReadResult</java-type>