Test fix needed for TUSCANY-3832 changes, plus cleanup and adjustment from recent multiple output support.

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

2 files changed, 36 insertions, 23 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java b/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
index fe62d1babb..81bbcec3f6 100644
--- a/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
+++ b/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
@@ -40,7 +40,7 @@ import org.apache.tuscany.sca.policy.PolicySet;
 public class TestOperation implements Operation {
 
     private DataType<List<DataType>> inputType;
-    private DataType outputType;
+    private DataType<List<DataType>> outputType;
     private String name;
 
     public String getDataBinding() {
@@ -123,7 +123,7 @@ public class TestOperation implements Operation {
 
     }
 
-    public void setOutputType(DataType outputType) {
+    public void setOutputType(DataType<List<DataType>>  outputType) {
         this.outputType = outputType;
     }
 
@@ -171,31 +171,40 @@ public class TestOperation implements Operation {
         
     }
 
-	public boolean isAsyncServer() {
-		return false;
-	}
+    public boolean isAsyncServer() {
+        return false;
+    }
 
-	public List<ParameterMode> getParameterModes() {
-		// TODO Auto-generated method stub
-		return null;
-	}
+    public List<ParameterMode> getParameterModes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 
-	public List<DataType> getOutputTypes() {
-		// TODO Auto-generated method stub
-		return null;
-	}
+    public List<DataType> getOutputTypes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+
+    public boolean hasArrayWrappedOutput() {
+        // TODO Auto-generated method stub
+        return false;
+    }
 
+    public void setHasArrayWrappedOutput(boolean arg0) {
+        // TODO Auto-generated method stub
+        
+    }
 
-	public boolean hasArrayWrappedOutput() {
-		// TODO Auto-generated method stub
-		return false;
-	}
 
-	public void setHasArrayWrappedOutput(boolean arg0) {
-		// TODO Auto-generated method stub
-		
-	}
+    public void setNotSubjectToWrapping(boolean notSubjectToWrapping) {
+        // TODO Auto-generated method stub
+        
+    }
 
-	
+    public boolean isNotSubjectToWrapping() {
+        // TODO Auto-generated method stub
+        return false;
+    }
 
 }
diff --git a/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java b/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
index d31500c85a..175d81b7f0 100644
--- a/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
+++ b/sca-java-2.x/trunk/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
@@ -58,7 +58,11 @@ public class TestRuntimeComponentService implements RuntimeComponentService {
                 && !methods[i].getName().startsWith("_")) {
                 Operation operation = new TestOperation();
                 DataType returnType = new TestDataType(methods[i].getReturnType());
-                operation.setOutputType(returnType);
+                List<DataType> outputDataTypes = new ArrayList<DataType>();
+                outputDataTypes.add(returnType);
+                TestDataType<List<DataType>> outputDataType = new TestDataType<List<DataType>>(null, outputDataTypes);                
+                operation.setOutputType(outputDataType);
+
                 Class<?>[] argTypes = methods[i].getParameterTypes();
                 List<DataType> argDataTypes = new ArrayList<DataType>();
                 for (int j = 0; j < argTypes.length; j++) {