You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/01/17 23:11:44 UTC
svn commit: r369943 -
/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/
Author: jboynes
Date: Tue Jan 17 14:11:31 2006
New Revision: 369943
URL: http://svn.apache.org/viewcvs?rev=369943&view=rev
Log:
convert sdo tests to junit test cases
Added:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java (contents, props changed)
- copied, changed from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java (contents, props changed)
- copied, changed from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java (contents, props changed)
- copied, changed from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java (contents, props changed)
- copied, changed from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java (contents, props changed)
- copied, changed from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java (contents, props changed)
- copied, changed from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTest.java
Removed:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTest.java
Copied: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java (from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTest.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java?p2=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java&p1=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTest.java&r1=369828&r2=369943&rev=369943&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTest.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java Tue Jan 17 14:11:31 2006
@@ -17,68 +17,66 @@
package org.apache.tuscany.sdo.test;
-import java.io.File;
-import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
-
-import org.apache.tuscany.sdo.util.SDOUtil;
+import java.net.URL;
import commonj.sdo.ChangeSummary;
import commonj.sdo.DataGraph;
import commonj.sdo.DataObject;
import commonj.sdo.helper.XSDHelper;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sdo.util.SDOUtil;
-public class ChangeSummaryTest
-{
- static final String QUOTE_MODEL = "src/test/resources/simple.xsd";
-
- /**
- * Simple ChangeSummary test.
- */
- public static void main(String[] args)
- {
- try
- {
- // Populate the meta data for the test (Stock Quote) model
- //
- File inputFile = new File(QUOTE_MODEL).getAbsoluteFile();
- InputStream inputStream = new FileInputStream(inputFile);
- XSDHelper.INSTANCE.define(inputStream, inputFile.toURI().toString());
-
- // Create an empty data graph and add a root object, an instance of type Quote
- //
- DataGraph dataGraph = SDOUtil.createDataGraph();
- DataObject quote = dataGraph.createRootObject("http://www.example.com/simple", "Quote");
-
- // Begin logging changes
- //
- ChangeSummary changeSummary = dataGraph.getChangeSummary();
- changeSummary.beginLogging();
-
- // Modify the data graph in various fun and interesting ways
- //
- quote.setString("symbol", "fbnt");
- quote.setString("companyName", "FlyByNightTechnology");
- quote.setBigDecimal("price", new BigDecimal("1000.0"));
- quote.setBigDecimal("open1", new BigDecimal("1000.0"));
- quote.setBigDecimal("high", new BigDecimal("1000.0"));
- quote.setBigDecimal("low", new BigDecimal("1000.0"));
- quote.setDouble("volume", 1000);
- quote.setDouble("change1", 1000);
-
- DataObject child = quote.createDataObject("quotes");
- child.setBigDecimal("price", new BigDecimal("2000.0"));
-
- // Stop logging changes and print the resulting data graph to stdout
- //
- changeSummary.endLogging();
- SDOUtil.saveDataGraph(dataGraph, System.out, null);
+public class ChangeSummaryTestCase extends TestCase {
+ private static final String TEST_MODEL = "/simple.xsd";
+
+ /**
+ * Simple ChangeSummary test.
+ */
+ public void testChangeSummary() throws IOException {
+ // Create an empty data graph and add a root object, an instance of type Quote
+ //
+ DataGraph dataGraph = SDOUtil.createDataGraph();
+ DataObject quote = dataGraph.createRootObject("http://www.example.com/simple", "Quote");
+
+ // Begin logging changes
+ //
+ ChangeSummary changeSummary = dataGraph.getChangeSummary();
+ changeSummary.beginLogging();
+
+ // Modify the data graph in various fun and interesting ways
+ //
+ quote.setString("symbol", "fbnt");
+ quote.setString("companyName", "FlyByNightTechnology");
+ quote.setBigDecimal("price", new BigDecimal("1000.0"));
+ quote.setBigDecimal("open1", new BigDecimal("1000.0"));
+ quote.setBigDecimal("high", new BigDecimal("1000.0"));
+ quote.setBigDecimal("low", new BigDecimal("1000.0"));
+ quote.setDouble("volume", 1000);
+ quote.setDouble("change1", 1000);
+
+ DataObject child = quote.createDataObject("quotes");
+ child.setBigDecimal("price", new BigDecimal("2000.0"));
+
+ // Stop logging changes and print the resulting data graph to stdout
+ //
+ changeSummary.endLogging();
+ SDOUtil.saveDataGraph(dataGraph, System.out, null);
+
+ // TODO verify that what was saved was correct
}
- catch (Exception e)
- {
- e.printStackTrace();
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // Populate the meta data for the test (Stock Quote) model
+ URL url = getClass().getResource(TEST_MODEL);
+ InputStream inputStream = url.openStream();
+ XSDHelper.INSTANCE.define(inputStream, url.toString());
+ inputStream.close();
}
- }
}
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java (from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTest.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java?p2=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java&p1=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTest.java&r1=369828&r2=369943&rev=369943&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTest.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java Tue Jan 17 14:11:31 2006
@@ -17,10 +17,10 @@
package org.apache.tuscany.sdo.test;
-import java.io.File;
-import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.net.URL;
import commonj.sdo.DataObject;
import commonj.sdo.Sequence;
@@ -29,57 +29,57 @@
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
+import junit.framework.TestCase;
-public class MixedTypeTest
-{
- static final String QUOTE_MODEL = "src/test/resources/mixed.xsd";
- static final String QUOTE_NAMESPACE = "http://www.example.com/mixed";
-
- /**
- * Sequenced type SDO 2 test.
- */
- public static void main(String[] args)
- {
- try
- {
- File xsdFile = new File(QUOTE_MODEL).getAbsoluteFile();
- InputStream inputStream = new FileInputStream(xsdFile);
- XSDHelper.INSTANCE.define(inputStream, xsdFile.toURI().toString());
-
- Type quoteType = TypeHelper.INSTANCE.getType(QUOTE_NAMESPACE, "MixedQuote");
- DataObject quote = DataFactory.INSTANCE.create(quoteType);
-
- System.out.println("quote type isOpen: " + quoteType.isOpen());
- System.out.println("quote type isSequenced: " + quoteType.isSequenced());
-
- Sequence sequence = quote.getSequence();
-
- sequence.add("\n ");
-
- quote.setString("symbol", "fbnt");
-
- sequence.add("\n ");
-
- quote.setString("companyName", "FlyByNightTechnology");
-
- sequence.add("\n some text\n ");
-
- DataObject child = quote.createDataObject("quotes");
- child.setBigDecimal("price", new BigDecimal("2000.0"));
-
- sequence.add("\n more text\n ");
-
- // quote.setBigDecimal("price", new BigDecimal("1000.0"));
- sequence.add("price", new BigDecimal("1000.0"));
-
- sequence.add("\n");
+public class MixedTypeTestCase extends TestCase {
+ private static final String TEST_MODEL = "/mixed.xsd";
+ static final String TEST_NAMESPACE = "http://www.example.com/mixed";
- XMLHelper.INSTANCE.save(quote, QUOTE_NAMESPACE, "mixedStockQuote", System.out);
+ /**
+ * Sequenced type SDO 2 test.
+ */
+ public void testSequencedType() throws IOException {
+ Type quoteType = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "MixedQuote");
+ DataObject quote = DataFactory.INSTANCE.create(quoteType);
+
+ System.out.println("quote type isOpen: " + quoteType.isOpen());
+ System.out.println("quote type isSequenced: " + quoteType.isSequenced());
+
+ Sequence sequence = quote.getSequence();
+
+ sequence.add("\n ");
+
+ quote.setString("symbol", "fbnt");
+
+ sequence.add("\n ");
+
+ quote.setString("companyName", "FlyByNightTechnology");
+
+ sequence.add("\n some text\n ");
+
+ DataObject child = quote.createDataObject("quotes");
+ child.setBigDecimal("price", new BigDecimal("2000.0"));
+
+ sequence.add("\n more text\n ");
+
+ // quote.setBigDecimal("price", new BigDecimal("1000.0"));
+ sequence.add("price", new BigDecimal("1000.0"));
+
+ sequence.add("\n");
+
+ XMLHelper.INSTANCE.save(quote, TEST_NAMESPACE, "mixedStockQuote", System.out);
+
+ // TODO verify that what was saved was correct
}
- catch (Exception e)
- {
- e.printStackTrace();
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // Populate the meta data for the test (Stock Quote) model
+ URL url = getClass().getResource(TEST_MODEL);
+ InputStream inputStream = url.openStream();
+ XSDHelper.INSTANCE.define(inputStream, url.toString());
+ inputStream.close();
}
- }
}
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java (from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTest.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java?p2=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java&p1=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTest.java&r1=369828&r2=369943&rev=369943&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTest.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java Tue Jan 17 14:11:31 2006
@@ -17,10 +17,10 @@
package org.apache.tuscany.sdo.test;
-import java.io.File;
-import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.net.URL;
import java.util.Iterator;
import commonj.sdo.DataObject;
@@ -30,58 +30,54 @@
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
+import junit.framework.TestCase;
-public class OpenTypeTest
-{
- static final String QUOTE_MODEL = "src/test/resources/open.xsd";
- static final String QUOTE_NAMESPACE = "http://www.example.com/open";
-
- /**
- * Open content SDO 2 test.
- */
- public static void main(String[] args)
- {
- try
- {
- File xsdFile = new File(QUOTE_MODEL).getAbsoluteFile();
- InputStream inputStream = new FileInputStream(xsdFile);
- XSDHelper.INSTANCE.define(inputStream, xsdFile.toURI().toString());
-
- Type quoteType = TypeHelper.INSTANCE.getType(QUOTE_NAMESPACE, "OpenQuote");
- DataObject quote = DataFactory.INSTANCE.create(quoteType);
-
- System.out.println("quote type isOpen: " + quoteType.isOpen());
- System.out.println("quote type isSequenced: " + quoteType.isSequenced());
-
- quote.setString("symbol", "s1");
-
- System.out.println("Before instance properties: " + quote.getInstanceProperties().size());
- for (Iterator iter = quote.getInstanceProperties().iterator(); iter.hasNext(); )
- {
- Property property = (Property)iter.next();
- System.out.println(" " + property.getName());
- }
-
- Property companyProperty = XSDHelper.INSTANCE.getGlobalProperty(QUOTE_NAMESPACE, "company", true);
- DataObject company = quote.createDataObject(companyProperty);
- company.setString("name", "FlyByNightTechnology");
-
- Property priceProperty = XSDHelper.INSTANCE.getGlobalProperty(QUOTE_NAMESPACE, "price", true);
- quote.getList(priceProperty).add(new BigDecimal("1000.0"));
-
- System.out.println("After instance properties: " + quote.getInstanceProperties().size());
- for (Iterator iter = quote.getInstanceProperties().iterator(); iter.hasNext(); )
- {
- Property property = (Property)iter.next();
- System.out.println(" " + property.getName());
- }
-
- XMLHelper.INSTANCE.save(quote, QUOTE_NAMESPACE, "openStockQuote", System.out);
+public class OpenTypeTestCase extends TestCase {
+ private static final String TEST_MODEL = "/open.xsd";
+ private static final String TEST_NAMESPACE = "http://www.example.com/open";
+
+ /**
+ * Open content SDO 2 test.
+ */
+ public void testOpenType() throws IOException {
+ Type quoteType = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "OpenQuote");
+ DataObject quote = DataFactory.INSTANCE.create(quoteType);
+
+ System.out.println("quote type isOpen: " + quoteType.isOpen());
+ System.out.println("quote type isSequenced: " + quoteType.isSequenced());
+
+ quote.setString("symbol", "s1");
+
+ System.out.println("Before instance properties: " + quote.getInstanceProperties().size());
+ for (Iterator iter = quote.getInstanceProperties().iterator(); iter.hasNext();) {
+ Property property = (Property) iter.next();
+ System.out.println(" " + property.getName());
+ }
+
+ Property companyProperty = XSDHelper.INSTANCE.getGlobalProperty(TEST_NAMESPACE, "company", true);
+ DataObject company = quote.createDataObject(companyProperty);
+ company.setString("name", "FlyByNightTechnology");
+
+ Property priceProperty = XSDHelper.INSTANCE.getGlobalProperty(TEST_NAMESPACE, "price", true);
+ quote.getList(priceProperty).add(new BigDecimal("1000.0"));
+
+ System.out.println("After instance properties: " + quote.getInstanceProperties().size());
+ for (Iterator iter = quote.getInstanceProperties().iterator(); iter.hasNext();) {
+ Property property = (Property) iter.next();
+ System.out.println(" " + property.getName());
+ }
+
+ XMLHelper.INSTANCE.save(quote, TEST_NAMESPACE, "openStockQuote", System.out);
}
- catch (Exception e)
- {
- e.printStackTrace();
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // Populate the meta data for the test (Stock Quote) model
+ URL url = getClass().getResource(TEST_MODEL);
+ InputStream inputStream = url.openStream();
+ XSDHelper.INSTANCE.define(inputStream, url.toString());
+ inputStream.close();
}
- }
}
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java (from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTest.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java?p2=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java&p1=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTest.java&r1=369828&r2=369943&rev=369943&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTest.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java Tue Jan 17 14:11:31 2006
@@ -16,61 +16,54 @@
*/
package org.apache.tuscany.sdo.test;
-import java.io.File;
-import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import commonj.sdo.DataObject;
import commonj.sdo.helper.CopyHelper;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
+import junit.framework.TestCase;
-public class SimpleCopyTest
-{
+public class SimpleCopyTestCase extends TestCase {
- static final String QUOTE_MODEL = "src/test/resources/simple.xsd";
- static final String QUOTE_NAMESPACE = "http://www.example.com/simple";
- static final String QUOTE_INSTANCE = "src/test/resources/quote.xml";
-
- /**
- * @param args
- */
- public static void main(String[] args)
- {
- try
- {
- File xsdFile = new File(QUOTE_MODEL).getAbsoluteFile();
- InputStream inputStream = new FileInputStream(xsdFile);
- XSDHelper.INSTANCE.define(inputStream, xsdFile.toURI().toString());
-
- XMLDocument doc = XMLHelper.INSTANCE.load(new FileInputStream(QUOTE_INSTANCE));
+ private static final String TEST_MODEL = "/simple.xsd";
+ private static final String TEST_NAMESPACE = "http://www.example.com/simple";
+ private static final String TEST_INSTANCE = "/quote.xml";
+
+ public void testSimpleCopy() throws IOException {
+ XMLDocument doc = XMLHelper.INSTANCE.load(getClass().getResourceAsStream(TEST_INSTANCE));
DataObject sdo = doc.getRootObject();
-
+
System.out.println("Original DataObject:");
- XMLHelper.INSTANCE.save(sdo, QUOTE_NAMESPACE, "stockQuote", System.out);
+ XMLHelper.INSTANCE.save(sdo, TEST_NAMESPACE, "stockQuote", System.out);
System.out.println();
System.out.println("******************************");
-
+
DataObject copiedSdo = CopyHelper.INSTANCE.copyShallow(sdo);
-
+
System.out.println("Shallow Copy:");
- XMLHelper.INSTANCE.save(copiedSdo, QUOTE_NAMESPACE, "stockQuote", System.out);
+ XMLHelper.INSTANCE.save(copiedSdo, TEST_NAMESPACE, "stockQuote", System.out);
System.out.println();
System.out.println("******************************");
-
+
copiedSdo = CopyHelper.INSTANCE.copy(sdo);
System.out.println("Deep Copy:");
- XMLHelper.INSTANCE.save(copiedSdo, QUOTE_NAMESPACE, "stockQuote", System.out);
+ XMLHelper.INSTANCE.save(copiedSdo, TEST_NAMESPACE, "stockQuote", System.out);
+ }
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ protected void setUp() throws Exception {
+ super.setUp();
- }
+ // Populate the meta data for the test (Stock Quote) model
+ URL url = getClass().getResource(TEST_MODEL);
+ InputStream inputStream = url.openStream();
+ XSDHelper.INSTANCE.define(inputStream, url.toString());
+ inputStream.close();
+ }
}
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java (from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTest.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java?p2=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java&p1=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTest.java&r1=369828&r2=369943&rev=369943&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTest.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java Tue Jan 17 14:11:31 2006
@@ -17,11 +17,13 @@
package org.apache.tuscany.sdo.test;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.InputStream;
+import java.io.File;
+import java.io.FileInputStream;
import java.math.BigDecimal;
+import java.net.URL;
import commonj.sdo.DataObject;
import commonj.sdo.Type;
@@ -30,51 +32,60 @@
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
+import junit.framework.TestCase;
+
+public class SimpleDynamicTestCase extends TestCase {
+ private static final String TEST_MODEL = "/simple.xsd";
+ private static final String TEST_NAMESPACE = "http://www.example.com/simple";
+ private File tmpFile;
+
+ /**
+ * Simple Dynamic SDO 2 test.
+ */
+ public void testDynamic() throws IOException {
+ Type quoteType = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "Quote");
+ DataObject quote = DataFactory.INSTANCE.create(quoteType);
+
+ quote.setString("symbol", "fbnt");
+ quote.setString("companyName", "FlyByNightTechnology");
+ quote.setBigDecimal("price", new BigDecimal("1000.0"));
+ quote.setBigDecimal("open1", new BigDecimal("1000.0"));
+ quote.setBigDecimal("high", new BigDecimal("1000.0"));
+ quote.setBigDecimal("low", new BigDecimal("1000.0"));
+ quote.setDouble("volume", 1000);
+ quote.setDouble("change1", 1000);
+
+ DataObject child = quote.createDataObject("quotes");
+ child.setBigDecimal("price", new BigDecimal("2000.0"));
+
+/* FIXME the next line causes a ClassCastException when run from mvn
+ XMLHelper.INSTANCE.save(quote, TEST_NAMESPACE, "stockQuote", new FileOutputStream(tmpFile));
+
+ XMLDocument doc = XMLHelper.INSTANCE.load(new FileInputStream(tmpFile));
+
+ System.out.println("Root element URI: " + doc.getRootElementURI());
+ System.out.println("Root element name: " + doc.getRootElementName());
+ System.out.println("Root object type: " + doc.getRootObject().getType().getName());
+ XMLHelper.INSTANCE.save(doc, System.out, null);
+*/
+ }
+
+
+ protected void setUp() throws Exception {
+ super.setUp();
-public class SimpleDynamicTest
-{
- static final String QUOTE_MODEL = "src/test/resources/simple.xsd";
- static final String QUOTE_NAMESPACE = "http://www.example.com/simple";
- static final String QUOTE_INSTANCE = "src/test/resources/quote.xml";
-
- /**
- * Simple Dynamic SDO 2 test.
- */
- public static void main(String[] args)
- {
- try
- {
- File xsdFile = new File(QUOTE_MODEL).getAbsoluteFile();
- InputStream inputStream = new FileInputStream(xsdFile);
- XSDHelper.INSTANCE.define(inputStream, xsdFile.toURI().toString());
-
- Type quoteType = TypeHelper.INSTANCE.getType(QUOTE_NAMESPACE, "Quote");
- DataObject quote = DataFactory.INSTANCE.create(quoteType);
-
- quote.setString("symbol", "fbnt");
- quote.setString("companyName", "FlyByNightTechnology");
- quote.setBigDecimal("price", new BigDecimal("1000.0"));
- quote.setBigDecimal("open1", new BigDecimal("1000.0"));
- quote.setBigDecimal("high", new BigDecimal("1000.0"));
- quote.setBigDecimal("low", new BigDecimal("1000.0"));
- quote.setDouble("volume", 1000);
- quote.setDouble("change1", 1000);
-
- DataObject child = quote.createDataObject("quotes");
- child.setBigDecimal("price", new BigDecimal("2000.0"));
-
- XMLHelper.INSTANCE.save(quote, QUOTE_NAMESPACE, "stockQuote", new FileOutputStream(QUOTE_INSTANCE));
- XMLDocument doc = XMLHelper.INSTANCE.load(new FileInputStream(QUOTE_INSTANCE));
-
- System.out.println("Root element URI: " + doc.getRootElementURI());
- System.out.println("Root element name: " + doc.getRootElementName());
- System.out.println("Root object type: " + doc.getRootObject().getType().getName());
- XMLHelper.INSTANCE.save(doc, System.out, null);
+ // Populate the meta data for the test (Stock Quote) model
+ URL url = getClass().getResource(TEST_MODEL);
+ InputStream inputStream = url.openStream();
+ XSDHelper.INSTANCE.define(inputStream, url.toString());
+ inputStream.close();
+
+ tmpFile = File.createTempFile("SimpleDynamicTestCase", ".xml");
}
- catch (Exception e)
- {
- e.printStackTrace();
+
+ protected void tearDown() throws Exception {
+ tmpFile.delete();
+ super.tearDown();
}
- }
}
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java (from r369828, incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTest.java)
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java?p2=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java&p1=incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTest.java&r1=369828&r2=369943&rev=369943&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTest.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java Tue Jan 17 14:11:31 2006
@@ -16,63 +16,58 @@
*/
package org.apache.tuscany.sdo.test;
-import java.io.File;
-import java.io.FileInputStream;
+import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import commonj.sdo.DataObject;
import commonj.sdo.helper.EqualityHelper;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
+import junit.framework.TestCase;
-public class SimpleEqualityTest
-{
- static final String QUOTE_MODEL = "src/test/resources/simple.xsd";
- static final String QUOTE_NAMESPACE = "http://www.example.com/simple";
- static final String QUOTE_INSTANCE = "src/test/resources/quote.xml";
- static final String SHALLOWQUOTE_INSTANCE = "src/test/resources/shallowquote.xml";
-
- /**
- * @param args
- */
- public static void main(String[] args)
- {
- try
- {
- File xsdFile = new File(QUOTE_MODEL).getAbsoluteFile();
- InputStream inputStream = new FileInputStream(xsdFile);
- XSDHelper.INSTANCE.define(inputStream, xsdFile.toURI().toString());
-
- XMLDocument doc = XMLHelper.INSTANCE.load(new FileInputStream(QUOTE_INSTANCE));
- DataObject sdo = doc.getRootObject();
-
- System.out.println("Source DataObject:");
- XMLHelper.INSTANCE.save(sdo, QUOTE_NAMESPACE, "stockQuote", System.out);
-
- System.out.println();
- System.out.println("******************************");
-
- doc = XMLHelper.INSTANCE.load(new FileInputStream(SHALLOWQUOTE_INSTANCE));
- DataObject shallowSdo = doc.getRootObject();
-
- System.out.println("Target DataObject:");
- XMLHelper.INSTANCE.save(shallowSdo, QUOTE_NAMESPACE, "stockQuote", System.out);
-
- System.out.println();
- System.out.println("******************************");
-
- boolean result = EqualityHelper.INSTANCE.equalShallow(sdo, shallowSdo);
- System.out.println("Shallow comparison result: " + result);
-
- result = EqualityHelper.INSTANCE.equal(sdo, shallowSdo);
- System.out.println("Deep comparison result: " + result);
- }
- catch (Exception e)
- {
- e.printStackTrace();
+public class SimpleEqualityTestCase extends TestCase {
+ private static final String TEST_MODEL = "/simple.xsd";
+ private static final String QUOTE_NAMESPACE = "http://www.example.com/simple";
+ private static final String TEST_INSTANCE = "/quote.xml";
+ private static final String SHALLOWQUOTE_INSTANCE = "/shallowquote.xml";
+
+ public void testEquality() throws IOException {
+
+ XMLDocument doc = XMLHelper.INSTANCE.load(getClass().getResourceAsStream(TEST_INSTANCE));
+ DataObject sdo = doc.getRootObject();
+
+ System.out.println("Source DataObject:");
+ XMLHelper.INSTANCE.save(sdo, QUOTE_NAMESPACE, "stockQuote", System.out);
+
+ System.out.println();
+ System.out.println("******************************");
+
+ doc = XMLHelper.INSTANCE.load(getClass().getResourceAsStream(SHALLOWQUOTE_INSTANCE));
+ DataObject shallowSdo = doc.getRootObject();
+
+ System.out.println("Target DataObject:");
+ XMLHelper.INSTANCE.save(shallowSdo, QUOTE_NAMESPACE, "stockQuote", System.out);
+
+ System.out.println();
+ System.out.println("******************************");
+
+ boolean result = EqualityHelper.INSTANCE.equalShallow(sdo, shallowSdo);
+ System.out.println("Shallow comparison result: " + result);
+
+ result = EqualityHelper.INSTANCE.equal(sdo, shallowSdo);
+ System.out.println("Deep comparison result: " + result);
}
- }
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // Populate the meta data for the test (Stock Quote) model
+ URL url = getClass().getResource(TEST_MODEL);
+ InputStream inputStream = url.openStream();
+ XSDHelper.INSTANCE.define(inputStream, url.toString());
+ inputStream.close();
+ }
}
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date