Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceTest.java?rev=610221&r1=610220&r2=610221&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReferenceTest.java Tue Jan 8 15:23:36 2008 @@ -18,16 +18,13 @@ */ package org.apache.yoko.bindings.corba; -import java.io.File; -import java.util.HashMap; import java.net.URL; +import java.util.HashMap; import java.util.Map; -import java.util.Properties; import javax.jws.WebService; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; -import javax.xml.ws.BindingType; import javax.xml.ws.Endpoint; import javax.xml.ws.Service; @@ -39,58 +36,47 @@ import org.apache.cxf.wsdl.WSDLManager; import org.apache.cxf.wsdl11.WSDLManagerImpl; -import org.apache.schemas.yoko.idl.objectref.TestDefaultObjectParam; -import org.apache.schemas.yoko.idl.objectref.TestDefaultObjectParamResponse; -import org.apache.schemas.yoko.idl.objectref.TestDefaultObjectReturn; -import org.apache.schemas.yoko.idl.objectref.TestDefaultObjectReturnResponse; import org.apache.schemas.yoko.idl.objectref.TestInterface; import org.apache.schemas.yoko.idl.objectref.TestInterfaceCORBAService; import org.apache.schemas.yoko.idl.objectref.TestObject; -import org.apache.schemas.yoko.idl.objectref.TestObjectCORBAService; -import org.apache.yoko.bindings.corba.utils.CorbaBindingHelper; -import org.apache.yoko.orb.CORBA.ORB; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; -import junit.framework.TestCase; -public class CorbaObjectReferenceTest extends TestCase { - private final QName OBJECT_PORT_NAME = +public class CorbaObjectReferenceTest extends Assert { + + private static final QName OBJECT_PORT_NAME = new QName("http://schemas.apache.org/yoko/idl/ObjectRef";, "TestObjectCORBAPort"); - private final QName OBJECT_PORT_TYPE = + private static final QName OBJECT_PORT_TYPE = new QName("http://schemas.apache.org/yoko/idl/ObjectRef";, "TestObject"); - private final QName OBJECT_SERVICE_NAME = + private static final QName OBJECT_SERVICE_NAME = new QName("http://schemas.apache.org/yoko/idl/ObjectRef";, "TestObjectCORBAService"); - private final QName INTERFACE_PORT_NAME = + private static final QName INTERFACE_PORT_NAME = new QName("http://schemas.apache.org/yoko/idl/ObjectRef";, "TestInterfaceCORBAPort"); - private final QName INFERRED_INTERFACE_PORT_NAME = + private static final QName INFERRED_INTERFACE_PORT_NAME = new QName("http://schemas.apache.org/yoko/idl/ObjectRef";, "TestInterfaceCORBAPort"); - private final QName INTERFACE_SERVICE_NAME = + private static final QName INTERFACE_SERVICE_NAME = new QName("http://schemas.apache.org/yoko/idl/ObjectRef";, "TestInterfaceCORBAService"); - private final static String WSDL_LOCATION = "/wsdl/ObjectRef.wsdl"; - private final static int MAX_WAIT_COUNT = 15; + private static final String WSDL_LOCATION = "/wsdl/ObjectRef.wsdl"; + private static final int MAX_WAIT_COUNT = 15; private static TestServer server; private static boolean testServerReady; private TestInterface client; private URL wsdlUrl; - public CorbaObjectReferenceTest(String arg0) { - super(arg0); - } - public static void main(String[] args) { - junit.textui.TestRunner.run(CorbaObjectReferenceTest.class); - } - - protected void setUp() throws Exception { - super.setUp(); - + @Before + public void setUp() throws Exception { if (server == null) { System.out.println("Initializing object reference support test..."); server = new TestServer(); @@ -130,9 +116,8 @@ } } - protected void tearDown() throws Exception { - super.tearDown(); - + @After + public void tearDown() throws Exception { server.interrupt(); try { @@ -147,6 +132,7 @@ } } + @Test public void testCustomObjectParam() { System.out.println("Testing custom object reference as a parameter..."); EndpointReferenceType ref = null; @@ -156,6 +142,7 @@ assertTrue(result); } + @Test public void testDefaultObjectParam() { System.out.println("Testing default object reference as a parameter..."); EndpointReferenceType ref = null; @@ -199,24 +186,28 @@ assertNull(portName); } + @Test public void testNilObjectParam() { System.out.println("Testing nil object reference as a parameter..."); boolean result = client.testNilObjectParam(null); assertTrue(result); } + @Test public void testNilObjectReturn() { System.out.println("Testing nil object reference as a return value..."); EndpointReferenceType result = client.testNilObjectReturn(); assertTrue(result == null); } + @Test public void testInferredObjectParam() { EndpointReferenceType ref = null; ref = createEndpointReferenceType("InferredObjectParam", false); assertTrue(client.testInferredObjectParam(ref)); } + @Test public void testInferredObjectReturn() { EndpointReferenceType ref = client.testInferredObjectReturn(); @@ -277,30 +268,30 @@ } public TestObject createObjectFromEndpointReferenceType(EndpointReferenceType epr) throws Exception { - WSDLManager manager = null; - manager = new WSDLManagerImpl(); + WSDLManager manager = null; + manager = new WSDLManagerImpl(); - QName interfaceName = EndpointReferenceUtils.getInterfaceName(epr); - QName serviceName = EndpointReferenceUtils.getServiceName(epr); - String portName = EndpointReferenceUtils.getPortName(epr); + QName interfaceName = EndpointReferenceUtils.getInterfaceName(epr); + QName serviceName = EndpointReferenceUtils.getServiceName(epr); + String portName = EndpointReferenceUtils.getPortName(epr); - QName port = new QName(serviceName.getNamespaceURI(), portName); + QName port = new QName(serviceName.getNamespaceURI(), portName); - StringBuffer seiName = new StringBuffer(); - seiName.append("org.apache.schemas.yoko.idl.objectref."); - seiName.append(JAXBUtils.nameToIdentifier(interfaceName.getLocalPart(), - JAXBUtils.IdentifierType.INTERFACE)); + StringBuffer seiName = new StringBuffer(); + seiName.append("org.apache.schemas.yoko.idl.objectref."); + seiName.append(JAXBUtils.nameToIdentifier(interfaceName.getLocalPart(), + JAXBUtils.IdentifierType.INTERFACE)); - Class<?> sei = null; - sei = Class.forName(seiName.toString(), true, manager.getClass().getClassLoader()); + Class<?> sei = null; + sei = Class.forName(seiName.toString(), true, manager.getClass().getClassLoader()); - Service service = Service.create(wsdlUrl, serviceName); - TestObject testObj = (TestObject)service.getPort(port, sei); + Service service = Service.create(wsdlUrl, serviceName); + TestObject testObj = (TestObject)service.getPort(port, sei); - Map<String, Object> requestContext = ((BindingProvider)testObj).getRequestContext(); - requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, epr.getAddress().getValue()); + Map<String, Object> requestContext = ((BindingProvider)testObj).getRequestContext(); + requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, epr.getAddress().getValue()); - return testObj; + return testObj; } @@ -376,10 +367,10 @@ QName serviceName = EndpointReferenceUtils.getServiceName(param); String portName = EndpointReferenceUtils.getPortName(param); - if (interfaceName != null || - wsdlLocation != null || - serviceName != null || - portName != null) { + if (interfaceName != null + || wsdlLocation != null + || serviceName != null + || portName != null) { return false; } @@ -417,13 +408,13 @@ String portName = EndpointReferenceUtils.getPortName(param); // EPR should be complete - if (param.getAddress().getValue() != null && - interfaceName != null && - wsdlLocation != null && - serviceName != null && - portName != null) { + if (param.getAddress().getValue() != null + && interfaceName != null + && wsdlLocation != null + && serviceName != null + && portName != null) { - ret = true; + ret = true; } return ret;
Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaOperationNameManglingTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaOperationNameManglingTest.java?rev=610221&r1=610220&r2=610221&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaOperationNameManglingTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaOperationNameManglingTest.java Tue Jan 8 15:23:36 2008 @@ -18,65 +18,51 @@ */ package org.apache.yoko.bindings.corba; -import java.io.File; -import java.util.HashMap; import java.net.URL; +import java.util.HashMap; import java.util.Map; -import java.util.Properties; import javax.jws.WebService; import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; import javax.xml.ws.Endpoint; -import javax.xml.ws.Service; - -import org.apache.cxf.jaxb.JAXBUtils; -import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.wsdl.EndpointReferenceUtils; -import org.apache.cxf.wsdl.WSDLManager; -import org.apache.cxf.wsdl11.WSDLManagerImpl; import org.apache.schemas.yoko.idl.opnames.M1M1Interface; import org.apache.schemas.yoko.idl.opnames.M1M1InterfaceCORBAService; import org.apache.schemas.yoko.idl.opnames.M2M2Interface; import org.apache.schemas.yoko.idl.opnames.M2M2InterfaceCORBAService; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; -import junit.framework.TestCase; -public class CorbaOperationNameManglingTest extends TestCase { - private final QName INTERFACE1_PORT_NAME = +public class CorbaOperationNameManglingTest extends Assert { + + private static final QName INTERFACE1_PORT_NAME = new QName("http://schemas.apache.org/yoko/idl/OpNames";, "M1.M1InterfaceCORBAPort"); - private final QName INTERFACE1_SERVICE_NAME = + private static final QName INTERFACE1_SERVICE_NAME = new QName("http://schemas.apache.org/yoko/idl/OpNames";, "M1.M1InterfaceCORBAService"); - private final QName INTERFACE2_PORT_NAME = + private static final QName INTERFACE2_PORT_NAME = new QName("http://schemas.apache.org/yoko/idl/OpNames";, "M2.M2InterfaceCORBAPort"); - private final QName INTERFACE2_SERVICE_NAME = + private static final QName INTERFACE2_SERVICE_NAME = new QName("http://schemas.apache.org/yoko/idl/OpNames";, "M2.M2InterfaceCORBAService"); - private final static String WSDL_LOCATION = "/wsdl/OpNames.wsdl"; - private final static int MAX_WAIT_COUNT = 15; + private static final String WSDL_LOCATION = "/wsdl/OpNames.wsdl"; + private static final int MAX_WAIT_COUNT = 15; private static TestInterface1Server server1; private static TestInterface2Server server2; - private static boolean testServerReady; private M1M1Interface client1; private M2M2Interface client2; private URL wsdlUrl; - public CorbaOperationNameManglingTest(String arg0) { - super(arg0); - } - public static void main(String[] args) { - junit.textui.TestRunner.run(CorbaOperationNameManglingTest.class); - } - - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { if (server1 == null) { server1 = new TestInterface1Server(); @@ -142,9 +128,8 @@ } } - protected void tearDown() throws Exception { - super.tearDown(); - + @After + public void tearDown() throws Exception { server1.interrupt(); try { @@ -172,6 +157,7 @@ } } + @Test public void testM1M1InterfaceTestOp() { String result = null; try { @@ -181,9 +167,10 @@ assertTrue(false); } assertNotNull(result); - assertTrue(result.equals("M1Interface")); + assertEquals("M1Interface", result); } + @Test public void testM2M2InterfaceTestOp() { String result = null; try { @@ -193,7 +180,7 @@ assertTrue(false); } assertNotNull(result); - assertTrue(result.equals("M2Interface")); + assertEquals("M2Interface", result); } @@ -252,9 +239,9 @@ targetNamespace = "http://schemas.apache.org/yoko/idl/OpNames";, endpointInterface = "org.apache.schemas.yoko.idl.opnames.M1M1Interface") public class M1InterfaceImpl implements M1M1Interface { - public String testOp() { - return "M1Interface"; - } + public String testOp() { + return "M1Interface"; + } } @WebService(portName = "M2.M2InterfaceCORBAPort", @@ -262,8 +249,8 @@ targetNamespace = "http://schemas.apache.org/yoko/idl/OpNames";, endpointInterface = "org.apache.schemas.yoko.idl.opnames.M2M2Interface") public class M2InterfaceImpl implements M2M2Interface { - public String m2M2InterfaceTestOp() { - return "M2Interface"; - } + public String m2M2InterfaceTestOp() { + return "M2Interface"; + } } } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java?rev=610221&r1=610220&r2=610221&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaPolyNestedObjReferenceTest.java Tue Jan 8 15:23:36 2008 @@ -18,16 +18,13 @@ */ package org.apache.yoko.bindings.corba; -import java.io.File; -import java.util.HashMap; import java.net.URL; +import java.util.HashMap; import java.util.Map; -import java.util.Properties; import javax.jws.WebService; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; -import javax.xml.ws.BindingType; import javax.xml.ws.Endpoint; import javax.xml.ws.Holder; import javax.xml.ws.Service; @@ -40,52 +37,42 @@ import org.apache.cxf.wsdl11.WSDLManagerImpl; import org.apache.schemas.yoko.idl.polynestedobjref.Foo; -import org.apache.schemas.yoko.idl.polynestedobjref.FooCORBAService; import org.apache.schemas.yoko.idl.polynestedobjref.FooFactory; import org.apache.schemas.yoko.idl.polynestedobjref.FooFactoryCORBAService; import org.apache.schemas.yoko.idl.polynestedobjref.FooRefStruct; import org.apache.schemas.yoko.idl.polynestedobjref.FooRefUnion; -import org.apache.type_test.types1.EmptyStruct; -import org.apache.yoko.bindings.corba.CorbaObjectReferenceTest.TestObjectImpl; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; -import junit.framework.TestCase; -public class CorbaPolyNestedObjReferenceTest extends TestCase { - private final QName OBJECT_PORT_NAME = +public class CorbaPolyNestedObjReferenceTest extends Assert { + + private static final QName OBJECT_PORT_NAME = new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef";, "FooCORBAPort"); - private final QName OBJECT_PORT_TYPE = + private static final QName OBJECT_PORT_TYPE = new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef";, "Foo"); - private final QName OBJECT_SERVICE_NAME = + private static final QName OBJECT_SERVICE_NAME = new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef";, "FooCORBAService"); - private final QName INTERFACE_PORT_NAME = + private static final QName INTERFACE_PORT_NAME = new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef";, "FooFactoryCORBAPort"); - private final QName INTERFACE_SERVICE_NAME = + private static final QName INTERFACE_SERVICE_NAME = new QName("http://schemas.apache.org/yoko/idl/PolyNestedObjRef";, "FooFactoryCORBAService"); - private final static String WSDL_LOCATION = "/wsdl/PolyNestedObjRef.wsdl"; - private final static int MAX_WAIT_COUNT = 15; + private static final String WSDL_LOCATION = "/wsdl/PolyNestedObjRef.wsdl"; + private static final int MAX_WAIT_COUNT = 15; private static TestServer server; - private static boolean testServerReady; private FooFactory client; private URL wsdlUrl; - public CorbaPolyNestedObjReferenceTest(String arg0) { - super(arg0); - } - - public static void main(String[] args) { - junit.textui.TestRunner.run(CorbaPolyNestedObjReferenceTest.class); - } - - protected void setUp() throws Exception { - super.setUp(); - + @Before + public void setUp() throws Exception { if (server == null) { server = new TestServer(); server.start(); @@ -124,7 +111,8 @@ } } - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { super.tearDown(); server.interrupt(); @@ -141,6 +129,7 @@ } } + @Test public void testCreateFooRefInStruct() { FooRefStruct ref = client.createFooRefInStruct("FooRefInStruct"); //EndpointReferenceType epr = createObjectFromEndpointReferenceType(ref.getRef()); @@ -165,6 +154,7 @@ assertNull("Null EPR expected", ref.getRef()); } + @Test public void testCreateFooRefInUnion() { FooRefUnion ref = client.createFooRefInUnion(); EndpointReferenceType epr = ref.getU12(); @@ -183,6 +173,7 @@ assertTrue(portName.equals(OBJECT_PORT_NAME.getLocalPart())); } + @Test public void testInferredObjectReturn() { EndpointReferenceType ref = client.testInferredObjectReturn(); @@ -202,6 +193,7 @@ assertNotNull(portName); } + @Test public void testNestedInferredObjectParam() { FooRefStruct ref = client.createFooRefInStruct("FooRefInStruct"); FooRefStruct ref2 = client.createFooRefInStruct("FooRefInStruct"); Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java?rev=610221&r1=610220&r2=610221&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaServerConduitTest.java Tue Jan 8 15:23:36 2008 @@ -21,9 +21,8 @@ import java.io.OutputStream; import java.lang.reflect.Method; import java.net.URL; -import java.util.List; import javax.xml.namespace.QName; -import junit.framework.TestCase; + import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; @@ -35,20 +34,24 @@ import org.apache.cxf.transport.MessageObserver; import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.wsdl11.WSDLServiceFactory; +import org.apache.yoko.bindings.corba.runtime.CorbaStreamableImpl; +import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler; +import org.apache.yoko.bindings.corba.utils.OrbConfig; +import org.apache.yoko.wsdl.CorbaConstants; import org.easymock.classextension.EasyMock; import org.easymock.classextension.IMocksControl; +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.NVList; import org.omg.CORBA.ORB; import org.omg.CORBA.ServerRequest; import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; -import org.apache.yoko.bindings.corba.runtime.CorbaStreamableImpl; -import org.apache.yoko.bindings.corba.types.CorbaPrimitiveHandler; -import org.apache.yoko.bindings.corba.utils.OrbConfig; -import org.apache.yoko.orb.CORBA.NVList; -import org.apache.yoko.wsdl.CorbaConstants; -public class CorbaServerConduitTest extends TestCase { +public class CorbaServerConduitTest extends Assert { IMocksControl control; ORB orb; @@ -62,22 +65,16 @@ OrbConfig orbConfig; CorbaTypeMap corbaTypeMap; - public CorbaServerConduitTest(String arg0) { - super(arg0); - } - - public static void main(String[] args) { - junit.textui.TestRunner.run(CorbaBindingFactoryTest.class); - } - + + @Before public void setUp() throws Exception { control = EasyMock.createNiceControl(); bus = BusFactory.getDefaultBus(); 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); orbConfig = new OrbConfig(); @@ -85,6 +82,7 @@ orbConfig.setOrbSingletonClass("org.apache.yoko.orb.CORBA.ORBSingleton"); } + @After public void tearDown() { bus.shutdown(true); if (orb != null) { @@ -96,11 +94,13 @@ } } + @Test public void testCorbaServerConduit() throws Exception { CorbaServerConduit conduit = setupCorbaServerConduit(false); assertTrue("conduit should not be null", conduit != null); } + @Test public void testPrepare() throws Exception { setupServiceInfo("http://yoko.apache.org/simple";, "/wsdl/simpleIdl.wsdl", "SimpleCORBAService", @@ -126,6 +126,7 @@ } + @Test public void testGetTargetReference() throws Exception { setupServiceInfo("http://yoko.apache.org/simple";, "/wsdl/simpleIdl.wsdl", "SimpleCORBAService", @@ -143,6 +144,7 @@ destination.shutdown(); } + @Test public void testGetAddress() throws Exception { setupServiceInfo("http://yoko.apache.org/simple";, "/wsdl/simpleIdl.wsdl", "SimpleCORBAService", @@ -159,6 +161,7 @@ assertEquals(address, "corbaloc::localhost:40000/Simple"); } + @Test public void testClose() throws Exception { Method m = CorbaServerConduit.class.getDeclaredMethod("buildRequestResult", @@ -168,7 +171,7 @@ CorbaMessage msg = control.createMock(CorbaMessage.class); conduit.buildRequestResult(msg); EasyMock.expectLastCall(); - OutputStream stream =control.createMock(OutputStream.class); + OutputStream stream = control.createMock(OutputStream.class); EasyMock.expect(msg.getContent(OutputStream.class)).andReturn(stream); stream.close(); EasyMock.expectLastCall(); @@ -178,6 +181,7 @@ control.verify(); } + @Test public void testBuildRequestResult() { NVList list = (NVList)orb.create_list(0); CorbaServerConduit conduit = setupCorbaServerConduit(false); @@ -203,6 +207,7 @@ control.verify(); } + @Test public void testBuildRequestResultException() { NVList list = (NVList)orb.create_list(0); CorbaServerConduit conduit = setupCorbaServerConduit(false); @@ -233,6 +238,7 @@ control.verify(); } + @Test public void testBuildRequestResultArgumentReturn() { CorbaStreamable[] arguments = new CorbaStreamable[1]; QName objName = new QName("object"); @@ -301,9 +307,9 @@ protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) { URL wsdlUrl = getClass().getResource(wsdl); assertNotNull(wsdlUrl); - WSDLServiceFactory factory = new WSDLServiceFactory(bus, wsdlUrl, new QName(ns, serviceName)); + WSDLServiceFactory f = new WSDLServiceFactory(bus, wsdlUrl, new QName(ns, serviceName)); - Service service = factory.create(); + Service service = f.create(); endpointInfo = service.getEndpointInfo(new QName(ns, portName)); } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java?rev=610221&r1=610220&r2=610221&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaSystemExceptionTest.java Tue Jan 8 15:23:36 2008 @@ -39,9 +39,9 @@ import org.apache.schemas.yoko.idl.systemex.SystemExceptionTester; import org.apache.schemas.yoko.idl.systemex.SystemExceptionTesterCORBAService; -import junit.framework.TestCase; -public class CorbaSystemExceptionTest extends TestCase { + +public class CorbaSystemExceptionTest extends Assert { public final static int COMM_FAILURE = 1; public final static int TRANSIENT = 2; @@ -69,7 +69,8 @@ junit.textui.TestRunner.run(CorbaSystemExceptionTest.class); } - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { super.setUp(); if (server == null) { @@ -108,7 +109,8 @@ } } - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { super.tearDown(); server.interrupt(); Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java?rev=610221&r1=610220&r2=610221&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java Tue Jan 8 15:23:36 2008 @@ -19,27 +19,22 @@ package org.apache.yoko.bindings.corba; import javax.xml.namespace.QName; -import junit.framework.TestCase; + import org.apache.yoko.wsdl.CorbaTypeImpl; +import org.junit.Assert; +import org.junit.Test; -public class CorbaTypeMapTest extends TestCase { - - public CorbaTypeMapTest(String arg0) { - super(arg0); - } - - public static void main(String[] args) { - junit.textui.TestRunner.run(CorbaTypeMapTest.class); - } - +public class CorbaTypeMapTest extends Assert { + + @Test public void testCorbaTypeMap() throws Exception { CorbaTypeMap typeMap = new CorbaTypeMap("http://yoko.apache.org/ComplexTypes";); String targetNamespace = typeMap.getTargetNamespace(); - assertEquals(targetNamespace,"http://yoko.apache.org/ComplexTypes";); + assertEquals(targetNamespace, "http://yoko.apache.org/ComplexTypes";); - QName qname = new QName("http://yoko.apache.org/ComplexTypes","Test.MultiPart.Colour";, ""); - QName type = new QName("http://yoko.apache.org/ComplexTypes","xsd1:Test.MultiPart.Colour";, ""); + QName qname = new QName("http://yoko.apache.org/ComplexTypes";, "Test.MultiPart.Colour", ""); + QName type = new QName("http://yoko.apache.org/ComplexTypes";, "xsd1:Test.MultiPart.Colour", ""); CorbaTypeImpl corbaTypeImpl = new CorbaTypeImpl(); corbaTypeImpl.setQName(qname); Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTest.java?rev=610221&r1=610220&r2=610221&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTest.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTest.java Tue Jan 8 15:23:36 2008 @@ -24,21 +24,23 @@ import javax.xml.namespace.QName; -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestSeqLong; import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestStruct1; import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestUnion1; import org.apache.schemas.yoko.idl.idltowsdl_type_test.IdltowsdlTypeTestEnum1; +import org.junit.Ignore; +import org.junit.Test; public class IdlToWsdlTypeTest extends AbstractIdlToWsdlTypeTestClient { protected static final String WSDL_PATH = "/wsdl/type_test/idltowsdl_type_test.wsdl"; - protected static final QName SERVICE_NAME = new QName("http://schemas.apache.org/yoko/idl/idltowsdl_type_test";, "idltowsdlTypeTestCORBAService"); - protected static final QName PORT_NAME = new QName("http://schemas.apache.org/yoko/idl/idltowsdl_type_test";, "idltowsdlTypeTestCORBAPort"); + protected static final QName SERVICE_NAME + = new QName("http://schemas.apache.org/yoko/idl/idltowsdl_type_test";, + "idltowsdlTypeTestCORBAService"); + protected static final QName PORT_NAME + = new QName("http://schemas.apache.org/yoko/idl/idltowsdl_type_test";, + "idltowsdlTypeTestCORBAPort"); - static boolean serverStarted = false; + static boolean serverStarted; public IdlToWsdlTypeTest(String name) { super(name); @@ -111,9 +113,30 @@ // following empty methods override real implementation until test failures are resolved - public void testUnsignedLong() { } - public void testWchar() { } - public void testOctet () { } - public void testWstring() { } - public void testAnonWstring() { } + @Test + @Ignore + public void testUnsignedLong() { + //failure + } + @Test + @Ignore + public void testWchar() { + //failure + } + @Test + @Ignore + public void testOctet() { + //failure + } + @Test + @Ignore + public void testWstring() { + //failure + } + + @Test + @Ignore + public void testAnonWstring() { + //failure + } } Modified: incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTestServer.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTestServer.java?rev=610221&r1=610220&r2=610221&view=diff ============================================================================== --- incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTestServer.java (original) +++ incubator/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/yoko/bindings/corba/IdlToWsdlTypeTestServer.java Tue Jan 8 15:23:36 2008 @@ -22,20 +22,12 @@ import java.util.HashMap; import java.util.Map; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.WebParam.Mode; import javax.xml.ws.Endpoint; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; -import org.apache.schemas.yoko.idl.idltowsdl_type_test.*; public class IdlToWsdlTypeTestServer { - boolean serverReady = false; + boolean serverReady; public void _start() { Object implementor = new IdlToWsdlTypeTestImpl();
