Refactor into framework and separate test cases, and add more tests

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1041987 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 51 insertions, 31 deletions

diff --git a/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/java/wsdlgen/verify/DataTypes.java b/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/java/wsdlgen/verify/DataTypes.java
index f3d689e725..aa6ffc6ecb 100644
--- a/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/java/wsdlgen/verify/DataTypes.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/java/wsdlgen/verify/DataTypes.java
@@ -20,6 +20,8 @@
 package wsdlgen.verify;

 

 import java.util.List;

+import javax.jws.WebParam;

+import javax.jws.soap.SOAPBinding;

 import commonj.sdo.DataObject;

 import org.osoa.sca.annotations.Remotable;

 

@@ -30,8 +32,18 @@ public interface DataTypes {
 

     void testSimpleArrayInt(int[] simple);

 

+    void testSimpleMultiArrayInt(int[][] simple);

+

+    void testList(List any);

+

     void testSimpleListString(List<String> simple);

 

+    List<String> testReturnSimpleListString();

+

+    void testListByteArray(List<byte[]> byteArrayList);

+

+    void testListWildcard(List<?> wild);

+

     void testComplex(ComplexNumber complex);

 

     void testByteArray(byte[] byteArray);

@@ -39,4 +51,12 @@ public interface DataTypes {
     void testException() throws Exception;

 

     DataObject testDynamicSDO();

+

+/*

+    @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.BARE)

+    void testWebParam(@WebParam(name="simpleInt") int simple);

+

+    @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.BARE)

+    void testWebParamArray(@WebParam(name="arrayInt") int[] array);

+*/

 }

diff --git a/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/java/wsdlgen/verify/impl/DataTypesImpl.java b/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/java/wsdlgen/verify/impl/DataTypesImpl.java
index 71fc96cfc3..5cf85d1b54 100644
--- a/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/java/wsdlgen/verify/impl/DataTypesImpl.java
+++ b/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/java/wsdlgen/verify/impl/DataTypesImpl.java
@@ -20,6 +20,8 @@
 package wsdlgen.verify.impl;

 

 import java.util.List;

+import javax.jws.WebParam;

+import javax.jws.soap.SOAPBinding;

 import commonj.sdo.DataObject;

 import wsdlgen.verify.ComplexNumber;

 import wsdlgen.verify.DataTypes;

@@ -32,9 +34,25 @@ public class DataTypesImpl implements DataTypes {
     public void testSimpleArrayInt(int[] simple) {

     }

 

+    public void testSimpleMultiArrayInt(int[][] simple) {

+    }

+

+    public void testList(List any) {

+    }

+

     public void testSimpleListString(List<String> simple) {

     }

 

+    public List<String> testReturnSimpleListString() {

+        return null;

+    }

+

+    public void testListByteArray(List<byte[]> byteArrayList) {

+    }

+

+    public void testListWildcard(List<?> wild) {

+    }

+

     public void testComplex(ComplexNumber complex) {

     }

 

@@ -47,4 +65,10 @@ public class DataTypesImpl implements DataTypes {
     public DataObject testDynamicSDO() {

         return null;

     }

+

+    public void testWebParam(int simple) {

+    }

+

+    public void testWebParamArray(int[] array) {

+    }

 }

diff --git a/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/resources/DataTypes.composite b/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/resources/DataTypes.composite
index a88d276036..f42c492b2d 100644
--- a/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/resources/DataTypes.composite
+++ b/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/resources/DataTypes.composite
@@ -28,4 +28,11 @@
         </service>
     </component>
 
+    <component name="DynamicSDO">
+        <implementation.java class="wsdlgen.verify.impl.GetDataServiceWithoutExceptionImpl" />
+        <service name="GetDataServiceWithoutException">
+            <binding.ws uri="http://localhost:8085/GetDataServiceWithoutException" />
+        </service>
+    </component>
+
 </composite>
diff --git a/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/resources/dynamic-sdo.composite b/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/resources/dynamic-sdo.composite
deleted file mode 100644
index 4dd25b46d3..0000000000
--- a/sca-java-1.x/trunk/itest/wsdlgen-verify/src/main/resources/dynamic-sdo.composite
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://verify.wsdlgen/"
-           name="DynamicSDO">
-
-    <component name="DataService">
-        <implementation.java class="wsdlgen.verify.impl.GetDataServiceWithoutExceptionImpl" />
-        <service name="GetDataServiceWithoutException">
-            <binding.ws uri="http://localhost:8085/DataService" />
-        </service>
-    </component>
-
-</composite>