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/23 17:41:39 UTC
svn commit: r531507 - in
/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests:
CTSGeneralSuite.java xsd/XSDChoiceTest.java
Author: frankb
Date: Mon Apr 23 08:41:38 2007
New Revision: 531507
URL: http://svn.apache.org/viewvc?view=rev&rev=531507
Log:
Fix for TUSCANY-1222
Modified:
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/xsd/XSDChoiceTest.java
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=531507&r1=531506&r2=531507
==============================================================================
--- 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 23 08:41:38 2007
@@ -26,6 +26,7 @@
import test.sdo21.tests.api.DataObjectTest;
import test.sdo21.tests.conversion.DateConversionTest;
import test.sdo21.tests.general.XSDHelperTest;
+import test.sdo21.tests.xsd.XSDChoiceTest;
import test.sdo21.tests.api.DynamicTypesFromSchemaTestCase;
/**
@@ -42,7 +43,7 @@
*/
@RunWith(Suite.class)
@Suite.SuiteClasses( {DateConversionTest.class, XSDHelperTest.class, DataObjectTest.class,
- DynamicTypesFromSchemaTestCase.class})
+ DynamicTypesFromSchemaTestCase.class, XSDChoiceTest.class})
public class CTSGeneralSuite {
}
Modified: incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDChoiceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDChoiceTest.java?view=diff&rev=531507&r1=531506&r2=531507
==============================================================================
--- incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDChoiceTest.java (original)
+++ incubator/tuscany/java/cts/sdo2.1/src/main/java/test/sdo21/tests/xsd/XSDChoiceTest.java Mon Apr 23 08:41:38 2007
@@ -81,7 +81,9 @@
assertEquals( "choiceType", choiceType.getName() );
assertFalse( choiceType.isDataType() );
assertFalse( choiceType.isOpen() );
- assertFalse( choiceType.isSequenced() );
+
+ // this type should have sequenced=true because the choice is unbounded
+ assertTrue( choiceType.isSequenced() );
List propList = choiceType.getProperties();
assertEquals( 3, propList.size() );
@@ -122,7 +124,7 @@
assertEquals( 3, propList.size() );
// assert SDO Properties were created with correct type ...
- assertPropertyExists( choiceType, "red", "String", true, false );
+ assertPropertyExists( choiceType, "red", "String", false, false );
assertFalse( choiceType.getProperty("red").isReadOnly() );
assertPropertyExists( choiceType, "green", "DataObject", true, false );
@@ -151,7 +153,9 @@
assertEquals( "choiceType", choiceType.getName() );
assertFalse( choiceType.isDataType() );
assertFalse( choiceType.isOpen() );
- assertFalse( choiceType.isSequenced() );
+
+ // the choice has maxOccurs > 1 so this type should be sequenced
+ assertTrue( choiceType.isSequenced() );
List propList = choiceType.getProperties();
assertEquals( 3, propList.size() );
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org