You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2007/05/29 16:26:32 UTC
svn commit: r542580 [3/3] - in /incubator/yoko/trunk/bindings: ./
src/main/java/org/apache/yoko/bindings/corba/
src/main/java/org/apache/yoko/bindings/corba/interceptors/
src/main/java/org/apache/yoko/bindings/corba/runtime/
src/main/java/org/apache/yo...
Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java?view=diff&rev=542580&r1=542579&r2=542580
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java Tue May 29 09:26:24 2007
@@ -58,7 +58,7 @@
private Bus bus;
protected EndpointInfo endpointInfo;
BindingFactory factory;
- List<CorbaTypeMap> typeMaps;
+ CorbaTypeMap typeMap;
ServiceInfo service;
public CorbaHandlerUtilsTest(String arg0) {
@@ -84,12 +84,11 @@
orb = ORB.init(new String[0], props);
TestUtils testUtils = new TestUtils();
- typeMaps = new ArrayList<CorbaTypeMap>();
//CorbaDestination destination = (CorbaDestination)getDestination();
CorbaDestination destination = testUtils.getComplexTypesTestDestination();
service = destination.getBindingInfo().getService();
List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
- CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
+ typeMap = CorbaUtils.createCorbaTypeMap(corbaTypes);
}
protected void tearDown() throws Exception {
@@ -132,43 +131,43 @@
// Test for an array handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestArray", complexTypesPrefix);
- result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaArrayHandler);
// Test for an enum handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestEnum", complexTypesPrefix);
- result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaEnumHandler);
// Test for a fixed handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestFixed", complexTypesPrefix);
- result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaFixedHandler);
// Test for a primitive handler
objName = new QName("object");
objIdlType = CorbaConstants.NT_CORBA_BOOLEAN;
- result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaPrimitiveHandler);
// Test for a sequence handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestSequence", complexTypesPrefix);
- result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaSequenceHandler);
// Test for a struct handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestStruct", complexTypesPrefix);
- result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaStructHandler);
// Test for a union handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestUnion", complexTypesPrefix);
- result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaUnionHandler);
}
@@ -180,7 +179,7 @@
// Test for an array handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestArray", complexTypesPrefix);
- result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMap, service);
assertTrue(result instanceof CorbaArrayHandler);
CorbaArrayHandler arrayHandler = (CorbaArrayHandler)result;
// WSDL defines the array to have 5 elements
@@ -190,7 +189,7 @@
// Test for a sequence handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestSequence", complexTypesPrefix);
- result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMap, service);
assertTrue(result instanceof CorbaSequenceHandler);
CorbaSequenceHandler seqHandler = (CorbaSequenceHandler)result;
// This is an unbounded sequence so make sure there are no elements and the template
@@ -201,7 +200,7 @@
// Test for a bounded sequence handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestBoundedSequence", complexTypesPrefix);
- result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMap, service);
assertTrue(result instanceof CorbaSequenceHandler);
CorbaSequenceHandler boundedSeqHandler = (CorbaSequenceHandler)result;
// This is a bounded sequence with WSDL defining 5 elements.
@@ -210,7 +209,7 @@
// Test for a struct handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestStruct", complexTypesPrefix);
- result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMap, service);
assertTrue(result instanceof CorbaStructHandler);
CorbaStructHandler structHandler = (CorbaStructHandler)result;
// The WSDL defines this struct as having three members
@@ -219,7 +218,7 @@
// Test for a union handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestUnion", complexTypesPrefix);
- result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMaps, service);
+ result = CorbaHandlerUtils.initializeObjectHandler(orb, objName, objIdlType, typeMap, service);
assertTrue(result instanceof CorbaUnionHandler);
}
}
Modified: incubator/yoko/trunk/bindings/src/test/resources/wsdl/exceptions.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/resources/wsdl/exceptions.wsdl?view=diff&rev=542580&r1=542579&r2=542580
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/resources/wsdl/exceptions.wsdl (original)
+++ incubator/yoko/trunk/bindings/src/test/resources/wsdl/exceptions.wsdl Tue May 29 09:26:24 2007
@@ -27,10 +27,13 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsd1="http://schemas.apache.org/idltypes/except">
<corba:typeMapping targetNamespace="http://schemas.apache.org/typemap/corba/except">
- <corba:exception name="BadRecord" repositoryID="IDL:BadRecord:1.0"
- type="xsd1:BadRecord">
- <corba:member idltype="corba:string" name="reason"/>
- <corba:member idltype="corba:short" name="code"/>
+ <corba:struct repositoryID="IDL:ExceptionTest/review_dataResult:1.0" type="xsd1:ExceptionTest.review_dataResult" name="ExceptionTest.review_dataResult" />
+ <corba:struct repositoryID="IDL:ExceptionTest/review_data:1.0" type="xsd1:ExceptionTest.review_data" name="ExceptionTest.review_data">
+ <corba:member name="data" idltype="corba:string" />
+ </corba:struct>
+ <corba:exception repositoryID="IDL:BadRecord:1.0" type="xsd1:BadRecord" name="BadRecord">
+ <corba:member name="reason" idltype="corba:string" />
+ <corba:member name="code" idltype="corba:short" />
</corba:exception>
</corba:typeMapping>
<types>
@@ -77,17 +80,21 @@
</operation>
</portType>
<binding name="ExceptionTestCORBABinding" type="tns:ExceptionTest">
- <corba:binding repositoryID="IDL:ExceptionTest:1.0"/>
+ <corba:binding repositoryID="IDL:ExceptionTest:1.0" />
<operation name="review_data">
- <corba:operation name="review_data">
- <corba:param idltype="corba:string" mode="in" name="data"/>
- <corba:raises exception="corbatm:BadRecord"/>
- </corba:operation>
- <input name="review_data"/>
- <output name="review_dataResponse"/>
- <fault name="BadRecord"/>
+ <corba:operation name="review_data">
+ <corba:param mode="in" name="parameters" idltype="corbatm:ExceptionTest.review_data" />
+ <corba:return name="parameters" idltype="corbatm:ExceptionTest.review_dataResult" />
+ <corba:raises exception="corbatm:BadRecord" />
+ </corba:operation>
+ <input name="review_data">
+ </input>
+ <output name="review_dataResponse">
+ </output>
+ <fault name="BadRecord">
+ </fault>
</operation>
- </binding>
+ </binding>
<service name="ExceptionTestCORBAService">
<port name="ExceptionTestCORBAPort" binding="tns:ExceptionTestCORBABinding">
<corba:address location="corbaloc::localhost:40000/except"/>
Modified: incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd?view=diff&rev=542580&r1=542579&r2=542580
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd (original)
+++ incubator/yoko/trunk/bindings/src/test/resources/wsdl/type_test/type_test.xsd Tue May 29 09:26:24 2007
@@ -227,6 +227,12 @@
<attribute name="varAttrString" type="string"/>
</complexType>
+ <complexType name="BinaryStruct">
+ <sequence>
+ <element name="varBinary" type="hexBinary"/>
+ </sequence>
+ </complexType>
+
</itst:it_test_group>
</schema>