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 12:55:55 UTC
svn commit: r537775 - in
/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21:
paramatizedTests/ tests/ tests/api/ tests/api/DataGraph/
tests/api/DataObject/
Author: kelvingoodson
Date: Mon May 14 03:55:54 2007
New Revision: 537775
URL: http://svn.apache.org/viewvc?view=rev&rev=537775
Log:
move active updating test class to basis of data object consistency test class
Added:
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyBase.java
- copied, changed from r537760, incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/ActiveUpdatingTest.java
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyDynamic.java (with props)
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencySuite.java (with props)
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyXSD.java (with props)
Removed:
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/ActiveUpdatingTest.java
Modified:
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/CTSParamatizedSuite.java
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/CTSGeneralSuite.java
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/CTSConsistencyBase.java
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataGraph/DataGraphConsistencyBase.java
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=537775&r1=537774&r2=537775
==============================================================================
--- 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 03:55:54 2007
@@ -23,7 +23,6 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import test.sdo21.paramatizedTests.api.DataFactoryTest;
import test.sdo21.paramatizedTests.api.PropertyTest;
import test.sdo21.paramatizedTests.api.SequenceTest;
import test.sdo21.paramatizedTests.api.TypeHelperTest;
@@ -34,7 +33,6 @@
import test.sdo21.paramatizedTests.general.ContainmentTest;
import test.sdo21.paramatizedTests.general.DeleteTest;
import test.sdo21.tests.api.CopyHelper.CopyEqualityTest;
-import test.sdo21.tests.api.DataObject.ActiveUpdatingTest;
/**
* Declares paramatized test classes to be run within Junit 4.1 Suite for SDO
@@ -48,7 +46,6 @@
* <LI>{@link test.sdo21.paramatizedTests.api.TypeTest}</LI>
* <LI>{@link test.sdo21.paramatizedTests.api.XMLHelperTest}</LI>
* <LI>{@link test.sdo21.paramatizedTests.conversion.TypeConversionTest}</LI>
- * <LI>{@link test.sdo21.tests.api.DataObject.ActiveUpdatingTest}</LI>
* <LI>{@link test.sdo21.paramatizedTests.general.ContainmentTest}</LI>
* <LI>{@link test.sdo21.paramatizedTests.general.ContainmentCycleSerializationTest}</LI>
* <LI>{@link test.sdo21.paramatizedTests.general.DeleteTest}</LI>
@@ -57,7 +54,7 @@
* should be placed in the {@link test.sdo21.UnderReviewSuite} suite.
*/
@RunWith(Suite.class)
-@Suite.SuiteClasses( {ActiveUpdatingTest.class, ContainmentTest.class, CopyEqualityTest.class,
+@Suite.SuiteClasses( {ContainmentTest.class, CopyEqualityTest.class,
DeleteTest.class, PropertyTest.class, SequenceTest.class,
TypeConversionTest.class, TypeHelperTest.class, TypeTest.class, XMLHelperTest.class,
ContainmentCycleSerializationTest.class})
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/CTSGeneralSuite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/CTSGeneralSuite.java?view=diff&rev=537775&r1=537774&r2=537775
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/CTSGeneralSuite.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/CTSGeneralSuite.java Mon May 14 03:55:54 2007
@@ -26,8 +26,7 @@
import test.sdo21.tests.api.DynamicTypesFromSchemaTestCase;
import test.sdo21.tests.api.SequenceAddOpenTest;
import test.sdo21.tests.api.SequenceAddTypedTest;
-import test.sdo21.tests.api.DataGraph.DataGraphConsistencySuite;
-import test.sdo21.tests.api.DataObject.ActiveUpdatingTest;
+import test.sdo21.tests.api.DataObject.DataObjectConsistencySuite;
import test.sdo21.tests.api.DataObject.DataObjectTest;
import test.sdo21.tests.conversion.DateConversionTest;
import test.sdo21.tests.conversion.TypeConversionTest;
@@ -63,7 +62,7 @@
XSDSimpleTypeTest.class,
SequenceAddOpenTest.class,
SequenceAddTypedTest.class,
- ActiveUpdatingTest.class
+ DataObjectConsistencySuite.class
})
public class CTSGeneralSuite {
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/CTSConsistencyBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/CTSConsistencyBase.java?view=diff&rev=537775&r1=537774&r2=537775
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/CTSConsistencyBase.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/CTSConsistencyBase.java Mon May 14 03:55:54 2007
@@ -36,7 +36,7 @@
*/
public abstract class CTSConsistencyBase extends CTSTestCase {
protected DataObject testDO;
- TestDataFactory factory;
+ protected TestDataFactory factory;
public abstract TestDataFactory createTestDataFactory();
public CTSConsistencyBase() {
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataGraph/DataGraphConsistencyBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataGraph/DataGraphConsistencyBase.java?view=diff&rev=537775&r1=537774&r2=537775
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataGraph/DataGraphConsistencyBase.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataGraph/DataGraphConsistencyBase.java Mon May 14 03:55:54 2007
@@ -39,13 +39,8 @@
import commonj.sdo.Type;
public abstract class DataGraphConsistencyBase extends CTSConsistencyBase {
-
- private DataObject testDO;
- TestDataFactory factory;
- public abstract TestDataFactory createTestDataFactory();
-
-
+
@Before
public void setUp () throws Exception {
super.setUp();
Copied: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyBase.java (from r537760, incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/ActiveUpdatingTest.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyBase.java?view=diff&rev=537775&p1=incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/ActiveUpdatingTest.java&r1=537760&p2=incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyBase.java&r2=537775
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/ActiveUpdatingTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyBase.java Mon May 14 03:55:54 2007
@@ -33,6 +33,8 @@
import test.sdo21.framework.DataObjectFactory;
import test.sdo21.paramatizedTests.BaseSDOParamatizedTest;
+import test.sdo21.tests.TestData.StandardFactory;
+import test.sdo21.tests.api.CTSConsistencyBase;
import commonj.sdo.DataObject;
import commonj.sdo.Sequence;
@@ -41,27 +43,20 @@
* Tests for proper updates to DataObject and their value changes due to the
* updates.
*/
-@RunWith(Parameterized.class)
-public class ActiveUpdatingTest extends BaseSDOParamatizedTest {
+public abstract class DataObjectConsistencyBase extends CTSConsistencyBase {
- /**
- * Tests for proper updates to DataObject and their value changes due to the
- * updates.
- */
- public ActiveUpdatingTest(DataObjectFactory factory, String description) {
- super(factory, description);
- }
/**
* testActiveUpdatingList verifies that updates made to a List returned from
* a DataObject are reflected in the DataObject and vice versa.
+ * @throws Exception
*/
@Test
- public void testActiveUpdatingList() {
- DataObject root = factory.createTestAPIObject();
- DataObject child1 = factory.createTestAPIObject();
- DataObject child2 = factory.createTestAPIObject();
- DataObject child3 = factory.createTestAPIObject();
+ public void testActiveUpdatingList() throws Exception {
+ DataObject root = factory.createTestData(getScope(), StandardFactory.API_TYPE);
+ DataObject child1 = factory.createTestData(getScope(), StandardFactory.API_TYPE);
+ DataObject child2 = factory.createTestData(getScope(), StandardFactory.API_TYPE);
+ DataObject child3 = factory.createTestData(getScope(), StandardFactory.API_TYPE);
List addList = new ArrayList();
List returnedList;
@@ -153,11 +148,12 @@
* testActiveUpdatingSequence verifies that updates made to a Sequence
* returned from a DataObject are reflected in the DataObject and vice
* versa.
+ * @throws Exception
*/
@Test
- public void testActiveUpdatingSequence() {
+ public void testActiveUpdatingSequence() throws Exception {
- DataObject sequenceDO = factory.createSequencedObject();
+ DataObject sequenceDO = factory.createTestData(getScope(), StandardFactory.SEQ_TYPE);
Sequence sequence = sequenceDO.getSequence();
List letterList = sequenceDO.getList("Letters");
List numberList = sequenceDO.getList("Numbers");
Added: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyDynamic.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyDynamic.java?view=auto&rev=537775
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyDynamic.java (added)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyDynamic.java Mon May 14 03:55:54 2007
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * $Rev$ $Date$
+ */
+package test.sdo21.tests.api.DataObject;
+
+import test.sdo21.tests.TestData.StandardDynamicFactory;
+import test.sdo21.tests.TestData.TestDataFactory;
+
+public class DataObjectConsistencyDynamic extends DataObjectConsistencyBase {
+
+ public TestDataFactory createTestDataFactory() {
+
+ return new StandardDynamicFactory();
+ }
+
+
+}
Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyDynamic.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyDynamic.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencySuite.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencySuite.java?view=auto&rev=537775
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencySuite.java (added)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencySuite.java Mon May 14 03:55:54 2007
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * $Rev$ $Date$
+ */
+package test.sdo21.tests.api.DataObject;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {DataObjectConsistencyDynamic.class,
+ DataObjectConsistencyXSD.class})
+public class DataObjectConsistencySuite {
+
+}
Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencySuite.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencySuite.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyXSD.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyXSD.java?view=auto&rev=537775
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyXSD.java (added)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyXSD.java Mon May 14 03:55:54 2007
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * $Rev$ $Date$
+ */
+package test.sdo21.tests.api.DataObject;
+
+import test.sdo21.tests.TestData.StandardXSDFactory;
+import test.sdo21.tests.TestData.TestDataFactory;
+
+public class DataObjectConsistencyXSD extends DataObjectConsistencyBase {
+
+ public TestDataFactory createTestDataFactory() {
+
+ return new StandardXSDFactory();
+ }
+
+
+}
Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyXSD.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/DataObject/DataObjectConsistencyXSD.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org