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/14 15:40:43 UTC
svn commit: r537836 - in
/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21: ./
paramatizedTests/ paramatizedTests/api/ tests/api/
Author: kelvingoodson
Date: Mon May 14 06:40:41 2007
New Revision: 537836
URL: http://svn.apache.org/viewvc?view=rev&rev=537836
Log:
Move TypeHelperTest to non parameterized approach
Added:
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/TypeHelperTest.java
- copied, changed from r537760, incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/api/TypeHelperTest.java
Removed:
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/api/SequenceTest.java
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/api/TypeHelperTest.java
Modified:
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/UnderReviewSuite.java
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/CTSParamatizedSuite.java
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/UnderReviewSuite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/UnderReviewSuite.java?view=diff&rev=537836&r1=537835&r2=537836
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/UnderReviewSuite.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/UnderReviewSuite.java Mon May 14 06:40:41 2007
@@ -23,6 +23,7 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
+import test.sdo21.tests.api.TypeHelperTest;
import test.sdo21.tests.api.DataFactory.DataFactoryConsistencySuite;
import test.sdo21.tests.api.DataGraph.DataGraphConsistencySuite;
import test.sdo21.tests.api.Sequence.SequenceConsistencySuite;
@@ -50,7 +51,8 @@
test.sdo21.tests.general.XMLHelperTest.class,
DataGraphConsistencySuite.class,
DataFactoryConsistencySuite.class,
- SequenceConsistencySuite.class
+ SequenceConsistencySuite.class,
+ TypeHelperTest.class
})
public class UnderReviewSuite {
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/CTSParamatizedSuite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/CTSParamatizedSuite.java?view=diff&rev=537836&r1=537835&r2=537836
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/CTSParamatizedSuite.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/CTSParamatizedSuite.java Mon May 14 06:40:41 2007
@@ -23,7 +23,6 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import test.sdo21.paramatizedTests.api.TypeHelperTest;
import test.sdo21.paramatizedTests.api.TypeTest;
import test.sdo21.paramatizedTests.api.XMLHelperTest;
import test.sdo21.paramatizedTests.conversion.TypeConversionTest;
@@ -38,9 +37,6 @@
* CTS which includes the following classes:<br>
* <ul>
* <LI>{@link test.sdo21.tests.api.CopyHelper.CopyEqualityTest}</LI>
- * <LI>{@link test.sdo21.paramatizedTests.api.DataFactoryTestBase}</LI>
- * <LI>{@link test.sdo21.tests.api.PropertyTest}</LI>
- * <LI>{@link test.sdo21.paramatizedTests.api.TypeHelperTest}</LI>
* <LI>{@link test.sdo21.paramatizedTests.api.TypeTest}</LI>
* <LI>{@link test.sdo21.paramatizedTests.api.XMLHelperTest}</LI>
* <LI>{@link test.sdo21.paramatizedTests.conversion.TypeConversionTest}</LI>
@@ -54,7 +50,7 @@
@RunWith(Suite.class)
@Suite.SuiteClasses( {ContainmentTest.class, CopyEqualityTest.class,
DeleteTest.class, PropertyTest.class,
- TypeConversionTest.class, TypeHelperTest.class, TypeTest.class, XMLHelperTest.class,
+ TypeConversionTest.class, TypeTest.class, XMLHelperTest.class,
ContainmentCycleSerializationTest.class})
public class CTSParamatizedSuite {
Copied: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/TypeHelperTest.java (from r537760, incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/api/TypeHelperTest.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/TypeHelperTest.java?view=diff&rev=537836&p1=incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/api/TypeHelperTest.java&r1=537760&p2=incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/TypeHelperTest.java&r2=537836
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/api/TypeHelperTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/TypeHelperTest.java Mon May 14 06:40:41 2007
@@ -18,7 +18,7 @@
*
* $Rev$ $Date$
*/
-package test.sdo21.paramatizedTests.api;
+package test.sdo21.tests.api;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -29,61 +29,79 @@
import java.util.ArrayList;
import java.util.List;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import test.sdo21.paramatizedTests.BaseSDOParamatizedTest;
-import test.sdo21.paramatizedTests.util.ParamatizedTestUtil;
-import test.sdo21.framework.DataObjectFactory;
-import test.sdo21.framework.TestHelper;
+import test.sdo21.framework.CTSTestCase;
+import test.sdo21.tests.TestData.StandardDynamicFactory;
+import test.sdo21.tests.TestData.StandardFactory;
+import test.sdo21.tests.TestData.TestDataFactory;
+import test.sdo21.tests.util.CTSUtil;
import commonj.sdo.DataObject;
import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.TypeHelper;
+
+
+public class TypeHelperTest extends CTSTestCase {
-/**
- * Junit 4.1 test case. Tests TypeHelper API
- */
-@RunWith(Parameterized.class)
-public class TypeHelperTest extends BaseSDOParamatizedTest {
- private static TestHelper testHelper = test.sdo21.CTSSuite.getTestHelper();
- public TypeHelperTest(DataObjectFactory factory, String description) {
- super(factory, description);
- }
+
+ TestDataFactory factory;
+
+ public TypeHelperTest() {
+ // Tests on the Property interface should be independent of the metadata creation mechanism
+ // so just pick one Standard Factory
+ factory = new StandardDynamicFactory();
+ }
+
+ @Before
+ public void setUp () throws Exception {
+ super.setUp();
+ factory.defineMetaData(getScope());
+ }
+
+
+ @After
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
/**
* Verify the performance of TypeHelper.getType(URI, Name)
+ * @throws Exception
*/
@Test
- public void getTypeByURI() {
- DataObject testDO = factory.createTestAPIObject();
- Type testType = testDO.getType();
+ public void getTypeByURI() throws Exception {
+ DataObject testDO = factory.createTestData(getScope(), StandardFactory.API_TYPE);
+ Type testType = testDO.getType();
- TypeHelper typeHelper = factory.getHelperContext().getTypeHelper();
- Type returnedType = typeHelper.getType(testType.getURI(), testType.getName());
+ TypeHelper typeHelper = getScope().getTypeHelper();
+ Type returnedType = typeHelper.getType(testType.getURI(), testType.getName());
- assertTrue("TypeHelper.getType(URI, Name) did not return the expected Type.", ParamatizedTestUtil
- .areEqualTypes(returnedType, testType));
+ assertTrue("TypeHelper.getType(URI, Name) did not return the expected Type.", CTSUtil.areEqualTypes(returnedType, testType));
}
/**
* Verify the performance of TypeHelper.getType(Class)
+ * @throws Exception
*/
@Test
- public void getTypeByClass() {
- DataObject testDO = factory.createTestAPIObject();
+ public void getTypeByClass() throws Exception {
+ DataObject testDO = factory.createTestData(getScope(), StandardFactory.API_TYPE);
Type testType = testDO.getType();
- TypeHelper typeHelper = factory.getHelperContext().getTypeHelper();
+ TypeHelper typeHelper = getScope().getTypeHelper();
Type returnedType = typeHelper.getType(testType.getURI(), testType.getName());
if (testType.getInstanceClass() != null) {
returnedType = typeHelper.getType(testType.getInstanceClass());
- assertTrue("TypeHelper.getType(Class) did not return the expected Type.", ParamatizedTestUtil
- .areEqualTypes(returnedType, testType));
+ assertTrue("TypeHelper.getType(Class) did not return the expected Type.",
+ CTSUtil.areEqualTypes(returnedType, testType));
}
}
@@ -93,7 +111,7 @@
*/
@Test
public void getTypeWithNonSDOClass() {
- TypeHelper typeHelper = testHelper.createHelperContext().getTypeHelper();
+ TypeHelper typeHelper = getTestHelper().createHelperContext().getTypeHelper();
assertNull("TypeHelper.getType(Class) should return null when no Type was defined for the interface Class.",
typeHelper.getType(TypeHelperTest.class));
@@ -104,9 +122,9 @@
* namespace for URI does not include Name
*/
@Test
- public void getTypeByURIWithInvalidName() {
- DataObject testDO = factory.createTestAPIObject();
- TypeHelper typeHelper = factory.getHelperContext().getTypeHelper();
+ public void getTypeByURIWithInvalidName() throws Exception {
+ DataObject testDO = factory.createTestData(getScope(), StandardFactory.API_TYPE);
+ TypeHelper typeHelper = getScope().getTypeHelper();
assertNull("TypeHelper.getType(URI, Name) should return null when no Type has the indicated Name in the URI namespace.",
typeHelper.getType(testDO.getType().getURI(), "UndefinedName"));
@@ -115,11 +133,12 @@
/**
* Verify the proper performance of TypeHelper.getClass(URI, Name) when the
* Name exists but not in the namespace of the URI
+ * @throws Exception
*/
@Test
- public void getTypeByURIWithInvalidURI() {
- DataObject testDO = factory.createTestAPIObject();
- TypeHelper typeHelper = factory.getHelperContext().getTypeHelper();
+ public void getTypeByURIWithInvalidURI() throws Exception {
+ DataObject testDO = factory.createTestData(getScope(), StandardFactory.API_TYPE);
+ TypeHelper typeHelper = getScope().getTypeHelper();
assertNull("TypeHelper.getType(URI, Name) should return null when no Type has the indicated Name in the URI namespace.",
typeHelper.getType("UndefinedURI", testDO.getType().getName()));
@@ -128,17 +147,18 @@
/**
* Verify the performance of TypeHelper.define(DataObject), use
* DataFactory.create(URI, name) to verify
+ * @throws Exception
*/
@Test
- public void DefineByDataObjectCreateByURI() {
- HelperContext scope = testHelper.createHelperContext();
- DataObject testDO = factory.createTestAPIObject();
+ public void DefineByDataObjectCreateByURI() throws Exception {
+ HelperContext scope = getScope();
+ DataObject testDO = factory.createTestData(scope, StandardFactory.API_TYPE);
TypeHelper typeHelper = scope.getTypeHelper();
Type stringType = typeHelper.getType("commonj.sdo", "String");
DataObject defineTypeDO = scope.getDataFactory().create("commonj.sdo", "Type");
- defineTypeDO.set("uri", ParamatizedTestUtil.TEST_NAMESPACE);
+ defineTypeDO.set("uri", StandardFactory.TEST_NAMESPACE);
defineTypeDO.set("name", "DefinedType1");
DataObject IDProperty = defineTypeDO.createDataObject("property");
IDProperty.set("name", "ID");
@@ -152,7 +172,7 @@
// defined Type via DataFactory.create(URI, name).
DataObject result =
- scope.getDataFactory().create(ParamatizedTestUtil.TEST_NAMESPACE,
+ scope.getDataFactory().create(StandardFactory.TEST_NAMESPACE,
defineTypeDO.getString("name"));
assertNotNull("CTSSuite.getTestHelper().getDataFactory() returned null", result);
assertEquals("CTSSuite.getTestHelper().getDataFactory()e did not create a Type that could be instantiated.",
@@ -165,16 +185,17 @@
/**
* Verify the performance of TypeHelper.define(DataObject), use
* DataFactory.create(Type) to verify
+ * @throws Exception
*/
@Test
- public void DefineByDataObjectCreateByType() {
- HelperContext scope = testHelper.createHelperContext();
- DataObject testDO = factory.createTestAPIObject();
+ public void DefineByDataObjectCreateByType() throws Exception {
+ HelperContext scope = getScope();
+ DataObject testDO = factory.createTestData(getScope(), StandardFactory.API_TYPE);
TypeHelper typeHelper = scope.getTypeHelper();
Type stringType = typeHelper.getType("commonj.sdo", "String");
DataObject defineTypeDO = scope.getDataFactory().create("commonj.sdo", "Type");
- defineTypeDO.set("uri", ParamatizedTestUtil.TEST_NAMESPACE);
+ defineTypeDO.set("uri", StandardFactory.TEST_NAMESPACE);
defineTypeDO.set("name", "DefinedType2");
DataObject IDProperty = defineTypeDO.createDataObject("property");
IDProperty.set("name", "ID");
@@ -197,16 +218,17 @@
/**
* Verify the performance of TypeHelper.define(List)
+ * @throws Exception
*/
@Test
- public void DefineByList() {
- HelperContext scope = testHelper.createHelperContext();
- DataObject testDO = factory.createTestAPIObject();
+ public void DefineByList() throws Exception {
+ HelperContext scope = getScope();
+ DataObject testDO = factory.createTestData(getScope(), StandardFactory.API_TYPE);
TypeHelper typeHelper = scope.getTypeHelper();
Type stringType = typeHelper.getType("commonj.sdo", "String");
DataObject define3 = scope.getDataFactory().create("commonj.sdo", "Type");
- define3.set("uri", ParamatizedTestUtil.TEST_NAMESPACE);
+ define3.set("uri", StandardFactory.TEST_NAMESPACE);
define3.set("name", "DefinedType3");
DataObject firstNameProperty = define3.createDataObject("property");
firstNameProperty.set("name", "firstName");
@@ -216,7 +238,7 @@
DOProperty.set("type", testDO.getType());
DataObject define4 = scope.getDataFactory().create("commonj.sdo", "Type");
- define4.set("uri", ParamatizedTestUtil.TEST_NAMESPACE);
+ define4.set("uri", StandardFactory.TEST_NAMESPACE);
define4.set("name", "DefinedType4");
DataObject lastNameProperty = define4.createDataObject("property");
lastNameProperty.set("name", "lastName");
@@ -256,7 +278,7 @@
// name)
DataObject result =
- scope.getDataFactory().create(ParamatizedTestUtil.TEST_NAMESPACE,
+ scope.getDataFactory().create(StandardFactory.TEST_NAMESPACE,
define3.getString("name"));
assertNotNull("TypeHelper.define(List) did not create a Type that could be instantiated with DataFactory.create(URI, name). result is null.",
result);
@@ -282,16 +304,17 @@
/**
* Verify the error handling of TypeHelper.define(List) when List contains a
* member that is not a DataObject
+ * @throws Exception
*/
@Test
- public void DefineByListInvalidListMember() {
- HelperContext scope = testHelper.createHelperContext();
- DataObject testDO = factory.createTestAPIObject();
+ public void DefineByListInvalidListMember() throws Exception {
+ HelperContext scope = getScope();
+ DataObject testDO = factory.createTestData(getScope(), StandardFactory.API_TYPE);
TypeHelper typeHelper = scope.getTypeHelper();
Type intType = typeHelper.getType("commonj.sdo", "Int");
DataObject define5 = scope.getDataFactory().create("commonj.sdo", "Type");
- define5.set("uri", ParamatizedTestUtil.TEST_NAMESPACE);
+ define5.set("uri", StandardFactory.TEST_NAMESPACE);
define5.set("name", "DefinedType5");
DataObject ID1Property = define5.createDataObject("property");
ID1Property.set("name", "ID1");
@@ -301,7 +324,7 @@
DOProperty.set("type", testDO.getType());
DataObject define6 = scope.getDataFactory().create("commonj.sdo", "Type");
- define6.set("uri", ParamatizedTestUtil.TEST_NAMESPACE);
+ define6.set("uri", StandardFactory.TEST_NAMESPACE);
define6.set("name", "DefinedType6");
DataObject ID2Property = define6.createDataObject("property");
ID2Property.set("name", "ID2");
@@ -323,12 +346,14 @@
/**
* Verify the expected behavior of TypeHelper.define(DataObject) when a Type
* of the same name has already been defined differently.
+ * @throws Exception
*/
@Test
- public void singleRedefinitionDifferent() {
- fail(TestHelper.INCOMPLETE_TEST_CASE_FAILURE);
- HelperContext scope = testHelper.createHelperContext();
- DataObject testDO = factory.createTestAPIObject();
+ @Ignore
+ public void singleRedefinitionDifferent() throws Exception {
+ // TODO complete this test case
+ HelperContext scope = getScope();
+ DataObject testDO = factory.createTestData(getScope(), StandardFactory.API_TYPE);
TypeHelper typeHelper = scope.getTypeHelper();
Type intType = typeHelper.getType("commonj.sdo", "Int");
@@ -343,7 +368,7 @@
// returned by the define() in the latter instance.
DataObject defineDO = scope.getDataFactory().create("commonj.sdo", "Type");
- defineDO.set("uri", ParamatizedTestUtil.TEST_NAMESPACE);
+ defineDO.set("uri", StandardFactory.TEST_NAMESPACE);
defineDO.set("name", "DefineTypeAgain");
DataObject numProperty = defineDO.createDataObject("property");
numProperty.set("name", "num");
@@ -352,7 +377,7 @@
typeHelper.define(defineDO);
DataObject defineDO2 = scope.getDataFactory().create("commonj.sdo", "Type");
- defineDO2.set("uri", ParamatizedTestUtil.TEST_NAMESPACE);
+ defineDO2.set("uri", StandardFactory.TEST_NAMESPACE);
defineDO2.set("name", "DefineTypeAgain");
DataObject DOProperty = defineDO2.createDataObject("property");
DOProperty.set("name", "contained");
@@ -366,8 +391,9 @@
* of the same name has already been defined, but defined identically.
*/
@Test
+ @Ignore
public void singleRedefinitionSame() {
- fail(TestHelper.INCOMPLETE_TEST_CASE_FAILURE);
+ // TODO implement test
}
/**
@@ -375,8 +401,9 @@
* of the List has already been defined differently.
*/
@Test
+ @Ignore
public void listRedefinitionDifferent() {
- fail(TestHelper.INCOMPLETE_TEST_CASE_FAILURE);
+ // TODO implement test
}
/**
@@ -384,7 +411,8 @@
* of the List has already been defined identically.
*/
@Test
+ @Ignore
public void listRedefinitionSame() {
- fail(TestHelper.INCOMPLETE_TEST_CASE_FAILURE);
+ //TODO implement test
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org