From bcb99010d0c100bc1e8007afdad41b7887e75a01 Mon Sep 17 00:00:00 2001 From: edwardsmj Date: Thu, 6 May 2010 13:30:35 +0000 Subject: Fixes to databinding-sdo required to enable the module to work under OSGi, as described in TUSCANY-3547 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@941719 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java | 3 ++- .../tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java | 2 ++ .../apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java | 2 ++ .../sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java | 4 +++- 4 files changed, 9 insertions(+), 2 deletions(-) (limited to 'sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org') diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java index ef0d63f941..400b424a97 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java @@ -23,6 +23,7 @@ import javax.xml.namespace.QName; import junit.framework.TestCase; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.interfacedef.DataType; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl; @@ -51,7 +52,7 @@ public class SDODataBindingTestCase extends TestCase { @Override protected void setUp() throws Exception { super.setUp(); - binding = new SDODataBinding(); + binding = new SDODataBinding(new DefaultExtensionPointRegistry()); context = HelperProvider.getDefaultContext(); SdoFactory.INSTANCE.register(context); } diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java index 2aaae3c6d8..4d415f2895 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java @@ -23,6 +23,7 @@ import javax.xml.namespace.QName; import junit.framework.TestCase; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.databinding.TransformationContext; import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl; import org.apache.tuscany.sca.interfacedef.DataType; @@ -54,6 +55,7 @@ public abstract class SDOTransformerTestCaseBase extends TestCase { @Override protected void setUp() throws Exception { super.setUp(); + new SDODataBinding(new DefaultExtensionPointRegistry()); helperContext = HelperProvider.getDefaultContext(); SdoFactory.INSTANCE.register(helperContext); diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java index 11d8495de8..2326d1b93b 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java @@ -24,6 +24,7 @@ import javax.xml.namespace.QName; import junit.framework.TestCase; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.impl.OperationImpl; import org.apache.tuscany.sca.interfacedef.util.ElementInfo; @@ -46,6 +47,7 @@ public class SDOWrapperHandlerTestCase extends TestCase { @Override public void setUp() throws Exception { + new SDODataBinding(new DefaultExtensionPointRegistry()); context = SDOUtil.createHelperContext(); handler = new SDOWrapperHandler(); } diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java index 114c568c38..2beadc5b61 100644 --- a/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java +++ b/sca-java-2.x/trunk/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java @@ -24,9 +24,11 @@ import javax.xml.stream.XMLStreamReader; import junit.framework.Assert; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; import org.apache.tuscany.sca.interfacedef.DataType; import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl; import org.apache.tuscany.sca.interfacedef.util.XMLType; +import org.apache.tuscany.sdo.api.SDOUtil; import com.example.ipo.sdo.PurchaseOrderType; import commonj.sdo.helper.XMLDocument; @@ -36,7 +38,7 @@ import commonj.sdo.helper.XMLDocument; * @version $Rev$ $Date$ */ public class XMLDocument2XMLStreamReaderTestCase extends SDOTransformerTestCaseBase { - + @Override protected DataType getSourceDataType() { return new DataTypeImpl(XMLDocument.class.getName(), XMLDocument.class, new XMLType(ORDER_QNAME, null)); -- cgit v1.2.3