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/21 19:01:09 UTC

svn commit: r540240 - in /incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba: ./ interceptors/ runtime/ types/

Author: bravi
Date: Mon May 21 12:01:08 2007
New Revision: 540240

URL: http://svn.apache.org/viewvc?view=rev&rev=540240
Log:
[YOKO-366] - Fixing test compilation errors.

Modified:
    incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
    incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java
    incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptorTest.java
    incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java
    incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java

Modified: incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java?view=diff&rev=540240&r1=540239&r2=540240
==============================================================================
--- incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java (original)
+++ incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java Mon May 21 12:01:08 2007
@@ -199,7 +199,7 @@
     public void testGetOperationExceptions() {    
         CorbaConduit conduit = control.createMock(CorbaConduit.class);    
         OperationType opType = control.createMock(OperationType.class);
-        List<CorbaTypeMap> typeMaps = control.createMock(List.class);
+        CorbaTypeMap typeMap = control.createMock(CorbaTypeMap.class);
         
         Map<TypeCode, RaisesType> exceptions = control.createMock(HashMap.class);
         List<RaisesType> exlist = control.createMock(ArrayList.class);                
@@ -211,7 +211,7 @@
         EasyMock.expect(exlist.get(0)).andReturn(rType);
         
         control.replay();
-        conduit.getOperationExceptions(opType, typeMaps);
+        conduit.getOperationExceptions(opType, typeMap);
         assertEquals(exlist.size(),0);        
     }
     
@@ -224,7 +224,7 @@
         ServiceInfo service = control.createMock(ServiceInfo.class);
         EasyMock.expect(exchange.get(ServiceInfo.class)).andReturn(service);
         List<CorbaTypeMap> list = control.createMock(List.class);
-        List<CorbaTypeMap> typeMaps = control.createMock(List.class);
+        CorbaTypeMap typeMap = control.createMock(CorbaTypeMap.class);
         EasyMock.expect(service.getExtensors(CorbaTypeMap.class)).andReturn(list);                
         
         OperationType opType = control.createMock(OperationType.class);
@@ -232,10 +232,9 @@
         EasyMock.expectLastCall().andReturn(null);  
         conduit.getReturn(message);
         EasyMock.expectLastCall().andReturn(null);
-        conduit.getExceptionList(conduit.getOperationExceptions(opType, typeMaps),
+        conduit.getExceptionList(conduit.getOperationExceptions(opType, typeMap),
                                  message,
-                                 opType,
-                                 list);
+                                 opType);
         EasyMock.expectLastCall().andReturn(null);
         
         conduit.getRequest(message, "Hello", null, null, null);
@@ -292,13 +291,11 @@
         CorbaConduit conduit = setupCorbaConduit(false);
         Message msg = new MessageImpl();
         CorbaMessage message = new CorbaMessage(msg);
-        List<CorbaTypeMap> typeMaps = new ArrayList<CorbaTypeMap>();
         OperationType opType = new OperationType();
         opType.setName("review_data");
-        ExceptionList exList = conduit.getExceptionList(conduit.getOperationExceptions(opType, typeMaps),
+        ExceptionList exList = conduit.getExceptionList(conduit.getOperationExceptions(opType, null),
                                                         message,
-                                                        opType,
-                                                        typeMaps);
+                                                        opType);
         assertNotNull("ExcepitonList is not null", exList != null);
         assertEquals("The list should be empty", exList.count(), 0);        
     }
@@ -307,24 +304,22 @@
         CorbaConduit conduit = setupCorbaConduit(false);
         Message msg = new MessageImpl();
         CorbaMessage message = new CorbaMessage(msg);
-        List<CorbaTypeMap> typeMaps = new ArrayList<CorbaTypeMap>();               
         TestUtils testUtils = new TestUtils();
         CorbaDestination destination = testUtils.getExceptionTypesTestDestination();
         EndpointInfo endpointInfo = destination.getEndPointInfo();
         QName name = new QName("http://schemas.apache.org/idl/except", "review_data", "");
         BindingOperationInfo bInfo = destination.getBindingInfo().getOperation(name);
         OperationType opType = bInfo.getExtensor(OperationType.class);
-        
+        CorbaTypeMap typeMap = null;
         List<TypeMappingType> corbaTypes =
             endpointInfo.getService().getDescription().getExtensors(TypeMappingType.class);        
         if (corbaTypes != null) {
-            CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
+            typeMap = CorbaUtils.createCorbaTypeMap(corbaTypes);
         }
         
-        ExceptionList exList = conduit.getExceptionList(conduit.getOperationExceptions(opType, typeMaps),
+        ExceptionList exList = conduit.getExceptionList(conduit.getOperationExceptions(opType, typeMap),
                                                         message,
-                                                        opType,
-                                                        typeMaps);
+                                                        opType);
         
         assertNotNull("ExcepitonList is not null", exList != null);
         assertNotNull("TypeCode is not null", exList.item(0) != null);

Modified: incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java?view=diff&rev=540240&r1=540239&r2=540240
==============================================================================
--- incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java (original)
+++ incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java Mon May 21 12:01:08 2007
@@ -60,7 +60,7 @@
     CorbaBindingFactory factory;
     TestUtils testUtils;
     OrbConfig orbConfig;
-    List<CorbaTypeMap> corbaTypeMap;
+    CorbaTypeMap corbaTypeMap;
 
     public CorbaServerConduitTest(String arg0) {
         super(arg0);

Modified: incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptorTest.java?view=diff&rev=540240&r1=540239&r2=540240
==============================================================================
--- incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptorTest.java (original)
+++ incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/interceptors/CorbaInInterceptorTest.java Mon May 21 12:01:08 2007
@@ -355,13 +355,13 @@
         CorbaStaxObject corbaStaxObject = new CorbaStaxObject();
         Message msg = new MessageImpl();
         CorbaMessage message = new CorbaMessage(msg);
-        List<CorbaTypeMap> typeMaps = new ArrayList<CorbaTypeMap>();
+	CorbaTypeMap typeMap = null;
         CorbaDestination destination = testUtils.getExceptionTypesTestDestination();
         ServiceInfo service = destination.getBindingInfo().getService();        
         List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
         if (corbaTypes != null) {
-            CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
-            corbaStaxObject.setTypeMaps(typeMaps);
+            typeMap = CorbaUtils.createCorbaTypeMap(corbaTypes);
+            corbaStaxObject.setTypeMaps(typeMap);
         }
         
         QName name = new QName("http://schemas.apache.org/idl/except", "review_data", "");
@@ -372,7 +372,7 @@
                         
         inInterceptor.setOrb(orb);                
         CorbaStreamable[] streamables = new CorbaStreamable[1];    
-        NVList nvlist = inInterceptor.prepareDIIArgsList(message, bopInfo, streamables, paramTypes, typeMaps);
+        NVList nvlist = inInterceptor.prepareDIIArgsList(message, bopInfo, streamables, paramTypes, typeMap);
         assertNotNull("NVList should not be null", nvlist != null);        
         assertEquals("There should be one item in the list", nvlist.count(), 1);
         assertEquals("Item name should be data", nvlist.item(0).name(), "data");

Modified: incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java?view=diff&rev=540240&r1=540239&r2=540240
==============================================================================
--- incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java (original)
+++ incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStaxObjectTest.java Mon May 21 12:01:08 2007
@@ -106,15 +106,14 @@
                          "/wsdl/StaxTest.wsdl", "StaxTestCORBAService",
                          "StaxTestCORBAPort");
         
-        List<CorbaTypeMap> typeMaps;       
-        typeMaps = new ArrayList<CorbaTypeMap>();        
+        CorbaTypeMap typeMap = null;
         
         CorbaDestination destination = testUtils.getStaxTypesTestDestination();
         ServiceInfo service = destination.getBindingInfo().getService();        
         List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
         if (corbaTypes != null) {
-            CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
-            staxObject.setTypeMaps(typeMaps);
+            typeMap = CorbaUtils.createCorbaTypeMap(corbaTypes);
+            staxObject.setTypeMaps(typeMap);
             staxObject.setServiceInfo(service);
         }
         
@@ -190,8 +189,8 @@
                 
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestArray", staxTestPrefix);
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMaps());
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMap());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMap());
         assertTrue(type instanceof Array);
 
         Array arrayType = (Array)type;
@@ -267,7 +266,7 @@
     public void testReadWriteStaxEnum() {        
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestEnum", staxTestPrefix);
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMap());
         assertTrue(type instanceof Enum);
         Enum enumType = (Enum)type;
         List<Enumerator> enumerators = enumType.getEnumerator();
@@ -276,7 +275,7 @@
             Enumerator e = enumerators.get(i);
             enums[i] = e.getValue();
         }
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMap());
         CorbaEnumHandler obj = new CorbaEnumHandler(objName, objIdlType, objTypeCode, enumType);
         assertNotNull(obj);
         
@@ -330,10 +329,10 @@
     public void testReadWriteStaxFixed() {        
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestFixed", staxTestPrefix);
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMap());
         assertTrue(type instanceof Fixed);
         Fixed fixedType = (Fixed)type;
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMap());
         CorbaFixedHandler obj = new CorbaFixedHandler(objName, objIdlType, objTypeCode, fixedType);
         assertNotNull(obj);
 
@@ -389,8 +388,8 @@
                 
         QName objName = new QName("TestSequence");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestSequence", staxTestPrefix);
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMaps());
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMap());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMap());
         assertTrue(type instanceof Sequence);
 
         Sequence seqType = (Sequence)type;
@@ -460,10 +459,10 @@
     public void testReadWriteStaxStruct() {        
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestStruct", staxTestPrefix);
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMap());
         assertTrue(type instanceof Struct);
         Struct structType = (Struct)type;
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMap());
         CorbaStructHandler obj = new CorbaStructHandler(objName, objIdlType, objTypeCode, structType);
         assertNotNull(obj);
 
@@ -471,7 +470,7 @@
         // For this test, we know what each of the members are.  Create the correct handler and assign
         // each member a value
         MemberType m1 = structMembers.get(0);
-        TypeCode m1TypeCode = CorbaUtils.getTypeCode(orb, m1.getIdltype(), staxObject.getTypeMaps());
+        TypeCode m1TypeCode = CorbaUtils.getTypeCode(orb, m1.getIdltype(), staxObject.getTypeMap());
         CorbaPrimitiveHandler member1 = new CorbaPrimitiveHandler(new QName(m1.getName()),
                                                                  m1.getIdltype(),
                                                                  m1TypeCode,
@@ -481,7 +480,7 @@
         obj.addMember(member1);
         
         MemberType m2 = structMembers.get(1);
-        TypeCode m2TypeCode = CorbaUtils.getTypeCode(orb, m2.getIdltype(), staxObject.getTypeMaps());
+        TypeCode m2TypeCode = CorbaUtils.getTypeCode(orb, m2.getIdltype(), staxObject.getTypeMap());
         CorbaPrimitiveHandler member2 = new CorbaPrimitiveHandler(new QName(m2.getName()),
                                                                  m2.getIdltype(),
                                                                  m2TypeCode,
@@ -491,7 +490,7 @@
         obj.addMember(member2);
         
         MemberType m3 = structMembers.get(2);
-        TypeCode m3TypeCode = CorbaUtils.getTypeCode(orb, m3.getIdltype(), staxObject.getTypeMaps());
+        TypeCode m3TypeCode = CorbaUtils.getTypeCode(orb, m3.getIdltype(), staxObject.getTypeMap());
         CorbaPrimitiveHandler member3 = new CorbaPrimitiveHandler(new QName(m3.getName()),
                                                                  m3.getIdltype(),
                                                                  m3TypeCode,
@@ -569,16 +568,16 @@
     public void testReadWriteUnionStruct() {        
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestUnion", staxTestPrefix);
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxObject.getTypeMap());
         assertTrue(type instanceof Union);
         Union unionType = (Union)type;
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxObject.getTypeMap());
         CorbaUnionHandler obj = new CorbaUnionHandler(objName, objIdlType, objTypeCode, unionType);
         assertNotNull(obj);
         
         Character unionValue = new Character('u');
         TypeCode unionValueTC = CorbaUtils.getTypeCode(orb, CorbaConstants.NT_CORBA_WCHAR, 
-                                                       staxObject.getTypeMaps());
+                                                       staxObject.getTypeMap());
         CorbaPrimitiveHandler unionValueObj = new CorbaPrimitiveHandler(new QName("case12"),
                                                                         CorbaConstants.NT_CORBA_WCHAR,
                                                                         unionValueTC, 
@@ -586,7 +585,7 @@
         unionValueObj.setValue(unionValue);
         Short discriminatorValue = new Short((short)1);
         TypeCode discriminatorTC = CorbaUtils.getTypeCode(orb, unionType.getDiscriminator(),
-                                                          staxObject.getTypeMaps());
+                                                          staxObject.getTypeMap());
         CorbaPrimitiveHandler discriminator = new CorbaPrimitiveHandler(new QName("discriminator"),
                                                                        unionType.getDiscriminator(),
                                                                        discriminatorTC,

Modified: incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java?view=diff&rev=540240&r1=540239&r2=540240
==============================================================================
--- incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java (original)
+++ incubator/yoko/branches/perf/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java Mon May 21 12:01:08 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, service);
         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, service);
         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, service);
         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, service);
         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, service);
         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, service);
         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, service);
         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);
     }
 }