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 dm...@apache.org on 2006/09/19 17:13:53 UTC

svn commit: r447913 - in /incubator/yoko/trunk/bindings/src: main/java/org/apache/yoko/bindings/corba/ test/java/org/apache/yoko/bindings/corba/

Author: dmiddlem
Date: Tue Sep 19 10:13:52 2006
New Revision: 447913

URL: http://svn.apache.org/viewvc?view=rev&rev=447913
Log:
Miscellaneous unit test updates.

Modified:
    incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaClientBinding.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
    incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java

Modified: incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaClientBinding.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaClientBinding.java?view=diff&rev=447913&r1=447912&r2=447913
==============================================================================
--- incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaClientBinding.java (original)
+++ incubator/yoko/trunk/bindings/src/main/java/org/apache/yoko/bindings/corba/CorbaClientBinding.java Tue Sep 19 10:13:52 2006
@@ -108,7 +108,7 @@
         endpointRef = ref;
         
         bus.getLifeCycleManager().registerLifeCycleListener(new CorbaBusLifeCycleListener(this));
-
+        
         // TODO: Set any additional properties needed to initialize the ORB  before
         // we initialize it. We will get this information from the Celtix configuration 
         // that is used with the current application.

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java?view=diff&rev=447913&r1=447912&r2=447913
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaBindingImplTest.java Tue Sep 19 10:13:52 2006
@@ -46,7 +46,6 @@
 import org.apache.schemas.yoko.bindings.corba.Union;
 import org.apache.yoko.bindings.corba.types.CorbaArrayHandler;
 import org.apache.yoko.bindings.corba.types.CorbaEnumHandler;
-//import org.apache.yoko.bindings.corba.types.CorbaExceptionHandler;
 import org.apache.yoko.bindings.corba.types.CorbaFixedHandler;
 import org.apache.yoko.bindings.corba.types.CorbaObjectHandler;
 import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
@@ -61,21 +60,16 @@
 
 import org.objectweb.celtix.Bus;
 import org.objectweb.celtix.bindings.BindingManager;
-import org.objectweb.celtix.bindings.DataBindingCallback;
-import org.objectweb.celtix.context.GenericMessageContext;
-import org.objectweb.celtix.context.ObjectMessageContext;
 import org.objectweb.celtix.context.ObjectMessageContextImpl;
-import org.objectweb.celtix.bus.jaxws.JAXBDataBindingCallback;
-import org.objectweb.celtix.ws.addressing.EndpointReferenceType;
 
 public class CorbaBindingImplTest extends TestCase {
 
     private ObjectMessageContextImpl objContext;
-    private CorbaMessageContextImpl corbaContext;
     private TestUtils testUtils;
     private ORB orb;
     private Bus bus;
-    private EndpointReferenceType endpoint;
+    private CorbaBindingImpl simpleBindingImpl;
+    private CorbaBindingImpl staxBindingImpl;
     
     private final String staxTestNamespaceURI = "http://yoko.apache.org/StaxTest/idl_types";
     private final String staxTestPrefix = "corbatm";
@@ -93,7 +87,6 @@
         
         testUtils = new TestUtils();
         objContext = new ObjectMessageContextImpl();
-        corbaContext = new CorbaMessageContextImpl(new GenericMessageContext());
     
         java.util.Properties props = System.getProperties();
         props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
@@ -113,7 +106,9 @@
         corbaBF.init(bus);
         manager.registerBinding(CorbaConstants.NU_WSDL_CORBA, corbaBF);
         
-        endpoint = testUtils.getSimpleTestEndpointReference();
+        simpleBindingImpl = 
+            new CorbaBindingImpl(bus, testUtils.getSimpleTestEndpointReference(), orb, false);
+        staxBindingImpl = new CorbaBindingImpl(bus, testUtils.getStaxTestEndpointReference(), orb, false);
     }
 
     protected void tearDown() throws Exception {
@@ -125,64 +120,14 @@
             }
         }
     }
-    
-    public void testMarshal() throws Exception {
-        CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus, endpoint, orb, false);
-        corbaContext.put(ObjectMessageContext.MESSAGE_INPUT, true);
-        
-        String arg0 = new String("TestString");
-        objContext.setMessageObjects(arg0);
-        bindingImpl.marshal(objContext,
-                            corbaContext,
-                            new JAXBDataBindingCallback(objContext.getMethod(),
-                                                        DataBindingCallback.Mode.MESSAGE,
-                                                        null));
-        
-        CorbaMessage msg = corbaContext.getMessage();
-        assertNotNull(msg);
-        
-        CorbaStreamable[] arguments = msg.getStreamableArguments();
-        assertTrue(arguments.length == 1);
-        
-        CorbaObjectHandler arg = arguments[0].getObject();
-        assertNotNull(arg);
-        assertTrue(((CorbaPrimitiveHandler)arg).getValueData().equals("TestString"));
-    }
-    
-    public void testUnmarshal() throws Exception {
-        CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus, endpoint, orb, true);
-        corbaContext.put(ObjectMessageContext.MESSAGE_INPUT, true);
-
-        QName paramName = new QName("param1");
-        QName paramIdlType = CorbaConstants.NT_CORBA_STRING;
-        TypeCode paramTC = CorbaUtils.getPrimitiveTypeCode(orb, paramIdlType);
-        CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(paramName, paramIdlType, paramTC, null);
-        obj.setValueFromData("TestString");
-        CorbaStreamable streamable = new CorbaStreamable(obj, paramName);
-        CorbaMessage msg = new CorbaMessage();
-        msg.addStreamableArgument(streamable);
-        corbaContext.setMessage(msg);
-        objContext.setMessageObjects(new Object[1]);
-        
-        bindingImpl.unmarshal(corbaContext, 
-                              objContext, 
-                              new JAXBDataBindingCallback(objContext.getMethod(),
-                                                          DataBindingCallback.Mode.MESSAGE,
-                                                          null));
-        
-        Object[] arguments = objContext.getMessageObjects();
-        assertNotNull(arguments);
-        assertTrue(arguments.length == 1);
-            
-        Object o = arguments[0];
-        assertTrue(o instanceof String);
-        String param1 = (String)o;
-        assertTrue(param1.equals("TestString"));
-        
-    }
+  
+    // Tests for the marshalling and unmarshalling operations are done in separate test classes since
+    // there are a large number of tests for testing parameter types of different modes.  See the following
+    // test classes:
+    //    - CorbaBindingImplMarshalTest
+    //    - CorbaBindingImplUnmarshalTest
     
     public void testReadWriteStaxPrimitive() {
-        CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus, endpoint, orb, false);
         CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(new QName("BooleanType"),
                                                               CorbaConstants.NT_CORBA_BOOLEAN,
                                                               orb.get_primitive_tc(TCKind.tk_boolean),
@@ -205,7 +150,7 @@
             XMLEventFactory factory = XMLEventFactory.newInstance();
             StartElement startEl = factory.createStartElement(obj.getName(), null, null);
             evtWriter.add(startEl);
-            bindingImpl.writePrimitiveToStax(obj, evtWriter, factory);
+            simpleBindingImpl.writePrimitiveToStax(obj, evtWriter, factory);
             EndElement endEl = factory.createEndElement(obj.getName(), null);
             evtWriter.add(endEl);
             evtWriter.flush();
@@ -224,9 +169,9 @@
         }
         assertNotNull(evtReader);
         
-        CorbaObjectHandler result = bindingImpl.readPrimitiveFromStax(evtReader, 
-                                                                      obj.getIdlType(), 
-                                                                      obj.getTypeCode());
+        CorbaObjectHandler result = simpleBindingImpl.readPrimitiveFromStax(evtReader, 
+                                                                            obj.getIdlType(), 
+                                                                            obj.getTypeCode());
         assertNotNull(result);
         
         assertTrue(result instanceof CorbaPrimitiveHandler);
@@ -239,14 +184,10 @@
     }
     
     public void testReadWriteStaxArray() {
-        
-        CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus, testUtils.getStaxTestEndpointReference(),
-                                                            orb, false);
-        
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestArray", staxTestPrefix);
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, bindingImpl.getCorbaTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxBindingImpl.getCorbaTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxBindingImpl.getCorbaTypeMaps());
         assertTrue(type instanceof Array);
 
         Array arrayType = (Array)type;
@@ -281,7 +222,7 @@
             XMLEventFactory factory = XMLEventFactory.newInstance();
             StartElement startEl = factory.createStartElement(obj.getName(), null, null);
             evtWriter.add(startEl);
-            bindingImpl.writeArrayToStax(obj, evtWriter, factory);
+            staxBindingImpl.writeArrayToStax(obj, evtWriter, factory);
             EndElement endEl = factory.createEndElement(obj.getName(), null);
             evtWriter.add(endEl);
             evtWriter.flush();
@@ -300,7 +241,7 @@
         }
         assertNotNull(evtReader);
         
-        CorbaObjectHandler result = bindingImpl.readArrayFromStax(evtReader, 
+        CorbaObjectHandler result = staxBindingImpl.readArrayFromStax(evtReader, 
                                                                   obj.getIdlType(), 
                                                                   obj.getTypeCode());
         assertNotNull(result);
@@ -321,12 +262,9 @@
     }
     
     public void testReadWriteStaxEnum() {
-        CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus, testUtils.getStaxTestEndpointReference(),
-                                                            orb, false);
-
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestEnum", staxTestPrefix);
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, bindingImpl.getCorbaTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxBindingImpl.getCorbaTypeMaps());
         assertTrue(type instanceof Enum);
         Enum enumType = (Enum)type;
         List<Enumerator> enumerators = enumType.getEnumerator();
@@ -335,7 +273,7 @@
             Enumerator e = enumerators.get(i);
             enums[i] = e.getValue();
         }
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxBindingImpl.getCorbaTypeMaps());
         CorbaEnumHandler obj = new CorbaEnumHandler(objName, objIdlType, objTypeCode, enumType);
         assertNotNull(obj);
         
@@ -357,7 +295,7 @@
             XMLEventFactory factory = XMLEventFactory.newInstance();
             StartElement startEl = factory.createStartElement(obj.getName(), null, null);
             evtWriter.add(startEl);
-            bindingImpl.writeEnumToStax(obj, evtWriter, factory);
+            staxBindingImpl.writeEnumToStax(obj, evtWriter, factory);
             EndElement endEl = factory.createEndElement(obj.getName(), null);
             evtWriter.add(endEl);
             evtWriter.flush();
@@ -376,7 +314,7 @@
         }
         assertNotNull(evtReader);
         
-        CorbaObjectHandler resultObj = bindingImpl.readEnumFromStax(evtReader, 
+        CorbaObjectHandler resultObj = staxBindingImpl.readEnumFromStax(evtReader, 
                                                                     obj.getIdlType(), 
                                                                     obj.getTypeCode());
         assertNotNull(resultObj);
@@ -392,15 +330,12 @@
     }
 
     public void testReadWriteStaxFixed() {
-        CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus, testUtils.getStaxTestEndpointReference(),
-                                                            orb, false);
-
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestFixed", staxTestPrefix);
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, bindingImpl.getCorbaTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxBindingImpl.getCorbaTypeMaps());
         assertTrue(type instanceof Fixed);
         Fixed fixedType = (Fixed)type;
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxBindingImpl.getCorbaTypeMaps());
         CorbaFixedHandler obj = new CorbaFixedHandler(objName, objIdlType, objTypeCode, fixedType);
         assertNotNull(obj);
 
@@ -423,7 +358,7 @@
             XMLEventFactory factory = XMLEventFactory.newInstance();
             StartElement startEl = factory.createStartElement(obj.getName(), null, null);
             evtWriter.add(startEl);
-            bindingImpl.writeFixedToStax(obj, evtWriter, factory);
+            staxBindingImpl.writeFixedToStax(obj, evtWriter, factory);
             EndElement endEl = factory.createEndElement(obj.getName(), null);
             evtWriter.add(endEl);
             evtWriter.flush();
@@ -442,7 +377,7 @@
         }
         assertNotNull(evtReader);
         
-        CorbaObjectHandler resultObj = bindingImpl.readFixedFromStax(evtReader, 
+        CorbaObjectHandler resultObj = staxBindingImpl.readFixedFromStax(evtReader, 
                                                                      obj.getIdlType(), 
                                                                      obj.getTypeCode());
         assertNotNull(resultObj);
@@ -458,14 +393,10 @@
     }
 
     public void testReadWriteStaxSequence() {
-        
-        CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus, testUtils.getStaxTestEndpointReference(),
-                                                            orb, false);
-        
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestSequence", staxTestPrefix);
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, bindingImpl.getCorbaTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxBindingImpl.getCorbaTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxBindingImpl.getCorbaTypeMaps());
         assertTrue(type instanceof Sequence);
 
         Sequence seqType = (Sequence)type;
@@ -500,7 +431,7 @@
             XMLEventFactory factory = XMLEventFactory.newInstance();
             StartElement startEl = factory.createStartElement(obj.getName(), null, null);
             evtWriter.add(startEl);
-            bindingImpl.writeSequenceToStax(obj, evtWriter, factory);
+            staxBindingImpl.writeSequenceToStax(obj, evtWriter, factory);
             EndElement endEl = factory.createEndElement(obj.getName(), null);
             evtWriter.add(endEl);
             evtWriter.flush();
@@ -519,7 +450,7 @@
         }
         assertNotNull(evtReader);
         
-        CorbaObjectHandler result = bindingImpl.readSequenceFromStax(evtReader, 
+        CorbaObjectHandler result = staxBindingImpl.readSequenceFromStax(evtReader, 
                                                                      obj.getIdlType(), 
                                                                      obj.getTypeCode());
         assertNotNull(result);
@@ -540,15 +471,12 @@
     }
 
     public void testReadWriteStaxStruct() {
-        CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus, testUtils.getStaxTestEndpointReference(),
-                                                            orb, false);
-
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestStruct", staxTestPrefix);
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, bindingImpl.getCorbaTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxBindingImpl.getCorbaTypeMaps());
         assertTrue(type instanceof Struct);
         Struct structType = (Struct)type;
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxBindingImpl.getCorbaTypeMaps());
         CorbaStructHandler obj = new CorbaStructHandler(objName, objIdlType, objTypeCode, structType);
         assertNotNull(obj);
 
@@ -556,7 +484,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(), bindingImpl.getCorbaTypeMaps());
+        TypeCode m1TypeCode = CorbaUtils.getTypeCode(orb, m1.getIdltype(), staxBindingImpl.getCorbaTypeMaps());
         CorbaPrimitiveHandler member1 = new CorbaPrimitiveHandler(new QName(m1.getName()),
                                                                  m1.getIdltype(),
                                                                  m1TypeCode,
@@ -566,7 +494,7 @@
         obj.addMember(member1);
         
         MemberType m2 = structMembers.get(1);
-        TypeCode m2TypeCode = CorbaUtils.getTypeCode(orb, m2.getIdltype(), bindingImpl.getCorbaTypeMaps());
+        TypeCode m2TypeCode = CorbaUtils.getTypeCode(orb, m2.getIdltype(), staxBindingImpl.getCorbaTypeMaps());
         CorbaPrimitiveHandler member2 = new CorbaPrimitiveHandler(new QName(m2.getName()),
                                                                  m2.getIdltype(),
                                                                  m2TypeCode,
@@ -576,7 +504,7 @@
         obj.addMember(member2);
         
         MemberType m3 = structMembers.get(2);
-        TypeCode m3TypeCode = CorbaUtils.getTypeCode(orb, m3.getIdltype(), bindingImpl.getCorbaTypeMaps());
+        TypeCode m3TypeCode = CorbaUtils.getTypeCode(orb, m3.getIdltype(), staxBindingImpl.getCorbaTypeMaps());
         CorbaPrimitiveHandler member3 = new CorbaPrimitiveHandler(new QName(m3.getName()),
                                                                  m3.getIdltype(),
                                                                  m3TypeCode,
@@ -601,7 +529,7 @@
             XMLEventFactory factory = XMLEventFactory.newInstance();
             StartElement startEl = factory.createStartElement(obj.getName(), null, null);
             evtWriter.add(startEl);
-            bindingImpl.writeStructToStax(obj, evtWriter, factory);
+            staxBindingImpl.writeStructToStax(obj, evtWriter, factory);
             EndElement endEl = factory.createEndElement(obj.getName(), null);
             evtWriter.add(endEl);
             evtWriter.flush();
@@ -620,7 +548,7 @@
         }
         assertNotNull(evtReader);
         
-        CorbaObjectHandler resultObj = bindingImpl.readStructFromStax(evtReader, 
+        CorbaObjectHandler resultObj = staxBindingImpl.readStructFromStax(evtReader, 
                                                                      obj.getIdlType(), 
                                                                      obj.getTypeCode());
         assertNotNull(resultObj);
@@ -657,21 +585,18 @@
     }
     
     public void testReadWriteUnionStruct() {
-        CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus, testUtils.getStaxTestEndpointReference(),
-                        orb, false);
-
         QName objName = new QName("object");
         QName objIdlType = new QName(staxTestNamespaceURI, "TestUnion", staxTestPrefix);
-        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, bindingImpl.getCorbaTypeMaps());
+        CorbaTypeImpl type = CorbaUtils.getCorbaType(objIdlType, staxBindingImpl.getCorbaTypeMaps());
         assertTrue(type instanceof Union);
         Union unionType = (Union)type;
-        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, bindingImpl.getCorbaTypeMaps());
+        TypeCode objTypeCode = CorbaUtils.getTypeCode(orb, objIdlType, staxBindingImpl.getCorbaTypeMaps());
         CorbaUnionHandler obj = new CorbaUnionHandler(objName, objIdlType, objTypeCode, unionType);
         assertNotNull(obj);
         
         Character unionValue = new Character('u');
         TypeCode unionValueTC = CorbaUtils.getTypeCode(orb, CorbaConstants.NT_CORBA_WCHAR, 
-                                                       bindingImpl.getCorbaTypeMaps());
+                                                       staxBindingImpl.getCorbaTypeMaps());
         CorbaPrimitiveHandler unionValueObj = new CorbaPrimitiveHandler(new QName("case12"),
                                                                         CorbaConstants.NT_CORBA_WCHAR,
                                                                         unionValueTC, 
@@ -679,7 +604,7 @@
         unionValueObj.setValue(unionValue);
         Short discriminatorValue = new Short((short)1);
         TypeCode discriminatorTC = CorbaUtils.getTypeCode(orb, unionType.getDiscriminator(),
-                                                          bindingImpl.getCorbaTypeMaps());
+                                                          staxBindingImpl.getCorbaTypeMaps());
         CorbaPrimitiveHandler discriminator = new CorbaPrimitiveHandler(new QName("discriminator"),
                                                                        unionType.getDiscriminator(),
                                                                        discriminatorTC,
@@ -705,7 +630,7 @@
             XMLEventFactory factory = XMLEventFactory.newInstance();
             StartElement startEl = factory.createStartElement(obj.getName(), null, null);
             evtWriter.add(startEl);
-            bindingImpl.writeUnionToStax(obj, evtWriter, factory);
+            staxBindingImpl.writeUnionToStax(obj, evtWriter, factory);
             EndElement endEl = factory.createEndElement(obj.getName(), null);
             evtWriter.add(endEl);
             evtWriter.flush();
@@ -724,7 +649,7 @@
         }
         assertNotNull(evtReader);
         
-        CorbaObjectHandler resultObj = bindingImpl.readUnionFromStax(evtReader, 
+        CorbaObjectHandler resultObj = staxBindingImpl.readUnionFromStax(evtReader, 
                                                                      obj.getIdlType(), 
                                                                      obj.getTypeCode());
         assertNotNull(resultObj);
@@ -748,4 +673,4 @@
         Character unionResultValue = (Character)unionResultValueObj;
         assertTrue(unionResultValue.charValue() == unionValue.charValue());
     }
-}
+}
\ No newline at end of file

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java?view=diff&rev=447913&r1=447912&r2=447913
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java Tue Sep 19 10:13:52 2006
@@ -50,6 +50,16 @@
         orb = ORB.init(new String[0], props);
     }
     
+    protected void tearDown() throws Exception {
+        if (orb != null) {
+            try {
+                orb.destroy();
+            } catch (Exception ex) {
+                // Do nothing.  Throw an Exception?
+            }
+        }
+    }
+    
     public void testCreateCorbaMessage() {
         CorbaMessage msg = new CorbaMessage();
         assertNotNull(msg);

Modified: incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java?view=diff&rev=447913&r1=447912&r2=447913
==============================================================================
--- incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java (original)
+++ incubator/yoko/trunk/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java Tue Sep 19 10:13:52 2006
@@ -43,4 +43,10 @@
         QName serviceName = new QName("http://yoko.apache.org/ComplexTypes", "ComplexTypesCORBAService");
         return EndpointReferenceUtils.getEndpointReference(wsdlUrl, serviceName, "ComplexTypesCORBAPort");
     }
+    
+    public EndpointReferenceType getParamModesEndpointReference() {
+        URL wsdlUrl = getClass().getResource("/wsdl/ParamModes.wsdl");
+        QName serviceName = new QName("http://yoko.apache.org/ParamModes", "ParamModesCORBAService");
+        return EndpointReferenceUtils.getEndpointReference(wsdlUrl, serviceName, "ParamModesCORBAPort");
+    }
 }