svn commit: r511382 - in /incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test: java/org/apache/tuscany/databinding/sample/ resources/META-INF/sca/

[rf...@apache.org]

Author: rfeng
Date: Sat Feb 24 16:33:17 2007
New Revision: 511382

URL: http://svn.apache.org/viewvc?view=rev&rev=511382
Log:
Fix the invalid SCDL location in databinding itest

Added:
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/META-INF/sca/application.composite
      - copied unchanged from r511368, incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/META-INF/sca/default.scdl
Removed:
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/META-INF/sca/default.scdl
Modified:
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java?view=diff&rev=511382&r1=511381&r2=511382
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java Sat Feb 24 16:33:17 2007
@@ -24,22 +24,23 @@
 
 import java.io.StringReader;
 
-import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.tuscany.databinding.jaxb.JAXBContextHelper;
 import org.apache.tuscany.databinding.jaxb.Reader2JAXB;
 import org.apache.tuscany.databinding.sdo.String2DataObject;
-//import org.apache.tuscany.databinding.xmlbeans.XMLStreamReader2XmlObject;
+import org.apache.tuscany.databinding.xmlbeans.XMLStreamReader2XmlObject;
 import org.apache.tuscany.spi.databinding.TransformationContext;
+import org.apache.tuscany.spi.idl.XMLType;
 import org.apache.tuscany.spi.model.DataType;
 import org.apache.tuscany.test.SCATestCase;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 
 import com.example.ipo.jaxb.PurchaseOrderType;
-//import com.example.ipo.xmlbeans.PurchaseOrderDocument;
+import com.example.ipo.xmlbeans.PurchaseOrderDocument;
 import commonj.sdo.DataObject;
 
 /**
@@ -81,7 +82,7 @@
 
     @SuppressWarnings("unchecked")
     public void testDataBindingBootstrap() throws Exception {
-        DataType targetDataType = new DataType<Class>(Object.class, null);
+        DataType targetDataType = new DataType<XMLType>(Object.class, XMLType.UNKNOWN);
         targetDataType.setMetadata(JAXBContextHelper.JAXB_CONTEXT_PATH, contextPath);
         TransformationContext tContext = createMock(TransformationContext.class);
         expect(tContext.getTargetDataType()).andReturn(targetDataType).anyTimes();
@@ -91,23 +92,26 @@
         DataObject po1 = t1.transform(IPO_XML, null);
         client.call(po1);
 
-//        XMLStreamReader reader =
-//            XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(IPO_XML));
-//        XMLStreamReader2XmlObject t2 = new XMLStreamReader2XmlObject();
-//        PurchaseOrderDocument po2 = (PurchaseOrderDocument)t2.transform(reader, null);
-//        client.call(po2.getPurchaseOrder());
+        PurchaseOrderDocument.Factory.newInstance();
 
+        XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(IPO_XML));
+        XMLStreamReader2XmlObject t2 = new XMLStreamReader2XmlObject();
+        PurchaseOrderDocument po2 = (PurchaseOrderDocument)t2.transform(reader, null);
+        client.call(po2.getPurchaseOrder());
+
+        QName root = new QName("http://www.example.com/IPO", "purchaseOrder");
+        DataType targetDataType1 = new DataType<XMLType>(PurchaseOrderType.class, new XMLType(root, null));
+        TransformationContext tContext1 = createMock(TransformationContext.class);
+        expect(tContext1.getTargetDataType()).andReturn(targetDataType1).anyTimes();
+        replay(tContext1);
         Reader2JAXB t3 = new Reader2JAXB();
-        JAXBElement<PurchaseOrderType> po3 =
-            (JAXBElement<PurchaseOrderType>)t3.transform(new StringReader(IPO_XML), tContext);
-        client.call(po3.getValue());
+        PurchaseOrderType po3 = (PurchaseOrderType)t3.transform(new StringReader(IPO_XML), tContext1);
+        client.call(po3);
 
     }
 
     protected void setUp() throws Exception {
-        setApplicationSCDL(getClass(), "META-INF/sca/default.scdl");
-        addExtension("test-extensions", getClass().getClassLoader()
-            .getResource("META-INF/tuscany/test-extensions.scdl"));
+        // setApplicationSCDL(getClass(), "META-INF/sca/default.scdl");
         super.setUp();
         CompositeContext context = CurrentCompositeContext.getContext();
         client = context.locateService(Client.class, "Client");



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org