cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r610221 [4/4] - in /incubator/cxf/trunk/rt/bindings/corba: ./ src/main/java/org/apache/yoko/bindings/corba/ src/main/java/org/apache/yoko/bindings/corba/runtime/ src/main/java/org/apache/yoko/bindings/corba/types/ src/main/java/org/apache/y...
Date Tue, 08 Jan 2008 23:23:41 GMT
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamReaderTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamReaderTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamReaderTest.java
Tue Jan  8 15:23:36 2008
@@ -18,52 +18,49 @@
  */
 package org.apache.yoko.bindings.corba.runtime;
 
-import java.util.Arrays;
 import javax.xml.namespace.QName;
-import junit.framework.TestCase;
+
 
 import org.apache.yoko.bindings.corba.types.CorbaTypeEventProducer;
 import org.easymock.classextension.EasyMock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 
-public class CorbaStreamReaderTest extends TestCase {
+public class CorbaStreamReaderTest extends Assert {
     
     private CorbaStreamReader reader;
     private CorbaTypeEventProducer mock;
     
-    public CorbaStreamReaderTest(String arg0) {
-        super(arg0);
-        
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaStreamReaderTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         mock = EasyMock.createMock(CorbaTypeEventProducer.class);
         reader = new CorbaStreamReader(mock);
     }
     
+    @Test
     public void testGetName() throws Exception {
         EasyMock.expect(mock.getName()).andReturn(new QName("http://foo.org", "test"));
         EasyMock.replay(mock);
         assertEquals("checking getName ", new QName("http://foo.org", "test"), reader.getName());
     }
     
+    @Test
     public void testGetLocalName() throws Exception {
         EasyMock.expect(mock.getName()).andReturn(new QName("http://foo.org", "test"));
         EasyMock.replay(mock);
         assertEquals("checking localName ", "test", reader.getLocalName());
     }
     
+    @Test
     public void testGetNamespaceURI() throws Exception {
         EasyMock.expect(mock.getName()).andReturn(new QName("http://foo.org", "test"));
         EasyMock.replay(mock);
         assertEquals("checking namespace ", "http://foo.org", reader.getNamespaceURI());
  
     }
     
+    @Test
     public void testGetText() throws Exception {
         EasyMock.expect(mock.getText()).andReturn("abcdef");
         EasyMock.replay(mock);
@@ -71,13 +68,11 @@
     }
     
     
+    @Test
     public void testGetTextCharacters() throws Exception {
         EasyMock.expect(mock.getText()).andReturn("abcdef");
         EasyMock.replay(mock);
-        assertTrue("checking getTextCharacters", 
-                    Arrays.equals("abcdef".toCharArray(), reader.getTextCharacters()));
-    }
-    
-    
-    
+        assertEquals("checking getTextCharacters", 
+                    "abcdef".toCharArray(), reader.getTextCharacters());
+    }    
 }

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamWriterTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamWriterTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamWriterTest.java
Tue Jan  8 15:23:36 2008
@@ -19,30 +19,25 @@
 package org.apache.yoko.bindings.corba.runtime;
 
 import javax.xml.namespace.NamespaceContext;
-import junit.framework.TestCase;
+
 
 import org.easymock.classextension.EasyMock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class CorbaStreamWriterTest extends TestCase {
+public class CorbaStreamWriterTest extends Assert {
     
     private CorbaStreamWriter writer;
     private NamespaceContext mock;
     
-    public CorbaStreamWriterTest(String arg0) {
-        super(arg0);
-        
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaStreamWriterTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         mock = EasyMock.createMock(NamespaceContext.class);
         writer = new CorbaStreamWriter(null, null, null);
     }
     
+    @Test
     public void testSetNamespaceContext() throws Exception {
         writer.setNamespaceContext(mock);
         assertSame("checking namespace context. ", mock, writer.getNamespaceContext());

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/runtime/CorbaStreamableTest.java
Tue Jan  8 15:23:36 2008
@@ -20,42 +20,44 @@
 
 import javax.xml.namespace.QName;
 
-import org.omg.CORBA.portable.InputStream;
+
+import org.apache.yoko.bindings.corba.CorbaStreamable;
+import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
+import org.apache.yoko.wsdl.CorbaConstants;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
 
-import junit.framework.TestCase;
 
-import org.apache.yoko.bindings.corba.CorbaStreamable;
-import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler;
-import org.apache.yoko.wsdl.CorbaConstants;
-import org.apache.yoko.orb.CORBA.OutputStream;
-import org.apache.yoko.orb.OCI.Buffer;
 
-public class CorbaStreamableTest extends TestCase {
+
+
+
+public class CorbaStreamableTest extends Assert {
 
     private static ORB orb;
     
-    public CorbaStreamableTest(String arg0) {
-        super(arg0);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaStreamableTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
-        
+     
+    @Before
+    public void setUp() throws Exception {
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
+        
+        
         props.put("yoko.orb.id", "Yoko-Binding");
         orb = ORB.init(new String[0], props);
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -65,6 +67,7 @@
         }
     }
     
+    @Test
     public void testCreateStreamable() {
         QName objName = new QName("object");
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
@@ -75,6 +78,7 @@
         assertNotNull(streamable);
     }
     
+    @Test
     public void testGetStreamableAttributes() {
         QName objName = new QName("object");
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "float", CorbaConstants.NP_WSDL_CORBA);
@@ -95,6 +99,7 @@
         assertTrue(name.equals(objName.getLocalPart()));
     }
     
+    @Test
     public void testSetStreamableAttributes() {
         QName objName = new QName("object");
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
@@ -107,6 +112,7 @@
         assertTrue(mode == org.omg.CORBA.ARG_IN.value);
     }
     
+    @Test
     public void testReadStreamable() {
         QName objName = new QName("object");
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "char", CorbaConstants.NP_WSDL_CORBA);
@@ -128,6 +134,7 @@
         assertTrue(charValue.charValue() == 'c');
     }
     
+    @Test
     public void testWriteStreamable() {
         QName objName = new QName("object");
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "wstring", CorbaConstants.NP_WSDL_CORBA);
@@ -136,12 +143,11 @@
         obj.setValueFromData("TestWString");
         CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
         
-        Buffer buf = new Buffer();
-        OutputStream oStream = new OutputStream(buf);
+        OutputStream oStream = new OutputStream();
         streamable._write(oStream);
         
         InputStream iStream = oStream.create_input_stream();
         String value = iStream.read_wstring();
-        assertTrue(value.equals("TestWString"));
+        assertEquals("TestWString", value);
     }
 }

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java
Tue Jan  8 15:23:36 2008
@@ -24,36 +24,30 @@
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
 import org.apache.yoko.wsdl.CorbaConstants;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 
-import junit.framework.TestCase;
 
-public class CorbaAnyHandlerTest extends TestCase {
+public class CorbaAnyHandlerTest extends Assert {
 
     private ORB orb;
-    
-    public CorbaAnyHandlerTest(String arg0) {
-        super(arg0);
-    }
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaAnyHandlerTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
 
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -63,6 +57,7 @@
         } 
     }
 
+    @Test
     public void testCorbaAnyHandler() {
 
         Any a = orb.create_any();
@@ -82,12 +77,8 @@
 
         assertNotNull(resultAny);
 
-        try {
-            String value = resultAny.extract_string();
-            assertTrue(value.equals("TestMessage"));
-        } catch (Exception ex) {
-            assertTrue(false);
-        }
+        String value = resultAny.extract_string();
+        assertEquals("TestMessage", value);
 
         // Test get/set CorbaTypeMap methods
         CorbaTypeMap resultTM = anyHandler.getTypeMap();

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java
Tue Jan  8 15:23:36 2008
@@ -20,15 +20,17 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.schemas.yoko.bindings.corba.Array;
 import org.apache.yoko.wsdl.CorbaConstants;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 
-public class CorbaArrayHandlerTest extends TestCase {
+public class CorbaArrayHandlerTest extends Assert {
 
     private ORB orb;
     private CorbaArrayHandler obj;
@@ -36,20 +38,11 @@
     private QName objIdlType;
     private TypeCode objTypeCode;
     
-    public CorbaArrayHandlerTest(String arg0) {
-        super(arg0);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaArrayHandlerTest.class);
-    }
     
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
         obj = null;
@@ -58,7 +51,8 @@
         objTypeCode = null;
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -68,6 +62,7 @@
         }
     }
 
+    @Test
     public void testArrayHandler() {
         objName = new QName("object");
         objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "arrayType", CorbaConstants.NP_WSDL_CORBA);
@@ -80,8 +75,8 @@
         obj = new CorbaArrayHandler(objName, objIdlType, objTypeCode, arrayType);
         assertNotNull(obj);
 
-        int arrayData[] = { 2, 4, 6, 8, 10 };
-        for (int i = 0 ; i < arrayData.length; ++i) {
+        int arrayData[] = {2, 4, 6, 8, 10};
+        for (int i = 0; i < arrayData.length; ++i) {
             QName elName = new QName("item");
             QName elIdlType = CorbaConstants.NT_CORBA_LONG;
             TypeCode elTC = orb.get_primitive_tc(TCKind.tk_long);

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java
Tue Jan  8 15:23:36 2008
@@ -20,38 +20,30 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.schemas.yoko.bindings.corba.Enum;
 import org.apache.schemas.yoko.bindings.corba.Enumerator;
 import org.apache.yoko.wsdl.CorbaConstants;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 
-public class CorbaEnumHandlerTest extends TestCase {
+public class CorbaEnumHandlerTest extends Assert {
 
     private ORB orb;
-    
-    public CorbaEnumHandlerTest(String arg0) {
-        super(arg0);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaObjectHandlerTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
-        
+
+    @Before
+    public void setUp() throws Exception {
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -61,6 +53,7 @@
         }
     }
     
+    @Test
     public void testCorbaEnumHandler() {
         Enum enumType = new Enum();
         enumType.setName("EnumType");

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java
Tue Jan  8 15:23:36 2008
@@ -20,37 +20,30 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
 
 import org.apache.schemas.yoko.bindings.corba.Fixed;
 import org.apache.yoko.wsdl.CorbaConstants;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TypeCode;
 
-public class CorbaFixedHandlerTest extends TestCase {
+public class CorbaFixedHandlerTest extends Assert {
 
     private ORB orb;
     
-    public CorbaFixedHandlerTest(String arg0) {
-        super(arg0);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaObjectHandlerTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
-        
+    @Before
+    public void setUp() throws Exception {
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
     }
-    
-    protected void tearDown() throws Exception {
+
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -60,6 +53,7 @@
         }
     }
     
+    @Test
     public void testCorbaFixedHandler() {
         Fixed fixedType = new Fixed();
         fixedType.setName("FixedType");

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
Tue Jan  8 15:23:36 2008
@@ -18,59 +18,47 @@
  */
 package org.apache.yoko.bindings.corba.types;
 
-import java.net.URL;
-import java.util.ArrayList;
 import java.util.List;
 import javax.xml.namespace.QName;
 
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
-import org.apache.yoko.bindings.corba.CorbaBindingFactory;
-import org.apache.yoko.bindings.corba.CorbaBinding;
-import org.apache.yoko.bindings.corba.CorbaDestination;
-import org.apache.yoko.bindings.corba.CorbaTypeMap;
-import org.apache.yoko.bindings.corba.TestUtils;
-import org.apache.yoko.bindings.corba.utils.CorbaUtils;
-import org.apache.yoko.wsdl.CorbaConstants;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.interceptor.Interceptor;
-import org.apache.cxf.service.Service;
-import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.wsdl11.WSDLServiceFactory;
 
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
+import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
+import org.apache.yoko.bindings.corba.CorbaDestination;
+import org.apache.yoko.bindings.corba.CorbaTypeMap;
+import org.apache.yoko.bindings.corba.TestUtils;
+import org.apache.yoko.bindings.corba.utils.CorbaUtils;
+import org.apache.yoko.wsdl.CorbaConstants;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.omg.CORBA.ORB;
 
-import junit.framework.TestCase;
 
-public class CorbaHandlerUtilsTest extends TestCase {
 
-    private final String complexTypesNamespaceURI = "http://yoko.apache.org/ComplexTypes/idl_types";
-    private final String complexTypesPrefix = "corbatm";    
-    private ORB orb;
-    private Bus bus;    
+public class CorbaHandlerUtilsTest extends Assert {
+
     protected EndpointInfo endpointInfo;
     BindingFactory factory;
     CorbaTypeMap typeMap;
     ServiceInfo service;
-    
-    public CorbaHandlerUtilsTest(String arg0) {
-        super(arg0);
-    }
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaHandlerUtilsTest.class);
-    }    
+    private final String complexTypesNamespaceURI = "http://yoko.apache.org/ComplexTypes/idl_types";
+    private final String complexTypesPrefix = "corbatm";    
+    private ORB orb;
+    private Bus bus;    
     
-    protected void setUp() throws Exception {
-        super.setUp();
+    
+    @Before
+    public void setUp() throws Exception {
 
         bus = BusFactory.getDefaultBus();              
         BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);      
 
@@ -78,8 +66,8 @@
         bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);        
 
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
+        
+        
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
         
@@ -87,11 +75,13 @@
         //CorbaDestination destination = (CorbaDestination)getDestination();
         CorbaDestination destination = testUtils.getComplexTypesTestDestination();
         service = destination.getBindingInfo().getService();
-        List<TypeMappingType> corbaTypes = service.getDescription().getExtensors(TypeMappingType.class);
       
+        List<TypeMappingType> corbaTypes 
+            = service.getDescription().getExtensors(TypeMappingType.class);        
         typeMap = CorbaUtils.createCorbaTypeMap(corbaTypes);
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         bus.shutdown(true); 
         if (orb != null) {
             try {
@@ -123,6 +113,7 @@
         return destination;
     }*/
     
+    @Test
     public void testCreateTypeHandler() {
         QName objName = null;
         QName objIdlType = null;
@@ -171,6 +162,7 @@
         assertTrue(result instanceof CorbaUnionHandler);
     }
     
+    @Test
     public void testInitializeObjectHandler() {        
         QName objName = null;
         QName objIdlType = null;

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java
Tue Jan  8 15:23:36 2008
@@ -20,37 +20,33 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+
 
 import org.apache.yoko.wsdl.CorbaConstants;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 
-public class CorbaObjectHandlerTest extends TestCase {
+public class CorbaObjectHandlerTest extends Assert {
 
     private ORB orb;
-    
-    public CorbaObjectHandlerTest(String arg0) {
-        super(arg0);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaObjectHandlerTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
-        
+
+    @Before
+    public void setUp() throws Exception {
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
+        
+        
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -60,6 +56,7 @@
         }
     }
     
+    @Test
     public void testCreateCorbaObjectHandler() {
         QName objName = new QName("object");
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
@@ -68,6 +65,7 @@
         assertNotNull(obj);
     }
     
+    @Test
     public void testGetObjectAttributes() {
         QName objName = new QName("object");
         QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java
Tue Jan  8 15:23:36 2008
@@ -20,35 +20,29 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+
 
 import org.apache.yoko.wsdl.CorbaConstants;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 
-public class CorbaPrimitiveHandlerTest extends TestCase {
+public class CorbaPrimitiveHandlerTest extends Assert {
 
     private ORB orb;
     
-    public CorbaPrimitiveHandlerTest(String arg0) {
-        super(arg0);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaArrayHandlerTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
-        
+    @Before
+    public void setUp() throws Exception {
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -58,8 +52,9 @@
         }
     }
 
+    @Test
     public void testCreateCorbaBoolean() {
-        Boolean val = new Boolean(false);
+        Boolean val = Boolean.FALSE;
         CorbaPrimitiveHandler obj = 
             new CorbaPrimitiveHandler(new QName("boolean"),
                                       CorbaConstants.NT_CORBA_BOOLEAN,
@@ -79,6 +74,7 @@
         assertTrue(boolResult.booleanValue() == val.booleanValue());
     }
     
+    @Test
     public void testCreateCorbaChararacter() {
         Character val = new Character('c');
         CorbaPrimitiveHandler obj = 
@@ -106,6 +102,7 @@
         
     }
 
+    @Test
     public void testCreateCorbaWChararacter() {
         Character val = new Character('w');
         CorbaPrimitiveHandler obj = 
@@ -127,6 +124,7 @@
         assertTrue(charResult.charValue() == val.charValue());
     }
 
+    @Test
     public void testCreateCorbaOctet() {
         Byte val = new Byte((byte)100);
         CorbaPrimitiveHandler obj = 
@@ -148,6 +146,7 @@
         assertTrue(byteResult.byteValue() == val.byteValue());
     }
     
+    @Test
     public void testCreateCorbaShort() {
         Short val = new Short((short)1234);
         CorbaPrimitiveHandler obj = 
@@ -169,6 +168,7 @@
         assertTrue(shortResult.shortValue() == val.shortValue());
     }
 
+    @Test
     public void testCreateCorbaUShort() {
         Short val = new Short((short)4321);
         CorbaPrimitiveHandler obj = 
@@ -190,6 +190,7 @@
         assertTrue(shortResult.shortValue() == val.shortValue());
     }
 
+    @Test
     public void testCreateCorbaLong() {
         Integer val = new Integer(123456);
         CorbaPrimitiveHandler obj = 
@@ -211,6 +212,7 @@
         assertTrue(longResult.intValue() == val.intValue());
     }
 
+    @Test
     public void testCreateCorbaULong() {
         Integer val = new Integer(654321);
         CorbaPrimitiveHandler obj = 
@@ -232,6 +234,7 @@
         assertTrue(ulongResult.intValue() == val.intValue());
     }
 
+    @Test
     public void testCreateCorbaLongLong() {
         Long val = new Long(123456789);
         CorbaPrimitiveHandler obj = 
@@ -253,6 +256,7 @@
         assertTrue(longlongResult.longValue() == val.longValue());
     }
 
+    @Test
     public void testCreateCorbaULongLong() {
         Long val = new Long(987654321);
         CorbaPrimitiveHandler obj = 
@@ -274,6 +278,7 @@
         assertTrue(longlongResult.longValue() == val.longValue());
     }
 
+    @Test
     public void testCreateCorbaFloat() {
         Float val = new Float(1234.56);
         CorbaPrimitiveHandler obj = 
@@ -295,6 +300,7 @@
         assertTrue(floatResult.floatValue() == val.floatValue());
     }
 
+    @Test
     public void testCreateCorbaDouble() {
         Double val = new Double(123456.789);
         CorbaPrimitiveHandler obj = 
@@ -316,6 +322,7 @@
         assertTrue(doubleResult.doubleValue() == val.doubleValue());
     }
 
+    @Test
     public void testCreateCorbaString() {
         String val = "Test String";
         CorbaPrimitiveHandler obj = 
@@ -337,6 +344,7 @@
         assertTrue(stringResult.equals(val));
     }
 
+    @Test
     public void testCreateCorbaWString() {
         String val = "Test Wide String";
         CorbaPrimitiveHandler obj = 

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java
Tue Jan  8 15:23:36 2008
@@ -20,15 +20,19 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+
 
 import org.apache.schemas.yoko.bindings.corba.Sequence;
 import org.apache.yoko.wsdl.CorbaConstants;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
 
-public class CorbaSequenceHandlerTest extends TestCase {
+public class CorbaSequenceHandlerTest extends Assert {
 
     private ORB orb;
     private CorbaSequenceHandler obj;
@@ -36,20 +40,13 @@
     private QName objIdlType;
     private TypeCode objTypeCode;
     
-    public CorbaSequenceHandlerTest(String arg0) {
-        super(arg0);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaArrayHandlerTest.class);
-    }
     
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
+        
+        
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
         obj = null;
@@ -58,7 +55,8 @@
         objTypeCode = null;
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -68,6 +66,7 @@
         }
     }
 
+    @Test
     public void testCorbaSequenceHandler() {
         objName = new QName("object");
         objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "sequenceType", CorbaConstants.NP_WSDL_CORBA);
@@ -80,8 +79,8 @@
         obj = new CorbaSequenceHandler(objName, objIdlType, objTypeCode, sequenceType);
         assertNotNull(obj);
 
-        int sequenceData[] = { 2, 4, 6, 8, 10 };
-        for (int i = 0 ; i < sequenceData.length; ++i) {
+        int sequenceData[] = {2, 4, 6, 8, 10};
+        for (int i = 0; i < sequenceData.length; ++i) {
             QName elName = new QName("item");
             QName elIdlType = CorbaConstants.NT_CORBA_LONG;
             TypeCode elTC = orb.get_primitive_tc(TCKind.tk_long);

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java
Tue Jan  8 15:23:36 2008
@@ -20,12 +20,16 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+
 
 import org.apache.schemas.yoko.bindings.corba.MemberType;
 import org.apache.schemas.yoko.bindings.corba.Struct;
 import org.apache.yoko.wsdl.CorbaConstants;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.StructMember;
 import org.omg.CORBA.TCKind;
@@ -33,29 +37,20 @@
 
 // Since the exception handler is essentially the same as the struct handler (just included
in case 
 // structs and exceptions diverge at a later date), this test should cover both.
-public class CorbaStructHandlerTest extends TestCase {
+public class CorbaStructHandlerTest extends Assert {
 
     private ORB orb;
     
-    public CorbaStructHandlerTest(String arg0) {
-        super(arg0);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaObjectHandlerTest.class);
-    }
     
-    protected void setUp() throws Exception {
-        super.setUp();
-        
+    @Before
+    public void setUp() throws Exception {
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -65,6 +60,7 @@
         }
     }
     
+    @Test
     public void testCorbaStructHandler() {
         Struct structType = new Struct();
         structType.setName("TestStruct");

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/utils/ContextUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/utils/ContextUtilsTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/utils/ContextUtilsTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/utils/ContextUtilsTest.java
Tue Jan  8 15:23:36 2008
@@ -20,40 +20,27 @@
 
 package org.apache.yoko.bindings.corba.utils;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Holder for utility methods relating to contexts.
  */
-public final class ContextUtilsTest extends TestCase {
-    
-    public ContextUtilsTest(String arg0) {
-        super(arg0);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(ContextUtilsTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();        
-    }
-    
-    protected void tearDown() throws Exception {        
-    }
-    
+public final class ContextUtilsTest extends Assert {
     
+
+    @Test
     public void testIsRequestor() throws Exception {
         Message message = new MessageImpl();
         message.put("org.apache.cxf.client", "org.apache.cxf.client");
         assertEquals(ContextUtils.isRequestor(message), true);               
     }
 
+    @Test
     public void testIsOutbound() throws Exception {
         Message message = new MessageImpl();
         Exchange exchange = new ExchangeImpl();

Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java?rev=610221&r1=610220&r2=610221&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java
(original)
+++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/utils/CorbaUtilsTest.java
Tue Jan  8 15:23:36 2008
@@ -21,39 +21,34 @@
 import java.util.Stack;
 
 import javax.xml.namespace.QName;
-import junit.framework.TestCase;
 
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
 import org.apache.schemas.yoko.bindings.corba.CorbaType;
 import org.apache.yoko.bindings.corba.CorbaBindingException;
 import org.apache.yoko.bindings.corba.CorbaTypeMap;
 import org.apache.yoko.wsdl.CorbaConstants;
 
-public class CorbaUtilsTest extends TestCase {
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+
+public class CorbaUtilsTest extends Assert {
 
     private static ORB orb;
     
-    public CorbaUtilsTest(String arg0) {
-        super(arg0);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CorbaUtilsTest.class);
-    }
-    
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setUp() throws Exception {
         java.util.Properties props = System.getProperties();
-        props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
-        props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
         props.put("yoko.orb.id", "Yoko-Server-Binding");
         orb = ORB.init(new String[0], props);
     }
     
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         if (orb != null) {
             try {
                 orb.destroy();
@@ -63,6 +58,7 @@
         }
     }
     
+    @Test
     public void testBooleanTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -71,6 +67,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testCharTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "char", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -79,6 +76,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testWCharTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "wchar", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -87,6 +85,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testOctetTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "octet", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -95,6 +94,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testShortTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "short", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -103,6 +103,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testUShortTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ushort", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -111,6 +112,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testLongTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "long", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -119,6 +121,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testULongTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ulong", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -127,6 +130,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testLongLongTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "longlong", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -135,6 +139,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testULongLongTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ulonglong", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -143,6 +148,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testFloatTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "float", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -151,6 +157,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testDoubleTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "double", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -159,6 +166,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testStringTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "string", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -167,6 +175,7 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testWStringTypeCode() {
         QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "wstring", "corba");
         TypeCode tc = CorbaUtils.getPrimitiveTypeCode(orb, type);
@@ -175,15 +184,17 @@
         assertTrue(CorbaUtils.isPrimitiveIdlType(type));
     }
     
+    @Test
     public void testErrorConditionNullTypeQName() {
         try {
             CorbaUtils.getTypeCode(orb, null, new CorbaTypeMap("dud:namespace"));
             fail("expect exception on null type");
-        } catch (CorbaBindingException expected) {     
+        } catch (CorbaBindingException expected) {
+            //ignore
         }
         
         CorbaTypeMap typeMap = new CorbaTypeMap("dud:namespace");
-        QName seen = new QName("bla","Bla");
+        QName seen = new QName("bla", "Bla");
         Stack<QName> seenTypes = new Stack<QName>();            
         seenTypes.add(seen);
         try {



Mime
View raw message