Author: kelvingoodson
Date: Mon Nov 27 09:42:59 2006
New Revision: 479701
URL: http://svn.apache.org/viewvc?view=rev&rev=479701
Log:
TUSCANY-930 fix test cases to use HelperContext
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
Mon Nov 27 09:42:59 2006
@@ -39,6 +39,7 @@
import commonj.sdo.helper.DataFactory;
import commonj.sdo.helper.DataHelper;
import commonj.sdo.helper.EqualityHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
@@ -68,10 +69,11 @@
public HelperProviderImpl()
{
- typeHelper = SDOUtil.createTypeHelper();
- dataFactory = SDOUtil.createDataFactory(typeHelper);
- xmlHelper = SDOUtil.createXMLHelper(typeHelper);
- xsdHelper = SDOUtil.createXSDHelper(typeHelper);
+ HelperContext hc = SDOUtil.createHelperContext();
+ typeHelper = hc.getTypeHelper();
+ dataFactory = hc.getDataFactory();
+ xmlHelper = hc.getXMLHelper();
+ xsdHelper = hc.getXSDHelper();
copyHelper = new CopyHelperImpl();
equalityHelper = new EqualityHelperImpl();
dataHelper = new DataHelperImpl();
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
Mon Nov 27 09:42:59 2006
@@ -520,7 +520,7 @@
//not found in the typetable
if ( schemaTypeName == null )
{
- XSDHelper xsdHelper =
SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+ XSDHelper xsdHelper = SDOUtil.createHelperContext().getXSDHelper();
if ( !xsdHelper.isXSD( dataType ) )
{
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
Mon Nov 27 09:42:59 2006
@@ -329,6 +329,7 @@
* Create a new DataFactory, with visibility to types in the specified
TypeHelper scope.
* @param scope the TypeHelper to use for locating types.
* @return the new DataFactory.
+ * @deprecated see [EMAIL PROTECTED] #createHelperContext(TypeHelper)}
*/
public static DataFactory createDataFactory(TypeHelper scope)
{
@@ -361,7 +362,6 @@
* Create a new XMLStreamHelper, with visibility to types in the specified
TypeHelper scope.
* @param scope the TypeHelper to use for locating types.
* @return the new XMLStreamHelper.
- * @deprecated see [EMAIL PROTECTED] #createHelperContext(TypeHelper)}
*/
public static XMLStreamHelper createXMLStreamHelper(TypeHelper scope)
{
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
Mon Nov 27 09:42:59 2006
@@ -19,6 +19,7 @@
import commonj.sdo.Property;
import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XSDHelper;
@@ -66,10 +67,11 @@
}
protected void setUp() throws Exception {
- typeHelper = SDOUtil.createTypeHelper();
- dataFactory = SDOUtil.createDataFactory(typeHelper);
+ HelperContext hc = SDOUtil.createHelperContext();
+ typeHelper = hc.getTypeHelper();
+ dataFactory = hc.getDataFactory();
+ xsdHelper = hc.getXSDHelper();
streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
- xsdHelper = SDOUtil.createXSDHelper(typeHelper);
// Populate the meta data for the test (Stock Quote) model
URL url = getClass().getResource(TEST_MODEL);
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
Mon Nov 27 09:42:59 2006
@@ -37,6 +37,7 @@
import commonj.sdo.Property;
import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XSDHelper;
import commonj.sdo.helper.XMLHelper;
@@ -58,7 +59,6 @@
Type cst = TypeHelper.INSTANCE.getType("commonj.sdo","ChangeSummaryType");
Type strt = TypeHelper.INSTANCE.getType("commonj.sdo", "String");
- TypeHelper th = SDOUtil.createTypeHelper();
Type newt = SDOUtil.createType(th, "testcases.changesummary", "simpleCS",
false);
Property strProp = SDOUtil.createProperty(newt, "strElem", strt);
SDOUtil.createProperty(newt, "changeSummary", cst);
@@ -72,7 +72,7 @@
Type strt = TypeHelper.INSTANCE.getType("commonj.sdo", "String");
- TypeHelper th = SDOUtil.createTypeHelper();
+
Type newt = SDOUtil.createType(th, "testcases.changesummary",
"simpleNOCS", false);
Property strProp = SDOUtil.createProperty(newt, "strElem", strt);
@@ -203,14 +203,15 @@
// Populate the meta data for the test (Stock Quote) model
URL url = getClass().getResource("/simple.xsd");
InputStream inputStream = url.openStream();
- th = SDOUtil.createTypeHelper();
- xh = SDOUtil.createXSDHelper(th);
+ HelperContext hc = SDOUtil.createHelperContext();
+ th = hc.getTypeHelper();
+ xh = hc.getXSDHelper();
xh.define(inputStream, url.toString());
inputStream.close();
URL url2 = getClass().getResource("/simpleWithChangeSummary.xsd");
InputStream inputStream2 = url2.openStream();
- List types = xh.define(inputStream2, url2.toString());
+ xh.define(inputStream2, url2.toString());
inputStream.close();
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
Mon Nov 27 09:42:59 2006
@@ -35,6 +35,7 @@
import commonj.sdo.Type;
import commonj.sdo.helper.CopyHelper;
import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
public class CrossScopeCopyTestCase extends TestCase
@@ -51,6 +52,8 @@
private static final String DYNAMIC_TYPE = "dynamicType";
// SDO model objects
+ private HelperContext hca;
+ private HelperContext hcb;
private TypeHelper scopeA;
private TypeHelper scopeB;
@@ -86,7 +89,7 @@
assertTrue(prop==null);
// Perform invalid namespace test
- DataObject sdo =
SDOUtil.createDataFactory(scopeA).create(TEST_NAMESPACE, DYNAMIC_TYPE );
+ DataObject sdo = hca.getDataFactory().create(TEST_NAMESPACE,
DYNAMIC_TYPE );
sdo.set("custNum", "099" );
sdo.set("firstName", "John");
sdo.set("lastName", "Doe");
@@ -111,23 +114,25 @@
super.setUp();
// Create Two Scopes
- scopeA = SDOUtil.createTypeHelper();
- scopeB = SDOUtil.createTypeHelper();
+ hca = SDOUtil.createHelperContext();
+ hcb = SDOUtil.createHelperContext();
+ scopeA = hca.getTypeHelper();
+ scopeB = hcb.getTypeHelper();
// Populate scopes with bank model now
URL url = getClass().getResource(BANK_MODEL);
InputStream inputStream = url.openStream();
- SDOUtil.createXSDHelper(scopeA).define(inputStream, url.toString());
+ hca.getXSDHelper().define(inputStream, url.toString());
inputStream.close();
inputStream = url.openStream();
- SDOUtil.createXSDHelper(scopeB).define(inputStream, url.toString());
+ hcb.getXSDHelper().define(inputStream, url.toString());
inputStream.close();
// Now Populate scopeA with some dynamic models
populateScopeWithDynamicTypes(scopeA);
// Construct Source Tree
- constructSourceTree(SDOUtil.createDataFactory(scopeA));
+ constructSourceTree(hca.getDataFactory());
}
private void shallowCopyAssertions(DataObject sdo, DataObject copiedSdo)
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
Mon Nov 27 09:42:59 2006
@@ -33,6 +33,7 @@
import commonj.sdo.Property;
import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
@@ -108,10 +109,11 @@
protected void setUp() throws Exception {
super.setUp();
- typeHelper = SDOUtil.createTypeHelper();
- xsdHelper = SDOUtil.createXSDHelper(typeHelper);
- xmlHelper = SDOUtil.createXMLHelper(typeHelper);
- dataFactory = SDOUtil.createDataFactory(typeHelper);
+ HelperContext hc = SDOUtil.createHelperContext();
+ typeHelper = hc.getTypeHelper();
+ dataFactory = hc.getDataFactory();
+ xsdHelper = hc.getXSDHelper();
+ xmlHelper = hc.getXMLHelper();
// Populate the meta data for the test (Stock Quote) model
URL url = getClass().getResource(TEST_MODEL);
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
Mon Nov 27 09:42:59 2006
@@ -34,6 +34,7 @@
import commonj.sdo.Sequence;
import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
@@ -47,10 +48,17 @@
private static final String MIXED_XML = "/mixed2.xml";
private static final String MIXEDOPEN_XML = "/mixedopen.xml";
+ HelperContext hc;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ hc = SDOUtil.createHelperContext();
+ }
+
public void testDefineTypeRoundTrip() throws Exception {
- TypeHelper types = SDOUtil.createTypeHelper();
- DataFactory factory = SDOUtil.createDataFactory(types);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(types);
+ TypeHelper types = hc.getTypeHelper();
+ DataFactory factory = hc.getDataFactory();
+ XMLHelper xmlHelper = hc.getXMLHelper();
Type intType = types.getType("commonj.sdo", "Int");
Type stringType = types.getType("commonj.sdo", "String");
@@ -141,9 +149,9 @@
public void testDefineType() throws Exception
{
- TypeHelper types = SDOUtil.createTypeHelper();
- DataFactory factory = SDOUtil.createDataFactory(types);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(types);
+ TypeHelper types = hc.getTypeHelper();
+ DataFactory factory = hc.getDataFactory();
+ XMLHelper xmlHelper = hc.getXMLHelper();
Type intType = types.getType("commonj.sdo", "Int");
Type stringType = types.getType("commonj.sdo", "String");
@@ -227,10 +235,10 @@
public void testDefineDataType() throws Exception
{
- TypeHelper types = SDOUtil.createTypeHelper();
- DataFactory factory = SDOUtil.createDataFactory(types);
- XSDHelper xsdHelper = SDOUtil.createXSDHelper(types);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(types);
+ TypeHelper types = hc.getTypeHelper();
+ DataFactory factory = hc.getDataFactory();
+ XMLHelper xmlHelper = hc.getXMLHelper();
+ XSDHelper xsdHelper = hc.getXSDHelper();
Property javaClassProperty =
xsdHelper.getGlobalProperty("commonj.sdo/java", "javaClass", false);
@@ -332,9 +340,9 @@
public void testFastDefineType() throws Exception
{
- TypeHelper types = SDOUtil.createTypeHelper();
- DataFactory factory = SDOUtil.createDataFactory(types);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(types);
+ TypeHelper types = hc.getTypeHelper();
+ DataFactory factory = hc.getDataFactory();
+ XMLHelper xmlHelper = hc.getXMLHelper();
Type intType = types.getType("commonj.sdo", "Int");
Type stringType = types.getType("commonj.sdo", "String");
@@ -403,10 +411,10 @@
public void testDefineSequencedType() throws Exception
{
-
- TypeHelper types = SDOUtil.createTypeHelper();
- DataFactory factory = SDOUtil.createDataFactory(types);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(types);
+
+ TypeHelper types = hc.getTypeHelper();
+ DataFactory factory = hc.getDataFactory();
+ XMLHelper xmlHelper = hc.getXMLHelper();
Type stringType = types.getType("commonj.sdo", "String");
Type decimalType = types.getType("commonj.sdo", "Decimal");
@@ -443,25 +451,25 @@
Sequence sequence = quote.getSequence();
- sequence.add("\n ");
+ sequence.addText("\n ");
quote.setString("symbol", "fbnt");
- sequence.add("\n ");
+ sequence.addText("\n ");
quote.setString("companyName", "FlyByNightTechnology");
- sequence.add("\n some text\n ");
+ sequence.addText("\n some text\n ");
DataObject child = quote.createDataObject("quotes");
child.setBigDecimal("price", new BigDecimal("2000.0"));
- sequence.add("\n more text\n ");
+ sequence.addText("\n more text\n ");
// quote.setBigDecimal("price", new BigDecimal("1000.0"));
sequence.add("price", new BigDecimal("1000.0"));
- sequence.add("\n");
+ sequence.addText("\n");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
xmlHelper.save(quote, "http://www.example.com/mixed";, "mixedStockQuote",
baos);
@@ -470,10 +478,9 @@
public void testDefineSequencedOpenType() throws Exception
{
-
- TypeHelper types = SDOUtil.createTypeHelper();
- DataFactory factory = SDOUtil.createDataFactory(types);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(types);
+ TypeHelper types = hc.getTypeHelper();
+ DataFactory factory = hc.getDataFactory();
+ XMLHelper xmlHelper = hc.getXMLHelper();
Type stringType = types.getType("commonj.sdo", "String");
Type decimalType = types.getType("commonj.sdo", "Decimal");
@@ -523,28 +530,28 @@
Sequence sequence = quote.getSequence();
- sequence.add("\n ");
+ sequence.addText("\n ");
Type definedGlobalType = types.getType("http://www.example.com/open";,
null);
Property definedSymbolProperty = definedGlobalType.getProperty("symbol");
quote.setString(definedSymbolProperty, "fbnt");
- sequence.add("\n ");
+ sequence.addText("\n ");
quote.setString("companyName", "FlyByNightTechnology");
- sequence.add("\n some text\n ");
+ sequence.addText("\n some text\n ");
DataObject child = quote.createDataObject("quotes");
child.setBigDecimal("price", new BigDecimal("2000.0"));
- sequence.add("\n more text\n ");
+ sequence.addText("\n more text\n ");
// quote.setBigDecimal("price", new BigDecimal("1000.0"));
sequence.add("price", new BigDecimal("1000.0"));
- sequence.add("\n");
+ sequence.addText("\n");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
xmlHelper.save(quote, "http://www.example.com/mixed";,
"mixedOpenStockQuote", baos);
@@ -554,10 +561,10 @@
public void testDefineOpenType() throws Exception
{
- TypeHelper types = SDOUtil.createTypeHelper();
- DataFactory factory = SDOUtil.createDataFactory(types);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(types);
-
+ TypeHelper types = hc.getTypeHelper();
+ DataFactory factory = hc.getDataFactory();
+ XMLHelper xmlHelper = hc.getXMLHelper();
+
Type stringType = types.getType("commonj.sdo", "String");
Type decimalType = types.getType("commonj.sdo", "Decimal");
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
Mon Nov 27 09:42:59 2006
@@ -36,13 +36,21 @@
import commonj.sdo.DataObject;
import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
public class SerializeTypesTestCase extends TestCase {
+ HelperContext hc;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ hc = SDOUtil.createHelperContext();
+ }
+
public void testSerializeTypesRoundTrip() throws Exception {
- TypeHelper types = SDOUtil.createTypeHelper();
- DataFactory factory = SDOUtil.createDataFactory(types);
+ TypeHelper types = hc.getTypeHelper();
+ DataFactory factory = hc.getDataFactory();
Type intType = types.getType("commonj.sdo", "Int");
Type stringType = types.getType("commonj.sdo", "String");
@@ -108,7 +116,7 @@
SDOUtil.saveDataGraph(dataGraph, baos, null);
//SDOUtil.saveDataGraph(dataGraph, System.out, null);
- TypeHelper deserializingTypeHelper = SDOUtil.createTypeHelper();
+ TypeHelper deserializingTypeHelper =
SDOUtil.createHelperContext().getTypeHelper();
// The following is a kludge to force deserialization of metadata into
a different TypeHelper (scope)
// TBD figure out a proper non-EMF way to do this.
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
Mon Nov 27 09:42:59 2006
@@ -28,12 +28,20 @@
import junit.framework.TestCase;
import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
public class XPathTestCase extends TestCase {
+
+ HelperContext hc;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ hc = SDOUtil.createHelperContext();
+ }
private final String TEST_MODEL = "/xpath.xsd";
private final String XPATH_XML = "/xpath.xml";
@@ -44,9 +52,8 @@
* @throws IOException
*/
public void testAtSignProperty() throws IOException {
- TypeHelper typeHelper = SDOUtil.createTypeHelper();
- XSDHelper xsdHelper = SDOUtil.createXSDHelper(typeHelper);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(typeHelper);
+ XSDHelper xsdHelper = hc.getXSDHelper();
+ XMLHelper xmlHelper = hc.getXMLHelper();
URL url = getClass().getResource(TEST_MODEL);
InputStream inputStream = url.openStream();
@@ -64,9 +71,8 @@
}
public void testListIndexing() throws Exception {
- TypeHelper typeHelper = SDOUtil.createTypeHelper();
- XSDHelper xsdHelper = SDOUtil.createXSDHelper(typeHelper);
- XMLHelper xmlHelper = SDOUtil.createXMLHelper(typeHelper);
+ XSDHelper xsdHelper = hc.getXSDHelper();
+ XMLHelper xmlHelper = hc.getXMLHelper();
URL url = getClass().getResource(TEST_MODEL);
InputStream inputStream = url.openStream();
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java?view=diff&rev=479701&r1=479700&r2=479701
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
Mon Nov 27 09:42:59 2006
@@ -33,6 +33,7 @@
import commonj.sdo.DataObject;
import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XSDHelper;
@@ -42,21 +43,29 @@
public class XSDHelperTestCase extends TestCase {
private static final String TEST_MODEL = "/simple.xsd";
private URL modelURL;
+
+ HelperContext hc;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ hc = SDOUtil.createHelperContext();
+ modelURL = getClass().getResource(TEST_MODEL);
+ }
public void testDefineWithLocation() throws IOException {
- XSDHelper xsdHelper =
SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+ XSDHelper xsdHelper = hc.getXSDHelper();
List types = xsdHelper.define(modelURL.openStream(),
modelURL.toString());
assertEquals(2, types.size());
}
public void testDefineWithNoLocation() {
- XSDHelper xsdHelper =
SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+ XSDHelper xsdHelper = hc.getXSDHelper();
List types =
xsdHelper.define(getClass().getResourceAsStream(TEST_MODEL), null);
assertEquals(2, types.size());
}
public void testDuplicateDefineWithLocation() throws IOException {
- XSDHelper xsdHelper =
SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+ XSDHelper xsdHelper = hc.getXSDHelper();
List types = xsdHelper.define(modelURL.openStream(),
modelURL.toString());
assertEquals(2, types.size());
@@ -68,7 +77,7 @@
{
//test for static sdo type. The test succeeds if the
IllegalArgumentException is thrown
//by XSDHelper.generate method in which case the string xsd must be
null;
- XSDHelper xsdHelper =
SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+ XSDHelper xsdHelper = hc.getXSDHelper();
DataObject quoteSDO =
(DataObject)SimpleFactoryImpl.INSTANCE.createQuote();
List typeList = new Vector();
typeList.add(quoteSDO.getType());
@@ -89,7 +98,7 @@
{
//test for dynamic SDOs that have no XSD model. Here the testcase
succeeds only if the
//xsd is generated by XSDHelper in which case xsd must not be null
- XSDHelper xsdHelper =
SDOUtil.createXSDHelper(SDOUtil.createTypeHelper());
+ XSDHelper xsdHelper = hc.getXSDHelper();
DataObject quoteType = DataFactory.INSTANCE.create("commonj.sdo",
"Type");
quoteType.set("uri", "http://www.example.com/dynamic";);
quoteType.set("name", "DynamicQuote");
@@ -132,8 +141,8 @@
//testing static SDO with XSD Model being contained in a Dynamic SDO
not having an XSD Model.
//the schema must be generated with imports / includes for the XSD
corresponding to the static
//sdo types.
- TypeHelper typeHelper = SDOUtil.createTypeHelper();
- XSDHelper xsdHelper = SDOUtil.createXSDHelper(typeHelper);
+ TypeHelper typeHelper = hc.getTypeHelper();
+ XSDHelper xsdHelper = hc.getXSDHelper();
DataObject quoteSDO =
(DataObject)SimpleFactoryImpl.INSTANCE.createQuote();
@@ -184,9 +193,5 @@
assertNotNull(xsd);
}
-
- protected void setUp() throws Exception {
- super.setUp();
- modelURL = getClass().getResource(TEST_MODEL);
- }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
