You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fr...@apache.org on 2007/04/27 00:08:41 UTC
svn commit: r532887 - in /incubator/tuscany/java/cts: ./ sdo2.1-tuscany/
sdo2.1/ sdo2.1/src/main/java/test/sdo21/
sdo2.1/src/main/java/test/sdo21/tests/
sdo2.1/src/main/java/test/sdo21/tests/api/
Author: frankb
Date: Thu Apr 26 15:08:41 2007
New Revision: 532887
URL: http://svn.apache.org/viewvc?view=rev&rev=532887
Log:
Fixed bugs in SequenceAddOpenTest and SequenceAddTypedTest and moved them to accepted tests
Modified:
incubator/tuscany/java/cts/ (props changed)
incubator/tuscany/java/cts/sdo2.1/ (props changed)
incubator/tuscany/java/cts/sdo2.1-tuscany/ (props changed)
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/UnderReviewSuite.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/SequenceAddOpenTest.java
incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/api/SequenceAddTypedTest.java
Propchange: incubator/tuscany/java/cts/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 26 15:08:41 2007
@@ -0,0 +1,3 @@
+.classpath
+.project
+temporaryFile
Propchange: incubator/tuscany/java/cts/sdo2.1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 26 15:08:41 2007
@@ -0,0 +1 @@
+target
Propchange: incubator/tuscany/java/cts/sdo2.1-tuscany/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 26 15:08:41 2007
@@ -0,0 +1 @@
+target
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=532887&r1=532886&r2=532887
==============================================================================
--- 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 Thu Apr 26 15:08:41 2007
@@ -43,10 +43,8 @@
test.sdo21.paramatizedTests.conversion.TypeConversionTest.class,
test.sdo21.tests.conversion.StringConversionTest.class,
test.sdo21.tests.general.XMLHelperTest.class,
- test.sdo21.tests.xsd.XSDComplexTypeTest.class,
/* test.sdo21.tests.api.XMLWithoutSchemaTest.class, *//* temporarily removing since they run very slowly and fails */
- test.sdo21.tests.api.SequenceAddOpenTest.class,
- test.sdo21.tests.api.SequenceAddTypedTest.class})
+ })
public class UnderReviewSuite {
}
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=532887&r1=532886&r2=532887
==============================================================================
--- 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 Thu Apr 26 15:08:41 2007
@@ -24,6 +24,9 @@
import org.junit.runners.Suite;
import test.sdo21.tests.api.DataObjectTest;
+import test.sdo21.tests.api.DynamicTypesFromSchemaTestCase;
+import test.sdo21.tests.api.SequenceAddOpenTest;
+import test.sdo21.tests.api.SequenceAddTypedTest;
import test.sdo21.tests.conversion.DateConversionTest;
import test.sdo21.tests.conversion.TypeConversionTest;
import test.sdo21.tests.general.XSDHelperTest;
@@ -31,7 +34,6 @@
import test.sdo21.tests.xsd.XSDChoiceTest;
import test.sdo21.tests.xsd.XSDComplexTypeTest;
import test.sdo21.tests.xsd.XSDSimpleTypeTest;
-import test.sdo21.tests.api.DynamicTypesFromSchemaTestCase;
/**
* Declares general test classes to be run within Junit 4.1 Suite for SDO CTS
@@ -54,7 +56,10 @@
XSDComplexTypeTest.class,
DataObjectListTest.class,
TypeConversionTest.class,
- XSDSimpleTypeTest.class})
+ XSDSimpleTypeTest.class,
+ SequenceAddOpenTest.class,
+ SequenceAddTypedTest.class
+ })
public class CTSGeneralSuite {
}
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=532887&r1=532886&r2=532887
==============================================================================
--- 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 Thu Apr 26 15:08:41 2007
@@ -84,16 +84,16 @@
assertEquals(3, testSequence.size());
//Check the values that were added
- assertEquals("true", testSequence.getValue(0));
- assertEquals("false", testSequence.getValue(1));
- assertEquals("true", testSequence.getValue(2));
+ assertEquals(Boolean.TRUE, testSequence.getValue(0));
+ assertEquals(Boolean.FALSE, testSequence.getValue(1));
+ assertEquals(Boolean.TRUE, testSequence.getValue(2));
Property prop = testSequence.getProperty(0);
//OnDemand property should be a string
//Checking only the first property
assertEquals("testBoolean1", prop.getName());
- assertEquals("String", prop.getType().getName());
+ assertEquals("BooleanObject", prop.getType().getName());
}
@@ -112,14 +112,14 @@
Property openProp = typeHelper.defineOpenContentProperty(null, prop);
Sequence testSequence = testOpenDataObject.getSequence();
testSequence.add(openProp, new Boolean(false));
- assertEquals("false", testSequence.getValue(0));
+ assertEquals(Boolean.FALSE, testSequence.getValue(0));
openProp = testSequence.getProperty(0);
//OnDemand property should be a string
//Checking only the first property
assertEquals("testBoolean1", openProp.getName());
- assertEquals("String", openProp.getType().getName());
+ assertEquals("Boolean", openProp.getType().getName());
}
@@ -137,7 +137,7 @@
//Actual value to test from sequence
testSequence.add(0, new Boolean(false));
- assertEquals("false", testSequence.getValue(2));
+ assertEquals(Boolean.FALSE, testSequence.getValue(2));
}
@@ -153,7 +153,7 @@
Sequence testSequence = testOpenDataObject.getSequence();
testSequence.add(0, "testBoolean", new Boolean(true));
- assertEquals("true", testSequence.getValue(0));
+ assertEquals(Boolean.TRUE, testSequence.getValue(0));
}
@@ -172,7 +172,7 @@
Property openProp = typeHelper.defineOpenContentProperty(null, prop);
Sequence testSequence = testOpenDataObject.getSequence();
testSequence.add(0, openProp, new Boolean(false));
- assertEquals("false", testSequence.getValue(0));
+ assertEquals(Boolean.FALSE, testSequence.getValue(0));
}
@@ -190,7 +190,7 @@
//Actual value to test from sequence
testSequence.add(0, 0, new Boolean(false));
- assertEquals("false", testSequence.getValue(2));
+ assertEquals(Boolean.FALSE, testSequence.getValue(2));
}
@@ -246,7 +246,7 @@
testSequence.add("testString", new String("testString1"));
//Actual value to check
- testSequence.add(0, new String("testString2"));
+ testSequence.add(0, (Object)new String("testString2"));
assertEquals("testString2", testSequence.getValue(2));
@@ -320,7 +320,7 @@
Sequence testSequence = testOpenDataObject.getSequence();
testSequence.add("testCharacter", new Character('A'));
- assertEquals("A", testSequence.getValue(0));
+ assertEquals('A', testSequence.getValue(0));
}
@@ -341,7 +341,7 @@
//Actual value to test
testSequence.add(openProp, new Character('A'));
- assertEquals("A", testSequence.getValue(0));
+ assertEquals('A', testSequence.getValue(0));
}
@@ -361,7 +361,7 @@
//Actual value to check
testSequence.add(0, new Character('C'));
- assertEquals("C", testSequence.getValue(2));
+ assertEquals('C', testSequence.getValue(2));
}
@@ -379,7 +379,7 @@
//Actual value to test
testSequence.add(0, "testCharacter", new Character('A'));
- assertEquals("A", testSequence.getValue(0));
+ assertEquals('A', testSequence.getValue(0));
}
@@ -400,7 +400,7 @@
//Actual value to test
testSequence.add(0, openProp, new Character('A'));
- assertEquals("A", testSequence.getValue(0));
+ assertEquals('A', testSequence.getValue(0));
}
@@ -418,9 +418,9 @@
//Actual value to test from the sequence
testSequence.add(0, 0, new Character('C'));
- assertEquals("C", testSequence.getValue(0));
- assertEquals("A", testSequence.getValue(1));
- assertEquals("B", testSequence.getValue(2));
+ assertEquals('C', testSequence.getValue(0));
+ assertEquals('A', testSequence.getValue(1));
+ assertEquals('B', testSequence.getValue(2));
}
}
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=532887&r1=532886&r2=532887
==============================================================================
--- 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 Thu Apr 26 15:08:41 2007
@@ -452,9 +452,9 @@
//For the property index, it should be the
//order the types were defined in
- testSequence.add(1, new String("String1"));
- testSequence.add(1, new String("String2"));
- testSequence.add(1, new String("String1"));
+ testSequence.add(1, (Object)new String("String1"));
+ testSequence.add(1, (Object)new String("String2"));
+ testSequence.add(1, (Object)new String("String1"));
//Check the basic value
assertEquals( 3, testSequence.size() );
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org