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/04/30 15:47:02 UTC
svn commit: r533745 - in
/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21:
paramatizedTests/CTSParamatizedSuite.java
paramatizedTests/general/ActiveUpdatingTest.java tests/CTSGeneralSuite.java
Author: kelvingoodson
Date: Mon Apr 30 06:47:01 2007
New Revision: 533745
URL: http://svn.apache.org/viewvc?view=rev&rev=533745
Log:
switched arguments for test case assertions to correct order and moved ActiveUpdating tests to approved suite
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/paramatizedTests/general/ActiveUpdatingTest.java
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/CTSGeneralSuite.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=533745&r1=533744&r2=533745
==============================================================================
--- 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 Apr 30 06:47:01 2007
@@ -56,7 +56,7 @@
* should be placed in the {@link test.sdo21.UnderReviewSuite} suite.
*/
@RunWith(Suite.class)
-@Suite.SuiteClasses( {ActiveUpdatingTest.class, ContainmentTest.class, CopyEqualityTest.class, DataFactoryTest.class,
+@Suite.SuiteClasses( {ContainmentTest.class, CopyEqualityTest.class, DataFactoryTest.class,
DataGraphTest.class, DeleteTest.class, PropertyTest.class, SequenceTest.class,
TypeConversionTest.class, TypeHelperTest.class, TypeTest.class, XMLHelperTest.class})
public class CTSParamatizedSuite {
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/general/ActiveUpdatingTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/general/ActiveUpdatingTest.java?view=diff&rev=533745&r1=533744&r2=533745
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/general/ActiveUpdatingTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/paramatizedTests/general/ActiveUpdatingTest.java Mon Apr 30 06:47:01 2007
@@ -107,7 +107,6 @@
* used in the DataObject.setList().
*/
- // TODO switch the arguments in the rest of this file so that the expected value is the first comparison argument
assertEquals("Deleting a DataObject should not affect a List unassociated with the DataObject.",
1,
addList.size());
@@ -121,7 +120,7 @@
addList.add(child3);
root.setList("children", addList);
- assertEquals("The List retruned by DataObject.getList() was not affected by a subsequent DataObject.setList().",
+ assertEquals("The List returned by DataObject.getList() was not affected by a subsequent DataObject.setList().",
3,
returnedList.size());
/**
@@ -132,13 +131,12 @@
DataObject child = (DataObject)returnedList.get(1);
// Verify the precondition. The child should have root as its container.
- assertEquals("List.setList() did not cause the expected containment relationship.", child.getContainer(), root);
+ assertEquals("List.setList() did not cause the expected containment relationship.", root, child.getContainer());
returnedList.remove(1);
assertEquals("List.remove() did not have the expected effect on the DataObject. There are more than 2 children",
- root.getList("children").size(),
- 2);
+ 2, root.getList("children").size());
assertNull("List.remove() did not have the expected effect on the DataObject. child container is not null",
child.getContainer());
@@ -148,8 +146,7 @@
returnedList.clear();
assertEquals("List.clear() on the returned List did not have the expected effect on the DataObject. The size of the list of children is not 0",
- root.getList("children").size(),
- 0);
+ 0,root.getList("children").size());
assertNull("List.clear() on the returned List did not have the expected effect on the DataObject. child1.getContainer is not null",
child1.getContainer());
assertNull("List.clear() on the returned List did not have the expected effect on the DataObject. child2.getContainer is not null",
@@ -177,7 +174,7 @@
numberList.clear();
// Verify the precondition. The Sequence should be empty.
- assertEquals("The Sequence should initially be empty.", sequence.size(), 0);
+ assertEquals("The Sequence should initially be empty.", 0, sequence.size());
/**
* Add values to the DataObject and verify that the Sequence is
@@ -216,8 +213,8 @@
"A", sequence.getValue(0)
);
assertEquals("Removing a value from the DataObject did not affect the returned Sequence.",
- sequence.getValue(1),
- Integer.valueOf(8));
+ Integer.valueOf(8),
+ sequence.getValue(1));
/**
* Remove a value from the Sequence and verify that the DataObject is
@@ -272,36 +269,36 @@
// <Numbers, 16>, <Numbers, 4>, <Letters, "M">, <Numbers, -10>}
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- letterList.size(),
- 4);
+ 4,
+ letterList.size());
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- letterList.get(0),
- "A");
+ "A",
+ letterList.get(0));
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- letterList.get(1),
- "K");
+ "K",
+ letterList.get(1));
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- letterList.get(2),
- "C");
+ "C",
+ letterList.get(2));
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- letterList.get(3),
- "M");
+ "M",
+ letterList.get(3));
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- numberList.size(),
- 4);
+ 4,
+ numberList.size());
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- numberList.get(0),
- Integer.valueOf(15));
+ Integer.valueOf(15),
+ numberList.get(0));
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- numberList.get(1),
- Integer.valueOf(16));
+ Integer.valueOf(16),
+ numberList.get(1));
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- numberList.get(2),
- Integer.valueOf(4));
+ Integer.valueOf(4),
+ numberList.get(2));
assertEquals("Sequence.move() did not have the expected effect on the DataObject represented by the Sequence.",
- numberList.get(3),
- Integer.valueOf(-10));
+ Integer.valueOf(-10),
+ numberList.get(3));
// TODO: Add a value to a specific location within the Sequence and
// veirfy the effect on the DataObject. Awaiting Tuscany-931
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=533745&r1=533744&r2=533745
==============================================================================
--- 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 Apr 30 06:47:01 2007
@@ -23,6 +23,7 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
+import test.sdo21.paramatizedTests.general.ActiveUpdatingTest;
import test.sdo21.tests.api.DataObjectTest;
import test.sdo21.tests.api.DynamicTypesFromSchemaTestCase;
import test.sdo21.tests.api.SequenceAddOpenTest;
@@ -58,7 +59,8 @@
TypeConversionTest.class,
XSDSimpleTypeTest.class,
SequenceAddOpenTest.class,
- SequenceAddTypedTest.class
+ SequenceAddTypedTest.class,
+ ActiveUpdatingTest.class
})
public class CTSGeneralSuite {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org