You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/04 03:41:07 UTC
svn commit: r525349 [2/2] - in
/incubator/tuscany/java/sca/modules/databinding: ./
src/main/java/org/apache/tuscany/databinding/
src/main/java/org/apache/tuscany/databinding/impl/
src/main/java/org/apache/tuscany/databinding/javabeans/ src/main/java/or...
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java Tue Apr 3 18:41:03 2007
@@ -24,18 +24,15 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.databinding.impl.DataBindingRegistryImpl;
-import org.apache.tuscany.databinding.impl.MediatorImpl;
-import org.apache.tuscany.databinding.impl.TransformationContextImpl;
-import org.apache.tuscany.databinding.impl.TransformerRegistryImpl;
import org.apache.tuscany.databinding.xml.Node2String;
import org.apache.tuscany.databinding.xml.Node2Writer;
import org.apache.tuscany.databinding.xml.SAX2DOMPipe;
import org.apache.tuscany.databinding.xml.String2SAX;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.TransformerRegistry;
-import org.apache.tuscany.spi.model.DataType;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -94,8 +91,8 @@
private TransformationContext createTransformationContext(Class sourceType, Class targetType) {
TransformationContext context = new TransformationContextImpl();
- DataType sourceDataType = new DataType<Class>(sourceType, sourceType);
- DataType targetDataType = new DataType<Class>(targetType, targetType);
+ DataType sourceDataType = new DataTypeImpl<Class>(sourceType, sourceType);
+ DataType targetDataType = new DataTypeImpl<Class>(targetType, targetType);
context.setSourceDataType(sourceDataType);
context.setTargetDataType(targetDataType);
return context;
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java Tue Apr 3 18:41:03 2007
@@ -29,13 +29,12 @@
import junit.framework.TestCase;
-import org.apache.tuscany.databinding.javabeans.DOMNode2JavaBeanTransformer;
-import org.apache.tuscany.databinding.javabeans.JavaBean2DOMNodeTransformer;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
+import org.apache.tuscany.idl.util.TypeInfo;
+import org.apache.tuscany.idl.util.XMLType;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
-import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.spi.model.TypeInfo;
-import org.apache.tuscany.spi.model.XMLType;
import org.easymock.EasyMock;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -75,10 +74,10 @@
TypeInfo typeInfo = new TypeInfo(null, false, null);
TransformationContext context = EasyMock.createMock(TransformationContext.class);
- DataType<Class> targetDataType = new DataType<Class>(SamplePropertyBean.class, SamplePropertyBean.class);
+ DataType<Class> targetDataType = new DataTypeImpl<Class>(SamplePropertyBean.class, SamplePropertyBean.class);
EasyMock.expect(context.getTargetDataType()).andReturn(targetDataType).anyTimes();
- DataType<XMLType> sourceDataType = new DataType<XMLType>(null, new XMLType(typeInfo));
+ DataType<XMLType> sourceDataType = new DataTypeImpl<XMLType>(null, new XMLType(typeInfo));
// ElementInfo eleInfo = new ElementInfo(null, typeInfo);
// sourceDataType.setMetadata(ElementInfo.class.getName(), eleInfo);
EasyMock.expect(context.getSourceDataType()).andReturn(sourceDataType).anyTimes();
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java Tue Apr 3 18:41:03 2007
@@ -20,18 +20,18 @@
package org.apache.tuscany.databinding.javabeans;
import java.io.StringWriter;
+
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Node;
+import junit.framework.TestCase;
-import org.apache.tuscany.databinding.javabeans.JavaBean2DOMNodeTransformer;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.DataType;
-
-import junit.framework.TestCase;
import org.easymock.EasyMock;
+import org.w3c.dom.Node;
/**
* Testcase to test the XMLTypeMapperExtension which is the back bone for all transformations supported by the JavaBeans
@@ -51,7 +51,7 @@
public void testTranformation() throws Exception {
TransformationContext context = EasyMock.createMock(TransformationContext.class);
- DataType<Class> dataType = new DataType<Class>(null, SamplePropertyBean.class);
+ DataType<Class> dataType = new DataTypeImpl<Class>(null, SamplePropertyBean.class);
EasyMock.expect(context.getTargetDataType()).andReturn(dataType).anyTimes();
EasyMock.replay(context);
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtensionTestCase.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/DataBindingExtensionTestCase.java Tue Apr 3 18:41:03 2007
@@ -21,8 +21,9 @@
import junit.framework.TestCase;
+import org.apache.tuscany.idl.DataType;
+import org.apache.tuscany.idl.impl.DataTypeImpl;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
-import org.apache.tuscany.spi.model.DataType;
import org.easymock.EasyMock;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -43,9 +44,9 @@
public void testExtension() {
DataBinding1 binding1 = new DataBinding1(Node.class);
assertEquals(Node.class.getName(), binding1.getName());
- DataType dt1 = new DataType(Element.class, null);
+ DataType dt1 = new DataTypeImpl<Class>(Element.class, null);
assertTrue(binding1.introspect(dt1, null));
- DataType dt2 = new DataType(String.class, null);
+ DataType dt2 = new DataTypeImpl<Class>(String.class, null);
assertFalse(binding1.introspect(dt2, null));
assertNull(binding1.getWrapperHandler());
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtensionTestCase.java?view=diff&rev=525349&r1=525348&r2=525349
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/spi/databinding/extension/SimpleTypeMapperExtensionTestCase.java Tue Apr 3 18:41:03 2007
@@ -26,8 +26,8 @@
import junit.framework.TestCase;
+import org.apache.tuscany.idl.util.TypeInfo;
import org.apache.tuscany.spi.databinding.TransformationContext;
-import org.apache.tuscany.spi.model.TypeInfo;
import org.easymock.EasyMock;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org