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 en...@apache.org on 2006/11/29 15:37:03 UTC
svn commit: r480600 - in
/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba:
./ interceptors/
Author: enolan
Date: Wed Nov 29 07:37:01 2006
New Revision: 480600
URL: http://svn.apache.org/viewvc?view=rev&rev=480600
Log:
Yoko-225 - Updating and adding new tests.
Added:
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/interceptors/
Removed:
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/AbstractCorbaTester.java
Modified:
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/ContextUtilsTest.java Wed Nov 29 07:37:01 2006
@@ -20,6 +20,8 @@
package org.apache.yoko.bindings.corba2;
+import junit.framework.TestCase;
+
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
@@ -28,7 +30,23 @@
/**
* Holder for utility methods relating to contexts.
*/
-public final class ContextUtilsTest extends TestUtils {
+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 void testIsRequestor() throws Exception {
Message message = new MessageImpl();
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaConduitTest.java Wed Nov 29 07:37:01 2006
@@ -18,57 +18,41 @@
*/
package org.apache.yoko.bindings.corba2;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.logging.Level;
-
import javax.xml.namespace.QName;
-import javax.xml.ws.Binding;
-
import junit.framework.TestCase;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactoryHelper;
-import org.apache.cxf.binding.BindingFactory;
-import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.binding.BindingFactoryManagerImpl;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointImpl;
-import org.apache.cxf.interceptor.Interceptor;
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.apache.cxf.service.Service;
-import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.transport.Conduit;
-import org.apache.cxf.transport.Destination;
+
import org.apache.cxf.transport.MessageObserver;
-import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
-import org.objectweb.celtix.wsdl.EndpointReferenceUtils;
import org.omg.CORBA.Any;
import org.omg.CORBA.Context;
import org.omg.CORBA.ContextList;
import org.omg.CORBA.ExceptionList;
import org.omg.CORBA.NamedValue;
import org.omg.CORBA.ORB;
-import org.omg.CORBA.Request;
+import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
import org.apache.schemas.yoko.bindings.corba.OperationType;
@@ -81,9 +65,9 @@
public class CorbaConduitTest extends TestCase {
- IMocksControl control;
- ORB orb;
- Bus bus;
+ private static IMocksControl control;
+ private static ORB orb;
+ private static Bus bus;
protected EndpointInfo endpointInfo;
protected EndpointReferenceType target;
protected MessageObserver observer;
@@ -185,7 +169,6 @@
BindingOperationInfo bopInfo = control.createMock(BindingOperationInfo.class);
EasyMock.expect(exg.get(BindingOperationInfo.class)).andReturn(bopInfo);
OperationType opType = control.createMock(OperationType.class);
- // EasyMock.expect(bopInfo.getExtensor(OperationType.class)).andReturn(opType);
bopInfo.getExtensor(OperationType.class);
EasyMock.expectLastCall().andReturn(opType);
conduit.buildRequest(msg, opType);
@@ -222,48 +205,70 @@
control.replay();
conduit.getOperationExceptions(opType, typeMaps);
- assertEquals(exlist.size(),0);
-
+ assertEquals(exlist.size(),0);
}
public void testBuildRequest() {
- CorbaConduit conduit = control.createMock(CorbaConduit.class);
- Message m = new MessageImpl();
- CorbaMessage cm = control.createMock(CorbaMessage.class);
+
+ CorbaStreamable[] arguments = new CorbaStreamable[1];
+ QName objName = new QName("object");
+ QName objIdlType = new QName(CORBAConstants.NU_WSDL_CORBA, "short", CORBAConstants.NP_WSDL_CORBA);
+ TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
+ CorbaPrimitiveHandler obj1 = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
+ CorbaStreamable arg = new CorbaStreamable(obj1, objName);
+ arguments[0] = arg;
+ arguments[0].setMode(org.omg.CORBA.ARG_OUT.value);
+
+
+ CorbaConduit conduit = setupCorbaConduit(false);
+ //Message msg = new MessageImpl();
+ Message msg = control.createMock(MessageImpl.class);
+ CorbaMessage cm = control.createMock(CorbaMessage.class);
Exchange exchange = control.createMock(Exchange.class);
EasyMock.expect(cm.getExchange()).andReturn(exchange);
ServiceInfo service = control.createMock(ServiceInfo.class);
EasyMock.expect(exchange.get(ServiceInfo.class)).andReturn(service);
- List list = control.createMock(List.class);
- EasyMock.expect(service.getExtensors(TypeMappingType.class)).andReturn(list);
+ List<TypeMappingType> list = control.createMock(List.class);
+ EasyMock.expect(service.getExtensors(TypeMappingType.class)).andReturn(list);
- CorbaStreamable[] arguments = new CorbaStreamable[0];
- EasyMock.expect(cm.getStreamableArguments()).andReturn(arguments);
- CorbaStreamable returnParam = null;
- EasyMock.expect(cm.getStreamableReturn()).andReturn(returnParam);
+ EasyMock.expect(cm.getStreamableArguments()).andReturn(null);
+ EasyMock.expect(cm.getStreamableReturn()).andReturn(null);
- OperationType opType = control.createMock(OperationType.class);
+ //OperationType opType = control.createMock(OperationType.class);
+ OperationType opType = new OperationType();
+ opType.setName("GreetMe");
List<CorbaTypeMap> typeMaps = control.createMock(List.class);
- Map<TypeCode, RaisesType> exceptions = control.createMock(HashMap.class);
- EasyMock.expect(conduit.getOperationExceptions(opType, typeMaps));
- EasyMock.expectLastCall().andReturn(exceptions);
+ //Map<TypeCode, RaisesType> exceptions = control.createMock(HashMap.class);
+ conduit.getOperationExceptions(opType, typeMaps);
+ EasyMock.expectLastCall().andReturn(null);
- String opName = "greetme";
- opType.setName(opName);
+ Endpoint endpoint = null;
+ Service s = null;
+ try {
+ endpoint = new EndpointImpl(bus, s, endpointInfo);
+ }catch (Exception ex) {
+
+ }
+ msg.put("endpoint", endpoint);
+ cm.put("endpoint", endpoint);
- org.omg.CORBA.Object obj = control.createMock(org.omg.CORBA.Object.class);
- //Endpoint endpoint = control.createMock(EndpointImpl.class);
- m.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, obj);
+ msg.get(CorbaConstants.CORBA_ENDPOINT_OBJECT);
+ EasyMock.expectLastCall().andReturn(endpoint);
+ /*org.omg.CORBA.Object obj = control.createMock(org.omg.CORBA.Object.class);
+ msg.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, obj);
Request r = control.createMock(Request.class);
+ EasyMock.expect(msg.get(CorbaConstants.CORBA_ENDPOINT_OBJECT)).andReturn(obj);
+
EasyMock.expect(obj._create_request(EasyMock.isA(Context.class),
- EasyMock.eq("greetMe"),
- EasyMock.isA(NVList.class),
- EasyMock.isA(NamedValue.class),
- EasyMock.isA(ExceptionList.class),
- EasyMock.isA(ContextList.class))).andReturn(r);
+ EasyMock.eq("greetMe"),
+ EasyMock.isA(NVList.class),
+ EasyMock.isA(NamedValue.class),
+ EasyMock.isA(ExceptionList.class),
+ EasyMock.isA(ContextList.class)));
+ EasyMock.expectLastCall().andReturn(r);
r.invoke();
- EasyMock.expectLastCall();
+ EasyMock.expectLastCall();*/
control.replay();
conduit.buildRequest(cm, opType);
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDSIServantTest.java Wed Nov 29 07:37:01 2006
@@ -18,49 +18,53 @@
*/
package org.apache.yoko.bindings.corba2;
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
+import junit.framework.TestCase;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactoryHelper;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointImpl;
-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.apache.cxf.service.Service;
import org.apache.cxf.service.ServiceImpl;
-import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.ChainInitiationObserver;
-import org.apache.cxf.transport.MessageObserver;
-import org.apache.schemas.yoko.bindings.corba.OperationType;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
+import org.apache.cxf.transport.MessageObserver;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
-import org.omg.CORBA.Context;
import org.omg.CORBA.ORB;
import org.omg.CORBA.ServerRequest;
import org.omg.PortableServer.POA;
-import org.omg.PortableServer.POAHelper;
-public class CorbaDSIServantTest extends TestUtils {
- protected ORB orb;
+public class CorbaDSIServantTest extends TestCase {
+ protected static ORB orb;
+ protected static Bus bus;
+ private static TestUtils testUtils;
+
+ public CorbaDSIServantTest() {
+ super();
+ }
+
+ public CorbaDSIServantTest(String arg0) {
+ super(arg0);
+ }
- protected void setUp() throws Exception {
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(CorbaDSIServantTest.class);
+ }
+
+ protected void setUp() throws Exception {
super.setUp();
-
+ bus = BusFactoryHelper.newInstance().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);
+ testUtils = new TestUtils();
}
- public void tearDown() {
+ public void tearDown() throws Exception {
super.tearDown();
if (orb != null) {
try {
@@ -73,9 +77,9 @@
public void testCorbaDSIServant() throws Exception {
- CorbaDestination destination = getSimpleTypesTestDestination();
+ CorbaDestination destination = testUtils.getSimpleTypesTestDestination();
Service service = new ServiceImpl();
- Endpoint endpoint = new EndpointImpl(bus, service, endpointInfo);
+ Endpoint endpoint = new EndpointImpl(bus, service, destination.getEndPointInfo());
MessageObserver observer = new ChainInitiationObserver(endpoint, bus);
destination.setMessageObserver(observer);
POA rootPOA = null;
@@ -87,27 +91,26 @@
assertNotNull("DSIServant should not be null", dsiServant != null);
assertNotNull("POA should not be null", dsiServant._default_POA() != null);
+ assertNotNull("Destination should not be null", dsiServant.getDestination() != null);
+ assertNotNull("ORB should not be null", dsiServant.getOrb() != null);
+ assertNotNull("MessageObserver should not be null", dsiServant.getObserver() != null);
+
+ byte[] objectId = new byte[10];
+ String[] interfaces = dsiServant._all_interfaces(rootPOA, objectId);
+ assertNotNull("Interfaces should not be null", interfaces != null);
+ assertEquals("Interface ID should be equal", interfaces[0], "IDL:Simple:1.0");
}
public void testInvoke() throws Exception {
+ CorbaDSIServant dsiServant = new CorbaDSIServant();
IMocksControl control = EasyMock.createNiceControl();
ServerRequest request = EasyMock.createMock(ServerRequest.class);
- //Message msg = EasyMock.createMock(Message.class);
- //Message msg = new MessageImpl();
- Method m = CorbaDSIServant.class.getDeclaredMethod("getObserver");
- CorbaDSIServant dsiServant = EasyMock.createMock(CorbaDSIServant.class, new Method[] {m});
-
+ Message msg = EasyMock.createMock(Message.class);
String opName = "greetMe";
- EasyMock.expect(request.operation()).andReturn(opName);
-
- MessageObserver incomingObserver = new TestObserver();
- //MessageObserver incomingObserver = EasyMock.createMock(MessageObserver.class);
+ EasyMock.expect(request.operation()).andReturn(opName);
+ MessageObserver incomingObserver = new TestObserver();
dsiServant.setObserver(incomingObserver);
- dsiServant.getObserver();
- EasyMock.expectLastCall().andReturn(incomingObserver);
- //incomingObserver.onMessage(msg);
- //EasyMock.expectLastCall();
control.replay();
dsiServant.invoke(request);
@@ -116,8 +119,12 @@
class TestObserver implements MessageObserver {
+ TestObserver() {
+ super();
+ }
+
public void onMessage(Message msg) {
- System.out.println("On Message Test complete");
+ System.out.println("Test OnMessage in TestObserver");
}
}
}
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaDestinationTest.java Wed Nov 29 07:37:01 2006
@@ -20,6 +20,8 @@
import java.io.File;
+import junit.framework.TestCase;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactoryHelper;
import org.apache.cxf.endpoint.Endpoint;
@@ -34,10 +36,29 @@
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
-public class CorbaDestinationTest extends AbstractCorbaTester {
+public class CorbaDestinationTest extends TestCase {
+
+ protected static TestUtils testUtils;
+ EndpointInfo endpointInfo;
+
+ public CorbaDestinationTest() {
+ super();
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(CorbaDestinationTest.class);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ testUtils = new TestUtils();
+ }
+
+ public void tearDown() {
+ }
public void testDestination() throws Exception {
- setupServiceInfo("http://yoko.apache.org/simple",
+ endpointInfo = testUtils.setupServiceInfo("http://yoko.apache.org/simple",
"/wsdl/simpleIdl.wsdl", "SimpleCORBAService",
"SimpleCORBAPort");
CorbaDestination destination = new CorbaDestination(endpointInfo);
@@ -55,7 +76,7 @@
}
public void testSetMessageObserverActivate() throws Exception {
- setupServiceInfo("http://yoko.apache.org/simple",
+ endpointInfo = testUtils.setupServiceInfo("http://yoko.apache.org/simple",
"/wsdl/simpleIdl.wsdl", "SimpleCORBAService",
"SimpleCORBAPort");
CorbaDestination destination = new CorbaDestination(endpointInfo);
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaMessageTest.java Wed Nov 29 07:37:01 2006
@@ -37,7 +37,7 @@
public class CorbaMessageTest extends TestCase {
- private ORB orb;
+ private static ORB orb;
private Message message;
public CorbaMessageTest(String arg0) {
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectReaderTest.java Wed Nov 29 07:37:01 2006
@@ -54,7 +54,7 @@
public class CorbaObjectReaderTest extends TestCase {
- private ORB orb;
+ private static ORB orb;
public CorbaObjectReaderTest(String arg0) {
super(arg0);
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaObjectWriterTest.java Wed Nov 29 07:37:01 2006
@@ -19,9 +19,7 @@
package org.apache.yoko.bindings.corba2;
import java.math.BigInteger;
-
import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
import org.omg.CORBA.ORB;
@@ -47,7 +45,7 @@
public class CorbaObjectWriterTest extends TestCase {
- private ORB orb;
+ private static ORB orb;
public CorbaObjectWriterTest(String arg0) {
super(arg0);
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStaxObjectTest.java Wed Nov 29 07:37:01 2006
@@ -39,12 +39,9 @@
import junit.framework.TestCase;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
-import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.schemas.yoko.bindings.corba.Array;
import org.apache.schemas.yoko.bindings.corba.Enum;
@@ -56,7 +53,6 @@
import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
import org.apache.schemas.yoko.bindings.corba.Union;
import org.apache.yoko.bindings.corba.CorbaConstants;
-import org.apache.yoko.bindings.corba2.CorbaUtils;
import org.apache.yoko.bindings.corba2.types.CorbaArrayHandler;
import org.apache.yoko.bindings.corba2.types.CorbaEnumHandler;
import org.apache.yoko.bindings.corba2.types.CorbaFixedHandler;
@@ -65,7 +61,6 @@
import org.apache.yoko.bindings.corba2.types.CorbaSequenceHandler;
import org.apache.yoko.bindings.corba2.types.CorbaStructHandler;
import org.apache.yoko.bindings.corba2.types.CorbaUnionHandler;
-import org.apache.yoko.tools.common.CORBAConstants;
import org.apache.yoko.wsdl.CorbaTypeImpl;
import org.omg.CORBA.ORB;
import org.omg.CORBA.TCKind;
@@ -74,16 +69,21 @@
/**
* Holder for reading and writing stax methods.
*/
-public class CorbaStaxObjectTest extends TestUtils {
+public class CorbaStaxObjectTest extends TestCase {
protected Bus bus;
- protected ORB orb;
+ protected static ORB orb;
protected EndpointReferenceType target;
- protected Message inMessage;
+ protected Message inMessage;
+ protected EndpointInfo endpointInfo;
CorbaBindingFactory factory;
CorbaStaxObject staxObject;
- private final String staxTestNamespaceURI = "http://yoko.apache.org/StaxTest/idl_types";
- private final String staxTestPrefix = "corbatm";
+ private final static String staxTestNamespaceURI = "http://yoko.apache.org/StaxTest/idl_types";
+ private final static String staxTestPrefix = "corbatm";
+
+ public CorbaStaxObjectTest() {
+ super();
+ }
protected void setUp() throws Exception {
super.setUp();
@@ -96,14 +96,15 @@
staxObject = new CorbaStaxObject();
staxObject.setOrb(orb);
- endpointInfo = setupServiceInfo("http://yoko.apache.org/StaxTest",
+ TestUtils testUtils = new TestUtils();
+ endpointInfo = testUtils.setupServiceInfo("http://yoko.apache.org/StaxTest",
"/wsdl/StaxTest.wsdl", "StaxTestCORBAService",
"StaxTestCORBAPort");
List<CorbaTypeMap> typeMaps;
typeMaps = new ArrayList<CorbaTypeMap>();
- CorbaDestination destination = getStaxTypesTestDestination();
+ CorbaDestination destination = testUtils.getStaxTypesTestDestination();
ServiceInfo service = destination.getBindingInfo().getService();
List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
if (corbaTypes != null) {
@@ -113,8 +114,8 @@
}
- public void tearDown() {
- super.tearDown();
+ public void tearDown() throws Exception {
+ super.setUp();
if (orb != null) {
try {
orb.destroy();
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaStreamableTest.java Wed Nov 29 07:37:01 2006
@@ -34,7 +34,7 @@
public class CorbaStreamableTest extends TestCase {
- private ORB orb;
+ private static ORB orb;
public CorbaStreamableTest(String arg0) {
super(arg0);
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaTypeMapTest.java Wed Nov 29 07:37:01 2006
@@ -19,13 +19,19 @@
package org.apache.yoko.bindings.corba2;
import javax.xml.namespace.QName;
-
import junit.framework.TestCase;
-
import org.apache.yoko.wsdl.CorbaTypeImpl;
public class CorbaTypeMapTest extends TestCase {
+ public CorbaTypeMapTest(String arg0) {
+ super(arg0);
+ }
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(CorbaTypeMapTest.class);
+ }
+
public void testCorbaTypeMap() throws Exception {
CorbaTypeMap typeMap = new CorbaTypeMap("http://yoko.apache.org/ComplexTypes");
@@ -34,8 +40,7 @@
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);
corbaTypeImpl.setType(type);
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/CorbaUtilsTest.java Wed Nov 29 07:37:01 2006
@@ -19,25 +19,16 @@
package org.apache.yoko.bindings.corba2;
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.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
-import org.apache.schemas.yoko.bindings.corba.AddressType;
-import org.apache.schemas.yoko.bindings.corba.BindingType;
-import org.apache.schemas.yoko.bindings.corba.OperationType;
import org.apache.yoko.tools.common.CORBAConstants;
public class CorbaUtilsTest extends TestCase {
- private ORB orb;
- private TestUtils testUtils;
+ private static ORB orb;
public CorbaUtilsTest(String arg0) {
super(arg0);
@@ -55,7 +46,6 @@
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);
- testUtils = new TestUtils();
}
protected void tearDown() throws Exception {
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java?view=diff&rev=480600&r1=480599&r2=480600
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/TestUtils.java Wed Nov 29 07:37:01 2006
@@ -19,45 +19,34 @@
package org.apache.yoko.bindings.corba2;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
import org.apache.cxf.Bus;
+import org.apache.cxf.BusException;
import org.apache.cxf.BusFactoryHelper;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
import org.apache.yoko.tools.common.CORBAConstants;
-
-public class TestUtils extends TestCase {
+public class TestUtils {
- protected Bus bus;
+ protected static Bus bus;
protected CorbaBindingFactory factory;
protected EndpointInfo endpointInfo;
- protected void setUp() throws Exception {
-
- bus = BusFactoryHelper.newInstance().getDefaultBus();
- BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
- factory = (CorbaBindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba");
- bfm.registerBindingFactory(CORBAConstants.NU_WSDL_CORBA, factory);
- }
-
- public void tearDown() {
- bus.shutdown(true);
- }
+ public TestUtils() {
+ bus = BusFactoryHelper.newInstance().getDefaultBus();
+ BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
+ try {
+ factory = (CorbaBindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba");
+ bfm.registerBindingFactory(CORBAConstants.NU_WSDL_CORBA, factory);
+ } catch (BusException ex) {
+ ex.printStackTrace();
+ }
+ }
- protected EndpointInfo setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
+ public EndpointInfo setupServiceInfo(String ns, String wsdl, String serviceName, String portName) throws Exception {
URL wsdlUrl = getClass().getResource(wsdl);
WSDLServiceFactory factory = new WSDLServiceFactory(bus, wsdlUrl, new QName(ns, serviceName));
@@ -89,6 +78,6 @@
"ComplexTypesCORBAPort");
CorbaBindingFactory corbaBF = (CorbaBindingFactory)factory;
return (CorbaDestination)corbaBF.getDestination(endpointInfo);
- }
+ }
}