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/28 14:13:57 UTC
svn commit: r480058 -
/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/
Author: enolan
Date: Tue Nov 28 06:13:56 2006
New Revision: 480058
URL: http://svn.apache.org/viewvc?view=rev&rev=480058
Log:
Yoko- 225 Ported tests to cxf.
Modified:
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java
incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java?view=diff&rev=480058&r1=480057&r2=480058
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaAnyHandlerTest.java Tue Nov 28 06:13:56 2006
@@ -1,4 +1,4 @@
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba2.types;
import javax.xml.namespace.QName;
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java?view=diff&rev=480058&r1=480057&r2=480058
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaArrayHandlerTest.java Tue Nov 28 06:13:56 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba2.types;
import javax.xml.namespace.QName;
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java?view=diff&rev=480058&r1=480057&r2=480058
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaEnumHandlerTest.java Tue Nov 28 06:13:56 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba2.types;
import javax.xml.namespace.QName;
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java?view=diff&rev=480058&r1=480057&r2=480058
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaFixedHandlerTest.java Tue Nov 28 06:13:56 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba2.types;
import javax.xml.namespace.QName;
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java?view=diff&rev=480058&r1=480057&r2=480058
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaHandlerUtilsTest.java Tue Nov 28 06:13:56 2006
@@ -1,17 +1,33 @@
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba2.types;
+import java.net.URL;
+import java.util.ArrayList;
import java.util.List;
-
import javax.xml.namespace.QName;
-import org.apache.yoko.bindings.corba.CorbaBindingFactory;
-import org.apache.yoko.bindings.corba.CorbaBindingImpl;
-import org.apache.yoko.bindings.corba.CorbaConstants;
-import org.apache.yoko.bindings.corba.CorbaTypeMap;
-import org.apache.yoko.bindings.corba.TestUtils;
+import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
+import org.apache.yoko.bindings.corba2.CorbaBindingFactory;
+import org.apache.yoko.bindings.corba2.CorbaBinding;
+import org.apache.yoko.bindings.corba2.CorbaDestination;
+import org.apache.yoko.bindings.corba2.CorbaUtils;
+import org.apache.yoko.bindings.corba2.CorbaTypeMap;
+import org.apache.yoko.bindings.corba2.TestUtils;
+import org.apache.yoko.tools.common.CORBAConstants;
+
+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.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.objectweb.celtix.Bus;
-import org.objectweb.celtix.bindings.BindingManager;
+import org.easymock.classextension.EasyMock;
+import org.easymock.classextension.IMocksControl;
import org.omg.CORBA.ORB;
import junit.framework.TestCase;
@@ -19,11 +35,12 @@
public class CorbaHandlerUtilsTest extends TestCase {
private final String complexTypesNamespaceURI = "http://yoko.apache.org/ComplexTypes/idl_types";
- private final String complexTypesPrefix = "corbatm";
-
- private TestUtils testUtils;
+ private final String complexTypesPrefix = "corbatm";
private ORB orb;
- private Bus bus;
+ private Bus bus;
+ protected EndpointInfo endpointInfo;
+ BindingFactory factory;
+ List<CorbaTypeMap> typeMaps;
public CorbaHandlerUtilsTest(String arg0) {
super(arg0);
@@ -31,30 +48,33 @@
public static void main(String[] args) {
junit.textui.TestRunner.run(CorbaHandlerUtilsTest.class);
- }
+ }
protected void setUp() throws Exception {
super.setUp();
- testUtils = new TestUtils();
+ bus = BusFactoryHelper.newInstance().getDefaultBus();
+ BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
+ factory = (BindingFactory)bfm.getBindingFactory("http://schemas.apache.org/yoko/bindings/corba");
+ 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);
-
- bus = Bus.init(new String[0]);
- // programmatically add the corba binding factory
- BindingManager manager = bus.getBindingManager();
- CorbaBindingFactory corbaBF = new CorbaBindingFactory();
- corbaBF.init(bus);
- manager.registerBinding(CorbaConstants.NU_WSDL_CORBA, corbaBF);
-
+ TestUtils testUtils = new TestUtils();
+ typeMaps = new ArrayList<CorbaTypeMap>();
+ //CorbaDestination destination = (CorbaDestination)getDestination();
+ CorbaDestination destination = testUtils.getComplexTypesTestDestination();
+ ServiceInfo service = destination.getBindingInfo().getService();
+ List<TypeMappingType> corbaTypes = service.getExtensors(TypeMappingType.class);
+ CorbaUtils.createCorbaTypeMap(typeMaps, corbaTypes);
}
protected void tearDown() throws Exception {
+ bus.shutdown(true);
if (orb != null) {
try {
orb.destroy();
@@ -63,20 +83,36 @@
}
}
}
+
+ /*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));
+
+ Service service = factory.create();
+ endpointInfo = service.getServiceInfo().getEndpoint(new QName(ns, portName));
+
+ }
+
+ public Destination getDestination() throws Exception {
+ setupServiceInfo("http://yoko.apache.org/ComplexTypes",
+ "/wsdl/ComplexTypes.wsdl",
+ "ComplexTypesCORBAService",
+ "ComplexTypesCORBAPort");
+ CorbaBindingFactory corbaBF = (CorbaBindingFactory)factory;
+ Destination destination = corbaBF.getDestination(endpointInfo);
+ assertNotNull(destination);
+ return destination;
+ }*/
public void testCreateTypeHandler() {
- CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus,
- testUtils.getComplexTypesEndpointReference(),
- orb,
- false);
QName objName = null;
QName objIdlType = null;
- CorbaObjectHandler result = null;
- List<CorbaTypeMap> typeMaps = bindingImpl.getCorbaTypeMaps();
+ CorbaObjectHandler result = null;
// Test for an array handler
objName = new QName("object");
- objIdlType = new QName(complexTypesNamespaceURI, "TestArray", complexTypesPrefix);
+ objIdlType = new QName(complexTypesNamespaceURI, "TestArray", complexTypesPrefix);
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps);
assertTrue(result instanceof CorbaArrayHandler);
@@ -94,7 +130,7 @@
// Test for a primitive handler
objName = new QName("object");
- objIdlType = CorbaConstants.NT_CORBA_BOOLEAN;
+ objIdlType = CORBAConstants.NT_CORBA_BOOLEAN;
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMaps);
assertTrue(result instanceof CorbaPrimitiveHandler);
@@ -117,15 +153,10 @@
assertTrue(result instanceof CorbaUnionHandler);
}
- public void testInitializeObjectHandler() {
- CorbaBindingImpl bindingImpl = new CorbaBindingImpl(bus,
- testUtils.getComplexTypesEndpointReference(),
- orb,
- false);
+ public void testInitializeObjectHandler() {
QName objName = null;
QName objIdlType = null;
- CorbaObjectHandler result = null;
- List<CorbaTypeMap> typeMaps = bindingImpl.getCorbaTypeMaps();
+ CorbaObjectHandler result = null;
// Test for an array handler
objName = new QName("object");
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java?view=diff&rev=480058&r1=480057&r2=480058
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaObjectHandlerTest.java Tue Nov 28 06:13:56 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba2.types;
import javax.xml.namespace.QName;
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java?view=diff&rev=480058&r1=480057&r2=480058
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaPrimitiveHandlerTest.java Tue Nov 28 06:13:56 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba2.types;
import javax.xml.namespace.QName;
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java?view=diff&rev=480058&r1=480057&r2=480058
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaSequenceHandlerTest.java Tue Nov 28 06:13:56 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba2.types;
import javax.xml.namespace.QName;
Modified: incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java?view=diff&rev=480058&r1=480057&r2=480058
==============================================================================
--- incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java (original)
+++ incubator/yoko/branches/cxf_port/bindings/src/test/java/org/apache/yoko/bindings/corba/types/CorbaStructHandlerTest.java Tue Nov 28 06:13:56 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.yoko.bindings.corba.types;
+package org.apache.yoko.bindings.corba2.types;
import javax.xml.namespace.QName;