[jboss-svn-commits] JBossWS SVN: r609 - in trunk/src: main/java/org/jboss/ws/tools test/java/org/jboss/test/ws/tools test/resources/wsdlfixture/arrays

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

Author: darran.lofthouse at jboss.com
Date: 2006-07-14 09:15:25 -0400 (Fri, 14 Jul 2006)
New Revision: 609

Added:
   trunk/src/test/resources/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl
Modified:
   trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
   trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
   trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
Log:
JBWS-997 Merged fix and test from branches/jbossws-1.0


Modified: trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java	2006-07-14 12:36:48 UTC (rev 608)
+++ trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java	2006-07-14 13:15:25 UTC (rev 609)
@@ -292,7 +292,7 @@
             cl = this.checkNeedHolder(in,cl);
             if(cl != null)
             {
-               buf.append( cl.getName() + arraySuffix + " " + getMethodParam(xmlName));
+               buf.append( JavaUtils.getSourceName(cl) + arraySuffix + " " + getMethodParam(xmlName));
             }
             else
             {

Modified: trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java	2006-07-14 12:36:48 UTC (rev 608)
+++ trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java	2006-07-14 13:15:25 UTC (rev 609)
@@ -29,6 +29,7 @@
 import org.jboss.test.ws.tools.sei.ArrayInterface;
 import org.jboss.test.ws.tools.sei.CustomInterface;
 import org.jboss.test.ws.tools.sei.InheritenceChildInterface;
+import org.jboss.test.ws.tools.sei.PrimitiveArrayTypes;
 import org.jboss.test.ws.tools.sei.PrimitiveTypes;
 import org.jboss.test.ws.tools.sei.ServiceException;
 import org.jboss.test.ws.tools.sei.StandardJavaTypes;
@@ -97,6 +98,14 @@
       doWSDLTest(seiClass, fixturefile);
    }
    
+   /** Test a SEI that contains primitive array types */
+   public void testPrimitiveArrayTypes() throws Exception
+   {
+      Class seiClass = PrimitiveArrayTypes.class;
+      String fixturefile = "resources/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl";
+      doWSDLTest(seiClass, fixturefile);
+   }
+   
    /** Test a SEI that inherits a method from a super-interface. */
    public void testInterfaceInheritence() throws Exception
    {

Modified: trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java	2006-07-14 12:36:48 UTC (rev 608)
+++ trunk/src/test/java/org/jboss/test/ws/tools/WSDL11ToJavaTestCase.java	2006-07-14 13:15:25 UTC (rev 609)
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.StringWriter;
 
+import org.jboss.test.ws.tools.sei.PrimitiveArrayTypes;
 import org.jboss.test.ws.tools.sei.PrimitiveTypes;
 import org.jboss.test.ws.tools.sei.StandardJavaTypes;
 import org.jboss.test.ws.tools.validation.WSDL11Validator;
@@ -51,8 +52,17 @@
       WSDLDefinitions wsdlDefinitions = getWSDLDefinitions(seiClass, "PrimitiveTypesService_RPC_11.wsdl");
       String wsdlString = getWSDLAsString(wsdlDefinitions);
       //System.out.println(wsdlString);
-
    }
+   
+   /** Test a SEI that contains primitive array types */
+   public void testPrimitiveArrayTypes() throws Exception
+   {
+      Class seiClass = PrimitiveArrayTypes.class;
+      WSDLDefinitions wsdlDefinitions = getWSDLDefinitions(seiClass, "arrays/PrimitiveArrayTypesService_RPC_11.wsdl");
+      String wsdlString = getWSDLAsString(wsdlDefinitions);
+      
+      writeWSDL(wsdlDefinitions, "PrimitiveArrayTypesService_RPC_11.wsdl");          
+   }
 
    /** Test a SEI that contains JAXRPC java standard types */
    public void testStandardJavaTypes() throws Exception

Copied: trunk/src/test/resources/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl (from rev 608, branches/jbossws-1.0/src/test/resources/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl)