You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2007/05/09 16:04:51 UTC
svn commit: r536535 [4/4] - in /incubator/tuscany/java/cts:
sdo2.1-tuscany/src/main/java/test/sdo21/vendor/tuscany/dataObjectFactory/
sdo2.1-tuscany/src/main/java/test/sdo21/vendor/tuscany/testHelper/
sdo2.1/src/main/java/test/sdo21/ sdo2.1/src/main/ja...
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DynamicTypesFromSchemaTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DynamicTypesFromSchemaTestCase.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DynamicTypesFromSchemaTestCase.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DynamicTypesFromSchemaTestCase.java Wed May 9 07:04:49 2007
@@ -28,7 +28,12 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
import test.sdo21.CTSSuite;
import test.sdo21.framework.TestHelper;
@@ -44,10 +49,9 @@
import commonj.sdo.helper.XSDHelper;
/**
- * Tests methods of DataGraph except for change summary which is tested
- * elsewhere.
+ * Tests methods of DataGraph except for change summary which is tested elsewhere.
*/
-public class DynamicTypesFromSchemaTestCase extends TestCase {
+public class DynamicTypesFromSchemaTestCase {
private final String DYNAMIC_ROOT_TYPE_0 = "TestType0";
private final String DYNAMIC_ROOT_TYPE_1 = "TestType1";
@@ -68,15 +72,8 @@
private List typeList;
- /**
- * Set of tests for dynamic types.
- */
- public DynamicTypesFromSchemaTestCase(String string) throws Exception {
- super(string);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
TestHelper testHelper = CTSSuite.getTestHelper();
hc = testHelper.createHelperContext();
@@ -91,6 +88,7 @@
/**
* test of Schema complex types
*/
+ @Test
public void testDynamicTypeList() throws IOException {
if (typeList == null) {
fail("typeList unexpectedly null");
@@ -131,6 +129,7 @@
/**
* test #0 of Schema primitive datatypes
*/
+ @Test
public void testDynamicTypesGroup0() throws IOException {
if (hc == null) {
fail("the HelperContext unexpectedly null");
@@ -162,28 +161,29 @@
fail("getInstanceProperties list contained: " + obj.toString());
}
}
- assertTrue(propNameSet.contains("anyURI"));
- assertTrue(propNameSet.contains("base64Binary"));
- assertTrue(propNameSet.contains("boolean"));
- assertTrue(propNameSet.contains("date"));
- assertTrue(propNameSet.contains("dateTime"));
- assertTrue(propNameSet.contains("decimal"));
- assertTrue(propNameSet.contains("double"));
- assertTrue(propNameSet.contains("duration"));
- assertTrue(propNameSet.contains("float"));
- assertTrue(propNameSet.contains("gDay"));
- assertTrue(propNameSet.contains("gMonth"));
- assertTrue(propNameSet.contains("gMonthDay"));
- assertTrue(propNameSet.contains("gYear"));
- assertTrue(propNameSet.contains("gYearMonth"));
- assertTrue(propNameSet.contains("hexBinary"));
- assertTrue(propNameSet.contains("string"));
- assertTrue(propNameSet.contains("time"));
+ assertTrue("Property name set does not contain 'anyURI'.", propNameSet.contains("anyURI"));
+ assertTrue("Property name set does not contain 'base64Binary'.", propNameSet.contains("base64Binary"));
+ assertTrue("Property name set does not contain 'boolean'.", propNameSet.contains("boolean"));
+ assertTrue("Property name set does not contain 'date'.", propNameSet.contains("date"));
+ assertTrue("Property name set does not contain 'dateTime'.", propNameSet.contains("dateTime"));
+ assertTrue("Property name set does not contain 'decimal'.", propNameSet.contains("decimal"));
+ assertTrue("Property name set does not contain 'double'.", propNameSet.contains("double"));
+ assertTrue("Property name set does not contain 'duration'.", propNameSet.contains("duration"));
+ assertTrue("Property name set does not contain 'float'.", propNameSet.contains("float"));
+ assertTrue("Property name set does not contain 'gDay'.", propNameSet.contains("gDay"));
+ assertTrue("Property name set does not contain 'gMonth'.", propNameSet.contains("gMonth"));
+ assertTrue("Property name set does not contain 'gMonthDay'.", propNameSet.contains("gMonthDay"));
+ assertTrue("Property name set does not contain 'gYear'.", propNameSet.contains("gYear"));
+ assertTrue("Property name set does not contain 'gYearMonth'.", propNameSet.contains("gYearMonth"));
+ assertTrue("Property name set does not contain 'hexBinary'.", propNameSet.contains("hexBinary"));
+ assertTrue("Property name set does not contain 'string'.", propNameSet.contains("string"));
+ assertTrue("Property name set does not contain 'time'.", propNameSet.contains("time"));
}
/**
* test #1 of Schema derived datatypes
*/
+ @Test
public void testDynamicTypesGroup1() throws IOException {
if (hc == null) {
fail("the HelperContext unexpectedly null");
@@ -215,34 +215,35 @@
fail("getInstanceProperties list contained: " + obj.toString());
}
}
- assertTrue(propNameSet.contains("ID"));
- assertTrue(propNameSet.contains("IDREF"));
- assertTrue(propNameSet.contains("IDREFS"));
- assertTrue(propNameSet.contains("NCName"));
- assertTrue(propNameSet.contains("NMTOKEN"));
- assertTrue(propNameSet.contains("NMTOKENS"));
- assertTrue(propNameSet.contains("Name"));
- assertTrue(propNameSet.contains("byte"));
- assertTrue(propNameSet.contains("int"));
- assertTrue(propNameSet.contains("integer"));
- assertTrue(propNameSet.contains("language"));
- assertTrue(propNameSet.contains("long"));
- assertTrue(propNameSet.contains("negativeInteger"));
- assertTrue(propNameSet.contains("nonNegativeInteger"));
- assertTrue(propNameSet.contains("nonPositiveInteger"));
- assertTrue(propNameSet.contains("normalizedString"));
- assertTrue(propNameSet.contains("positiveInteger"));
- assertTrue(propNameSet.contains("short"));
- assertTrue(propNameSet.contains("token"));
- assertTrue(propNameSet.contains("unsignedByte"));
- assertTrue(propNameSet.contains("unsignedInt"));
- assertTrue(propNameSet.contains("unsignedLong"));
- assertTrue(propNameSet.contains("unsignedShort"));
+ assertTrue("Property name set does not contain 'ID'.", propNameSet.contains("ID"));
+ assertTrue("Property name set does not contain 'IDREF'.", propNameSet.contains("IDREF"));
+ assertTrue("Property name set does not contain 'IDREFS'.", propNameSet.contains("IDREFS"));
+ assertTrue("Property name set does not contain 'NCName'.", propNameSet.contains("NCName"));
+ assertTrue("Property name set does not contain 'NMTOKEN'.", propNameSet.contains("NMTOKEN"));
+ assertTrue("Property name set does not contain 'NMTOKENS'.", propNameSet.contains("NMTOKENS"));
+ assertTrue("Property name set does not contain 'Name'.", propNameSet.contains("Name"));
+ assertTrue("Property name set does not contain 'byte'.", propNameSet.contains("byte"));
+ assertTrue("Property name set does not contain 'int'.", propNameSet.contains("int"));
+ assertTrue("Property name set does not contain 'integer'.", propNameSet.contains("integer"));
+ assertTrue("Property name set does not contain 'language'.", propNameSet.contains("language"));
+ assertTrue("Property name set does not contain 'long'.", propNameSet.contains("long"));
+ assertTrue("Property name set does not contain 'negativeInteger'.", propNameSet.contains("negativeInteger"));
+ assertTrue("Property name set does not contain 'nonNegativeInteger'.", propNameSet.contains("nonNegativeInteger"));
+ assertTrue("Property name set does not contain 'nonPositiveInteger'.", propNameSet.contains("nonPositiveInteger"));
+ assertTrue("Property name set does not contain 'normalizedString'.", propNameSet.contains("normalizedString"));
+ assertTrue("Property name set does not contain 'positiveInteger'.", propNameSet.contains("positiveInteger"));
+ assertTrue("Property name set does not contain 'short'.", propNameSet.contains("short"));
+ assertTrue("Property name set does not contain 'token'.", propNameSet.contains("token"));
+ assertTrue("Property name set does not contain 'unsignedByte'.", propNameSet.contains("unsignedByte"));
+ assertTrue("Property name set does not contain 'unsignedInt'.", propNameSet.contains("unsignedInt"));
+ assertTrue("Property name set does not contain 'unsignedLong'.", propNameSet.contains("unsignedLong"));
+ assertTrue("Property name set does not contain 'unsignedShort'.", propNameSet.contains("unsignedShort"));
}
/**
* test #2 of more Schema derived datatypes
*/
+ @Test
public void testDynamicTypesGroup2() throws IOException {
if (hc == null) {
fail("the HelperContext unexpectedly null");
@@ -274,21 +275,21 @@
fail("getInstanceProperties list contained: " + obj.toString());
}
}
- assertTrue(propNameSet.contains("addresses"));
- assertTrue(propNameSet.contains("cluster"));
- assertTrue(propNameSet.contains("clusters"));
- assertTrue(propNameSet.contains("components"));
- assertTrue(propNameSet.contains("headerValue"));
- assertTrue(propNameSet.contains("item"));
- assertTrue(propNameSet.contains("items"));
- assertTrue(propNameSet.contains("nCName"));
- assertTrue(propNameSet.contains("otherTag"));
- assertTrue(propNameSet.contains("overallStatus"));
- assertTrue(propNameSet.contains("smallBigDecimal"));
- assertTrue(propNameSet.contains("smallBigInteger"));
- assertTrue(propNameSet.contains("smallInt"));
- assertTrue(propNameSet.contains("smallOddNumber"));
- assertTrue(propNameSet.contains("statusOrMonthList"));
- assertTrue(propNameSet.contains("wierdNumber"));
+ assertTrue("Property name set does not contain 'addresses'.", propNameSet.contains("addresses"));
+ assertTrue("Property name set does not contain 'cluster'.", propNameSet.contains("cluster"));
+ assertTrue("Property name set does not contain 'clusters'.", propNameSet.contains("clusters"));
+ assertTrue("Property name set does not contain 'components'.", propNameSet.contains("components"));
+ assertTrue("Property name set does not contain 'headerValue'.", propNameSet.contains("headerValue"));
+ assertTrue("Property name set does not contain 'item'.", propNameSet.contains("item"));
+ assertTrue("Property name set does not contain 'items'.", propNameSet.contains("items"));
+ assertTrue("Property name set does not contain 'nCName'.", propNameSet.contains("nCName"));
+ assertTrue("Property name set does not contain 'otherTag'.", propNameSet.contains("otherTag"));
+ assertTrue("Property name set does not contain 'overallStatus'.", propNameSet.contains("overallStatus"));
+ assertTrue("Property name set does not contain 'smallBigDecimal'.", propNameSet.contains("smallBigDecimal"));
+ assertTrue("Property name set does not contain 'smallBigInteger'.", propNameSet.contains("smallBigInteger"));
+ assertTrue("Property name set does not contain 'smallInt'.", propNameSet.contains("smallInt"));
+ assertTrue("Property name set does not contain 'smallOddNumber'.", propNameSet.contains("smallOddNumber"));
+ assertTrue("Property name set does not contain 'statusOrMonthList'.", propNameSet.contains("statusOrMonthList"));
+ assertTrue("Property name set does not contain 'wierdNumber'.", propNameSet.contains("wierdNumber"));
}
}
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/SequenceAddOpenTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/SequenceAddOpenTest.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/SequenceAddOpenTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/SequenceAddOpenTest.java Wed May 9 07:04:49 2007
@@ -22,11 +22,13 @@
import junit.framework.TestCase;
import test.sdo21.framework.TestHelper;
+import test.sdo21.framework.junit3_8.CTSTestCase;
import test.sdo21.CTSSuite;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
import commonj.sdo.Sequence;
import commonj.sdo.Type;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.DataFactory;
@@ -34,7 +36,7 @@
* Tests adding objects to a sequence. Note: the tests in this test case must be run sequentially as each test
* depends on state from the previous test.
*/
-public class SequenceAddOpenTest extends TestCase {
+public class SequenceAddOpenTest extends CTSTestCase {
protected TestHelper testHelper;
protected DataFactory dataFactory;
@@ -45,12 +47,13 @@
super(string);
}
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
- testHelper = CTSSuite.getTestHelper();
- dataFactory = testHelper.getDataFactory();
- typeHelper = testHelper.getTypeHelper();
+ HelperContext scope = getScope();
+ testHelper = getTestHelper();
+ dataFactory = scope.getDataFactory();
+ typeHelper = scope.getTypeHelper();
// define an open type
DataObject typeDef = dataFactory.create( "commonj.sdo", "Type" );
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/SequenceAddTypedTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/SequenceAddTypedTest.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/SequenceAddTypedTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/SequenceAddTypedTest.java Wed May 9 07:04:49 2007
@@ -25,12 +25,14 @@
import commonj.sdo.Property;
import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import test.sdo21.framework.TestHelper;
+import test.sdo21.framework.junit3_8.CTSTestCase;
import test.sdo21.CTSSuite;
import junit.framework.TestCase;
-public class SequenceAddTypedTest extends TestCase {
+public class SequenceAddTypedTest extends CTSTestCase {
protected String URI = "http://www.example.com/cts/SequenceAddTypedTest";
@@ -43,12 +45,14 @@
super(string);
}
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
- testHelper = CTSSuite.getTestHelper();
- dataFactory = testHelper.getDataFactory();
- typeHelper = testHelper.getTypeHelper();
+ HelperContext scope = getScope();
+ testHelper = getTestHelper();
+ dataFactory = scope.getDataFactory();
+ typeHelper = scope.getTypeHelper();
+
defineDynamicTypes(getName());
}
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/ConversionBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/ConversionBase.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/ConversionBase.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/ConversionBase.java Wed May 9 07:04:49 2007
@@ -29,6 +29,7 @@
import java.math.BigInteger;
import test.sdo21.framework.TestHelper;
+import test.sdo21.framework.junit3_8.CTSTestCase;
import test.sdo21.CTSSuite;
import commonj.sdo.DataObject;
import commonj.sdo.helper.TypeHelper;
@@ -36,7 +37,7 @@
/**
* Base class for conversion tests.
*/
-public class ConversionBase extends TestCase {
+public class ConversionBase extends CTSTestCase {
/**
* This variable is used to create unique type names to avoid name clashes
@@ -70,7 +71,7 @@
/**
* Sets up a time format and obtain a test helper.
*/
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
// set up time format as per page 71 of SDO for Java 2.1.0 FINAL
@@ -92,13 +93,13 @@
private DataObject createTypeConversionObject(String strName, String strType) {
// obtain a TypeHelper
- TypeHelper typeHelper = testHelper.getTypeHelper();
+ TypeHelper typeHelper = getScope().getTypeHelper();
// create new DataType
String uri = "http://example.com/TypeConversionTest/" + unique;
String name = "TypeConversionTest" + unique;
unique++;
- DataObject productType = testHelper.getDataFactory().create("commonj.sdo", "Type");
+ DataObject productType = getScope().getDataFactory().create("commonj.sdo", "Type");
productType.set("uri", uri);
productType.set("name", name);
@@ -112,7 +113,7 @@
typeHelper.define(productType);
// create DataObject using the new Type
- return testHelper.getDataFactory().create(uri, name);
+ return getScope().getDataFactory().create(uri, name);
}
/**
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/DateConversionTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/DateConversionTest.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/DateConversionTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/DateConversionTest.java Wed May 9 07:04:49 2007
@@ -85,7 +85,7 @@
*/
@BeforeClass
public static void setupCalender() {
- data_helper = CTSSuite.getTestHelper().getDataHelper();
+ data_helper = CTSSuite.getTestHelper().createHelperContext().getDataHelper();
test_calendar = new GregorianCalendar();
test_calendar.setTime(new Date(System.currentTimeMillis()));
test_date = test_calendar.getTime();
@@ -378,7 +378,7 @@
* DataHelper.toDate(String).
*/
@org.junit.Test
- @Ignore /* Note: this individual test is effectively in the UnderReview set. see TUSCANY-1175 */
+ @Ignore("This individual test is effectively in the UnderReview set. See TUSCANY-1175")
public void testToDateFormats() {
String[] validStrings =
{"2006-03-31T03:30:45.123Z", "-2006-03-31T03:30:45.1Z", "2006-03-31T03:30:45Z", "2006-03-31T03:30:45.123",
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/TypeConversionTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/TypeConversionTest.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/TypeConversionTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/conversion/TypeConversionTest.java Wed May 9 07:04:49 2007
@@ -21,17 +21,9 @@
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.TimeZone;
-
-import junit.framework.TestCase;
-import test.sdo21.CTSSuite;
-import test.sdo21.framework.TestHelper;
import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
/**
* This test case primarily tests the type conversion matrix in section 16 of
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/general/XMLHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/general/XMLHelperTest.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/general/XMLHelperTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/general/XMLHelperTest.java Wed May 9 07:04:49 2007
@@ -32,6 +32,10 @@
import java.math.BigDecimal;
import java.net.URL;
+import test.sdo21.framework.CTSTestCase;
+import test.sdo21.tests.util.XMLEqualityChecker;
+
+import org.junit.Before;
import org.junit.Test;
import test.sdo21.CTSSuite;
@@ -51,7 +55,7 @@
/**
* Junit 4.1 test case. Tests various concepts against the XMLHelper.
*/
-public class XMLHelperTest {
+public class XMLHelperTest extends CTSTestCase {
private static final String CUSTOMER1_XML = "/customer1.xml";
private static final String CUSTOMER2_XML = "/customer2.xml";
private static final String MIXED_XML = "/mixed2.xml";
@@ -72,11 +76,11 @@
// Populate the meta data for the test (Stock Quote) model
URL url = getClass().getResource(TEST_MODEL);
InputStream inputStream = url.openStream();
- CTSSuite.getTestHelper().getXSDHelper().define(inputStream, url.toString());
+ getScope().getXSDHelper().define(inputStream, url.toString());
inputStream.close();
- Type quoteType = CTSSuite.getTestHelper().getTypeHelper().getType(TEST_NAMESPACE, "RootQuote");
- DataObject quote = CTSSuite.getTestHelper().getDataFactory().create(quoteType);
+ Type quoteType = getScope().getTypeHelper().getType(TEST_NAMESPACE, "RootQuote");
+ DataObject quote = getScope().getDataFactory().create(quoteType);
ChangeSummary cs = quote.getChangeSummary();
ChangeSummary csp = (ChangeSummary)quote.get("changes");
@@ -117,7 +121,7 @@
cs.endLogging();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- CTSSuite.getTestHelper().getXMLHelper().save(quote, TEST_NAMESPACE, "stockQuote", baos);
+ getScope().getXMLHelper().save(quote, TEST_NAMESPACE, "stockQuote", baos);
assertTrue("XMLHelper did not accurately reflect the ChangeSummary.", XMLEqualityChecker
.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(TEST_DATA_BEFORE_UNDO)));
@@ -127,7 +131,7 @@
cs.undoChanges();
baos = new ByteArrayOutputStream();
- CTSSuite.getTestHelper().getXMLHelper().save(quote, TEST_NAMESPACE, "stockQuote", baos);
+ getScope().getXMLHelper().save(quote, TEST_NAMESPACE, "stockQuote", baos);
assertTrue("XMLHelper did not accurately reflect the ChangeSummary after undoChanges().", XMLEqualityChecker
.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(TEST_DATA_AFTER_UNDO)));
@@ -147,10 +151,10 @@
XMLHelper xmlHelper;
DataFactory dataFactory;
- typeHelper = CTSSuite.getTestHelper().getTypeHelper();
- dataFactory = CTSSuite.getTestHelper().getDataFactory();
- xsdHelper = CTSSuite.getTestHelper().getXSDHelper();
- xmlHelper = CTSSuite.getTestHelper().getXMLHelper();
+ typeHelper = getScope().getTypeHelper();
+ dataFactory = getScope().getDataFactory();
+ xsdHelper = getScope().getXSDHelper();
+ xmlHelper = getScope().getXMLHelper();
// Populate the meta data for the test (Stock Quote) model
URL url = getClass().getResource(TEST_MODEL);
@@ -219,9 +223,9 @@
*/
@Test
public void testDefineTypeRoundTrip() throws Exception {
- TypeHelper types = CTSSuite.getTestHelper().getTypeHelper();
- DataFactory factory = CTSSuite.getTestHelper().getDataFactory();
- XMLHelper xmlHelper = CTSSuite.getTestHelper().getXMLHelper();
+ TypeHelper types = getScope().getTypeHelper();
+ DataFactory factory = getScope().getDataFactory();
+ XMLHelper xmlHelper = getScope().getXMLHelper();
Type intType = types.getType("commonj.sdo", "Int");
Type stringType = types.getType("commonj.sdo", "String");
@@ -301,9 +305,9 @@
*/
@Test
public void testDefineType() throws Exception {
- TypeHelper types = CTSSuite.getTestHelper().getTypeHelper();
- DataFactory factory = CTSSuite.getTestHelper().getDataFactory();
- XMLHelper xmlHelper = CTSSuite.getTestHelper().getXMLHelper();
+ TypeHelper types = getScope().getTypeHelper();
+ DataFactory factory = getScope().getDataFactory();
+ XMLHelper xmlHelper = getScope().getXMLHelper();
Type intType = types.getType("commonj.sdo", "Int");
Type stringType = types.getType("commonj.sdo", "String");
@@ -375,9 +379,9 @@
@Test
public void testDefineSequencedType() throws Exception {
- TypeHelper types = CTSSuite.getTestHelper().getTypeHelper();
- DataFactory factory = CTSSuite.getTestHelper().getDataFactory();
- XMLHelper xmlHelper = CTSSuite.getTestHelper().getXMLHelper();
+ TypeHelper types = getScope().getTypeHelper();
+ DataFactory factory = getScope().getDataFactory();
+ XMLHelper xmlHelper = getScope().getXMLHelper();
Type stringType = types.getType("commonj.sdo", "String");
Type decimalType = types.getType("commonj.sdo", "Decimal");
@@ -445,9 +449,9 @@
*/
@Test
public void testDefineSequencedOpenType() throws Exception {
- TypeHelper types = CTSSuite.getTestHelper().getTypeHelper();
- DataFactory factory = CTSSuite.getTestHelper().getDataFactory();
- XMLHelper xmlHelper = CTSSuite.getTestHelper().getXMLHelper();
+ TypeHelper types = getScope().getTypeHelper();
+ DataFactory factory = getScope().getDataFactory();
+ XMLHelper xmlHelper = getScope().getXMLHelper();
Type stringType = types.getType("commonj.sdo", "String");
Type decimalType = types.getType("commonj.sdo", "Decimal");
@@ -523,4 +527,10 @@
assertTrue("XMLHelper.save() did not accurately reflect quote.", XMLEqualityChecker
.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(MIXEDOPEN_XML)));
}
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
}
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/general/XSDHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/general/XSDHelperTest.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/general/XSDHelperTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/general/XSDHelperTest.java Wed May 9 07:04:49 2007
@@ -51,6 +51,7 @@
import org.junit.Ignore;
import test.sdo21.CTSSuite;
+import test.sdo21.framework.CTSTestCase;
import commonj.sdo.DataObject;
import commonj.sdo.Type;
@@ -62,11 +63,11 @@
* Junit 4.1 test case. Tests XSD serialization/deserialization.
*
*/
-public class XSDHelperTest {
+// FIXME ensure that the inherited HelperContext stuff is consistent with the test case code
+public class XSDHelperTest extends CTSTestCase {
private static final String TEST_MODEL = "/simple.xsd";
private XmlSchemaCollection col = new XmlSchemaCollection();
private static URL modelURL;
- HelperContext scope = null;
/**
* Obtains test model resource. Runs once before any of the test methods.
@@ -76,14 +77,13 @@
modelURL = XSDHelperTest.class.getResource(TEST_MODEL);
}
- @Before public void setUp()
+ @Before public void setUp() throws Exception
{
- scope = test.sdo21.CTSSuite.getTestHelper().createHelperContext();
+ super.setUp();
}
@After public void tearDown()
{
- scope = null;
}
/**
@@ -94,9 +94,9 @@
public void testDefineWithLocation() {
try {
- XSDHelper xsdHelper = scope.getXSDHelper();
+ XSDHelper xsdHelper = getScope().getXSDHelper();
List types = xsdHelper.define(modelURL.openStream(), modelURL.toString());
- checkTypes(modelURL, scope.getTypeHelper(), types);
+ checkTypes(modelURL, getScope().getTypeHelper(), types);
//assertEquals("XSDHelper.define() did not create the expected number of Types", 2, types.size());
} catch (Exception e) {
e.printStackTrace();
@@ -135,9 +135,9 @@
@Test
public void testDefineWithNoLocation() {
try {
- XSDHelper xsdHelper = scope.getXSDHelper();
+ XSDHelper xsdHelper = getScope().getXSDHelper();
List types = xsdHelper.define(XSDHelperTest.class.getResourceAsStream(TEST_MODEL), null);
- checkTypes(modelURL, scope.getTypeHelper(), types);
+ checkTypes(modelURL, getScope().getTypeHelper(), types);
//assertEquals("XSDHelper.define() did not create the expected number of Types", 2, types.size());
} catch (Exception e) {
@@ -152,7 +152,7 @@
@Test
public void testDuplicateDefineWithLocation() {
try {
- XSDHelper xsdHelper = scope.getXSDHelper();
+ XSDHelper xsdHelper = getScope().getXSDHelper();
List types = xsdHelper.define(modelURL.openStream(), modelURL.toString());
assertEquals("XSDHelper.define() did not create the expected number of Types", 2, types.size());
// redefine type
@@ -177,12 +177,12 @@
// 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 = scope.getXSDHelper();
- DataObject quoteType = CTSSuite.getTestHelper().getDataFactory().create("commonj.sdo", "Type");
+ XSDHelper xsdHelper = getScope().getXSDHelper();
+ DataObject quoteType = getScope().getDataFactory().create("commonj.sdo", "Type");
quoteType.set("uri", "http://www.example.com/dynamic");
quoteType.set("name", "DynamicQuote");
- TypeHelper th = CTSSuite.getTestHelper().getTypeHelper();
+ TypeHelper th = getScope().getTypeHelper();
DataObject aProperty = quoteType.createDataObject("property");
aProperty.set("name", "symbol");
aProperty.set("type", th.getType("commonj.sdo", "String"));
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDBaseTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDBaseTestCase.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDBaseTestCase.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDBaseTestCase.java Wed May 9 07:04:49 2007
@@ -34,6 +34,7 @@
import commonj.sdo.Type;
import commonj.sdo.Property;
import test.sdo21.CTSSuite;
+import test.sdo21.framework.CTSTestCase;
import test.sdo21.framework.TestHelper;
import org.junit.Before;
import static org.junit.Assert.*;
@@ -41,7 +42,7 @@
/**
* Base class for all XSD tests.
*/
-public class XSDBaseTestCase {
+public class XSDBaseTestCase extends CTSTestCase {
protected TestHelper testHelper;
protected XSDHelper xsdHelper;
@@ -50,10 +51,11 @@
@Before
public void setUp() throws Exception {
- testHelper = CTSSuite.getTestHelper();
- xsdHelper = testHelper.getXSDHelper();
- typeHelper = testHelper.getTypeHelper();
- dataFactory = testHelper.getDataFactory();
+ super.setUp();
+ testHelper = getTestHelper();
+ xsdHelper = getScope().getXSDHelper();
+ typeHelper = getScope().getTypeHelper();
+ dataFactory = getScope().getDataFactory();
}
/**
@@ -66,7 +68,7 @@
throw new RuntimeException("Could not locate " + filename);
}
InputStream inputStream = url.openStream();
- XSDHelper xsdHelper = testHelper.getXSDHelper();
+ XSDHelper xsdHelper = getScope().getXSDHelper();
List typeList = xsdHelper.define(inputStream, url.toString());
inputStream.close();
return typeList;
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDComplexTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDComplexTypeTest.java?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDComplexTypeTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDComplexTypeTest.java Wed May 9 07:04:49 2007
@@ -831,7 +831,7 @@
@Test public void testTC298ComplexTypeSetAnySimpleTypeWithStringValue() throws Exception {
List types = define("/complexType/cT_47.xsd");
- DataObject dobj = testHelper.getDataFactory().create( "http://www.example.com/xsd/47/", "cT_47" );
+ DataObject dobj = getScope().getDataFactory().create( "http://www.example.com/xsd/47/", "cT_47" );
Property p = dobj.getProperty( "type_anySimpleType" );
assertNotNull( p );
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/resources/api_test.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/resources/api_test.xsd?view=diff&rev=536535&r1=536534&r2=536535
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/resources/api_test.xsd (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/resources/api_test.xsd Wed May 9 07:04:49 2007
@@ -14,47 +14,76 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<xsd:schema xmlns:sdo="commonj.sdo" xmlns:simple="http://www.example.com/api_test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/api_test">
+<xsd:schema xmlns:sdo="commonj.sdo" xmlns:sdoXML="commonj.sdo/xml" xmlns:api="http://www.example.com/api_test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/api_test">
<xsd:import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/>
- <xsd:element name="apiTestElem" type="simple:APITest"/>
- <xsd:complexType mixed="false" name="APITest">
+ <xsd:element name="apiTestElem" type="api:APITest"/>
+
+ <xsd:complexType name="APITest">
<xsd:sequence>
- <xsd:element name="stringVal" type="sdo:String"/>
- <xsd:element name="booleanVal" type="sdo:Boolean"/>
- <xsd:element name="booleanVal2" type="sdo:Boolean"/>
- <xsd:element name="byteVal" type="sdo:Byte"/>
- <xsd:element name="stringVal2" type="sdo:String"/>
- <xsd:element name="decimalVal" type="sdo:Decimal"/>
- <xsd:element name="decimalVal2" sdo:aliasName="dec2" type="sdo:Decimal"/>
- <xsd:element name="intVal" type="sdo:Int"/>
- <xsd:element name="floatVal" type="sdo:Float"/>
- <xsd:element name="doubleVal" type="sdo:Double"/>
- <xsd:element name="dateVal" type="sdo:Date"/>
- <xsd:element name="shortVal" type="sdo:Short"/>
- <xsd:element name="longVal" type="sdo:Long"/>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="children" type="simple:APITest"/>
- <xsd:element name="bytesVal" type="sdo:Bytes"/>
- <xsd:element name="integerVal" type="sdo:Integer"/>
- <xsd:element name="charVal" type="sdo:Character"/>
- <xsd:element name="xsdDate" type="xsd:date"/>
- <xsd:element name="sequencedElem" type="simple:Sequenced"/>
+ <xsd:element name="stringVal" type="xsd:string"/>
+ <xsd:element name="booleanVal" type="xsd:boolean"/>
+ <xsd:element name="booleanVal2" type="xsd:boolean"/>
+ <xsd:element name="byteVal" type="xsd:byte"/>
+ <xsd:element name="stringVal2" type="xsd:string"/>
+ <xsd:element name="decimalVal" type="xsd:decimal"/>
+ <xsd:element name="decimalVal2" sdo:aliasName="dec2" type="xsd:decimal"/>
+ <xsd:element name="intVal" type="xsd:int"/>
+ <xsd:element name="floatVal" type="xsd:float"/>
+ <xsd:element name="doubleVal" type="xsd:double"/>
+ <xsd:element name="dateVal" type="xsd:dateTime"/>
+ <xsd:element name="shortVal" type="xsd:short"/>
+ <xsd:element name="longVal" type="xsd:long"/>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="containMany" type="api:APITest"/>
+ <xsd:element name="bytesVal" type="xsd:hexBinary"/>
+ <xsd:element name="integerVal" type="xsd:integer"/>
+ <xsd:element name="charVal" type="api:char"/>
+ <xsd:element name="readOnlyVal" type="xsd:string" sdoXML:readOnly="true"/>
+ <xsd:element name="sequencedElem" type="api:Sequenced"/>
+ <xsd:element name="extendedElem" type="api:Extended"/>
+ <xsd:element name="openElem" type="api:Open"/>
+ <xsd:element name="contain" type="api:APITest"/>
</xsd:sequence>
</xsd:complexType>
- <xsd:complexType abstract="true" name="Abstract" sdo:sequence="true">
+
+ <xsd:complexType name="Sequenced" mixed="true">
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="Numbers" type="xsd:int"/>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="Letters" type="xsd:string"/>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="containMany" type="api:Sequenced"/>
+ <xsd:element name="contain" type="api:Sequenced"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="Open">
+ <xsd:sequence>
+ <xsd:element name="defined" type="xsd:string"/>
+ <xsd:any maxOccurs="unbounded" namespace="##any"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:simpleType name="char">
+ <xsd:restriction base="xsd:string">
+ <xsd:length value="1"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType abstract="true" name="Abstract">
<xsd:sequence>
- <xsd:element name="firstName" type="sdo:String"/>
- <xsd:element name="lastName" type="sdo:String"/>
+ <xsd:element name="firstName" type="xsd:string"/>
+ <xsd:element name="lastName" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
- <xsd:complexType name="Sequenced" sdo:aliasName="Seq2" sdo:sequence="true" mixed="true">
+
+ <xsd:complexType name="Extended" sdo:aliasName="Ext2">
<xsd:complexContent>
- <xsd:extension base="simple:Abstract">
+ <xsd:extension base="api:Abstract">
<xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="Numbers" type="sdo:Int"/>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="Letters" type="sdo:String"/>
+ <xsd:element name="nickName" type="xsd:string"/>
+ <xsd:element name="middleName" type="xsd:string"/>
</xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
-</xsd:complexType>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
</xsd:schema>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org