Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/.castor.cdr =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/.castor.cdr (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/.castor.cdr (working copy) @@ -1,4 +1,4 @@ -#Thu Jan 04 22:21:22 CST 2007 +#Sat Jan 13 17:51:42 CST 2007 org.exolab.castor.tests.framework.testDescriptor.FailureType=org.exolab.castor.tests.framework.testDescriptor.descriptors.FailureTypeDescriptor org.exolab.castor.tests.framework.testDescriptor.Unmarshal=org.exolab.castor.tests.framework.testDescriptor.descriptors.UnmarshalDescriptor org.exolab.castor.tests.framework.testDescriptor.CustomTestType=org.exolab.castor.tests.framework.testDescriptor.descriptors.CustomTestTypeDescriptor @@ -16,8 +16,8 @@ org.exolab.castor.tests.framework.testDescriptor.TestDescriptorChoice=org.exolab.castor.tests.framework.testDescriptor.descriptors.TestDescriptorChoiceDescriptor org.exolab.castor.tests.framework.testDescriptor.OnlySourceGenerationTest=org.exolab.castor.tests.framework.testDescriptor.descriptors.OnlySourceGenerationTestDescriptor org.exolab.castor.tests.framework.testDescriptor.SourceGeneratorTest=org.exolab.castor.tests.framework.testDescriptor.descriptors.SourceGeneratorTestDescriptor +org.exolab.castor.tests.framework.testDescriptor.CustomTest=org.exolab.castor.tests.framework.testDescriptor.descriptors.CustomTestDescriptor org.exolab.castor.tests.framework.testDescriptor.Marshal=org.exolab.castor.tests.framework.testDescriptor.descriptors.MarshalDescriptor -org.exolab.castor.tests.framework.testDescriptor.CustomTest=org.exolab.castor.tests.framework.testDescriptor.descriptors.CustomTestDescriptor org.exolab.castor.tests.framework.testDescriptor.BugFix=org.exolab.castor.tests.framework.testDescriptor.descriptors.BugFixDescriptor org.exolab.castor.tests.framework.testDescriptor.ConfigurationType=org.exolab.castor.tests.framework.testDescriptor.descriptors.ConfigurationTypeDescriptor org.exolab.castor.tests.framework.testDescriptor.Listener=org.exolab.castor.tests.framework.testDescriptor.descriptors.ListenerDescriptor Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/BugFixDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/BugFixDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/BugFixDescriptor.java (working copy) @@ -104,9 +104,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _date_Report @@ -142,7 +143,8 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.DateTimeValidator typeValidator = new org.exolab.castor.xml.validators.DateTimeValidator(); + org.exolab.castor.xml.validators.DateTimeValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.DateTimeValidator(); fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); @@ -179,7 +181,8 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.DateTimeValidator typeValidator = new org.exolab.castor.xml.validators.DateTimeValidator(); + org.exolab.castor.xml.validators.DateTimeValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.DateTimeValidator(); fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); @@ -225,9 +228,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); } Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/CallMethodDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/CallMethodDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/CallMethodDescriptor.java (working copy) @@ -99,9 +99,10 @@ //-- validation code for: _name fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- initialize element descriptors Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/CustomTestTypeDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/CustomTestTypeDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/CustomTestTypeDescriptor.java (working copy) @@ -104,9 +104,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _methods Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/FailureTypeDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/FailureTypeDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/FailureTypeDescriptor.java (working copy) @@ -98,7 +98,8 @@ //-- validation code for: _content fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.BooleanValidator typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); + org.exolab.castor.xml.validators.BooleanValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); @@ -135,9 +136,10 @@ //-- validation code for: _exception fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _failureStep Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/ListenerTypeDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/ListenerTypeDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/ListenerTypeDescriptor.java (working copy) @@ -104,9 +104,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _className @@ -143,9 +144,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _type Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/OnlySourceGenerationTestDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/OnlySourceGenerationTestDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/OnlySourceGenerationTestDescriptor.java (working copy) @@ -112,9 +112,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _property_File @@ -149,9 +150,10 @@ //-- validation code for: _property_File fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _collection @@ -221,9 +223,10 @@ //-- validation code for: _bindingFile fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _package @@ -258,9 +261,10 @@ //-- validation code for: _package fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _unitTestCaseList Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/RootTypeDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/RootTypeDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/RootTypeDescriptor.java (working copy) @@ -94,9 +94,10 @@ //-- validation code for: _content fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- initialize attribute descriptors @@ -137,7 +138,8 @@ //-- validation code for: _random fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.BooleanValidator typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); + org.exolab.castor.xml.validators.BooleanValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); @@ -177,7 +179,8 @@ //-- validation code for: _dump fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.BooleanValidator typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); + org.exolab.castor.xml.validators.BooleanValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/SchemaDifferencesTypeDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/SchemaDifferencesTypeDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/SchemaDifferencesTypeDescriptor.java (working copy) @@ -93,7 +93,8 @@ //-- validation code for: _content fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.DecimalValidator typeValidator = new org.exolab.castor.xml.validators.DecimalValidator(); + org.exolab.castor.xml.validators.DecimalValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.DecimalValidator(); fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/SourceGeneratorTestDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/SourceGeneratorTestDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/SourceGeneratorTestDescriptor.java (working copy) @@ -112,9 +112,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _property_File @@ -149,9 +150,10 @@ //-- validation code for: _property_File fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _collection @@ -221,9 +223,10 @@ //-- validation code for: _bindingFile fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _package @@ -258,9 +261,10 @@ //-- validation code for: _package fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _root_Object Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/StringTypeDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/StringTypeDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/StringTypeDescriptor.java (working copy) @@ -93,9 +93,10 @@ //-- validation code for: _content fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- initialize attribute descriptors Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/TestDescriptorDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/TestDescriptorDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/TestDescriptorDescriptor.java (working copy) @@ -104,9 +104,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _author @@ -143,9 +144,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _commentList @@ -190,9 +192,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(1); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); - typeValidator.setWhiteSpace("preserve"); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); fieldValidator.setValidator(typeValidator); + typeValidator.setWhiteSpace("preserve"); } desc.setValidator(fieldValidator); //-- _category @@ -302,8 +305,11 @@ //-- validation code for: _minimumJavaVersion fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.FloatValidator typeValidator = new org.exolab.castor.xml.validators.FloatValidator(); + org.exolab.castor.xml.validators.FloatValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.FloatValidator(); fieldValidator.setValidator(typeValidator); + typeValidator.setMinInclusive((float) -3.4028235E38); + typeValidator.setMaxInclusive((float) 3.4028235E38); } desc.setValidator(fieldValidator); //-- _testDescriptorChoice Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/UnitTestCaseChoiceDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/UnitTestCaseChoiceDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/UnitTestCaseChoiceDescriptor.java (working copy) @@ -101,9 +101,10 @@ //-- validation code for: _mapping_File fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _schema @@ -138,9 +139,10 @@ //-- validation code for: _schema fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); } Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/UnitTestCaseDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/UnitTestCaseDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/UnitTestCaseDescriptor.java (working copy) @@ -102,9 +102,10 @@ //-- validation code for: _name fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _unitTestCaseChoice @@ -240,9 +241,10 @@ //-- validation code for: _input fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _goldFile @@ -277,9 +279,10 @@ //-- validation code for: _goldFile fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _objectBuilder @@ -314,9 +317,10 @@ //-- validation code for: _objectBuilder fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); - typeValidator.setWhiteSpace("preserve"); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); fieldValidator.setValidator(typeValidator); + typeValidator.setWhiteSpace("preserve"); } desc.setValidator(fieldValidator); //-- _failure @@ -389,7 +393,8 @@ //-- validation code for: _skip fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.BooleanValidator typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); + org.exolab.castor.xml.validators.BooleanValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.BooleanValidator(); fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); @@ -510,9 +515,10 @@ fieldValidator = new org.exolab.castor.xml.FieldValidator(); fieldValidator.setMinOccurs(0); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- _javaSourceVersion @@ -552,8 +558,11 @@ //-- validation code for: _javaSourceVersion fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.FloatValidator typeValidator = new org.exolab.castor.xml.validators.FloatValidator(); + org.exolab.castor.xml.validators.FloatValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.FloatValidator(); fieldValidator.setValidator(typeValidator); + typeValidator.setMinInclusive((float) -3.4028235E38); + typeValidator.setMaxInclusive((float) 3.4028235E38); } desc.setValidator(fieldValidator); } Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/ValueDescriptor.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/ValueDescriptor.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/descriptors/ValueDescriptor.java (working copy) @@ -93,9 +93,10 @@ //-- validation code for: _content fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- initialize attribute descriptors @@ -131,9 +132,10 @@ //-- validation code for: _type fieldValidator = new org.exolab.castor.xml.FieldValidator(); { //-- local scope - org.exolab.castor.xml.validators.StringValidator typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + org.exolab.castor.xml.validators.StringValidator typeValidator; + typeValidator = new org.exolab.castor.xml.validators.StringValidator(); + fieldValidator.setValidator(typeValidator); typeValidator.setWhiteSpace("preserve"); - fieldValidator.setValidator(typeValidator); } desc.setValidator(fieldValidator); //-- initialize element descriptors Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/types/.castor.cdr =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/types/.castor.cdr (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/types/.castor.cdr (working copy) @@ -1,7 +1,7 @@ -#Thu Jan 04 22:21:22 CST 2007 +#Sat Jan 13 17:51:42 CST 2007 org.exolab.castor.tests.framework.testDescriptor.types.FailureType=org.exolab.castor.tests.framework.testDescriptor.types.FailureTypeDescriptor +org.exolab.castor.tests.framework.testDescriptor.types.CategoryType=org.exolab.castor.tests.framework.testDescriptor.types.descriptors.CategoryTypeDescriptor org.exolab.castor.tests.framework.testDescriptor.types.FailureStep=org.exolab.castor.tests.framework.testDescriptor.types.FailureStepDescriptor -org.exolab.castor.tests.framework.testDescriptor.types.CategoryType=org.exolab.castor.tests.framework.testDescriptor.types.descriptors.CategoryTypeDescriptor org.exolab.castor.tests.framework.testDescriptor.types.CollectionType=org.exolab.castor.tests.framework.testDescriptor.types.descriptors.CollectionTypeDescriptor +org.exolab.castor.tests.framework.testDescriptor.types.TypeType=org.exolab.castor.tests.framework.testDescriptor.types.descriptors.TypeTypeDescriptor org.exolab.castor.tests.framework.testDescriptor.types.FailureStepType=org.exolab.castor.tests.framework.testDescriptor.types.descriptors.FailureStepTypeDescriptor -org.exolab.castor.tests.framework.testDescriptor.types.TypeType=org.exolab.castor.tests.framework.testDescriptor.types.descriptors.TypeTypeDescriptor Index: /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/types/FailureStepType.java =================================================================== --- /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/types/FailureStepType.java (revision 6731) +++ /home/ekuns/workspace/castor-4/src/tests/main/org/exolab/castor/tests/framework/testDescriptor/types/FailureStepType.java (working copy) @@ -46,19 +46,9 @@ public static final FailureStepType WRITE_SCHEMA = new FailureStepType(WRITE_SCHEMA_TYPE, "write-schema"); /** - * The compare-schema type - */ - public static final int COMPARE_SCHEMA_TYPE = 2; - - /** - * The instance of the compare-schema type - */ - public static final FailureStepType COMPARE_SCHEMA = new FailureStepType(COMPARE_SCHEMA_TYPE, "compare-schema"); - - /** * The source-generation type */ - public static final int SOURCE_GENERATION_TYPE = 3; + public static final int SOURCE_GENERATION_TYPE = 2; /** * The instance of the source-generation type @@ -68,7 +58,7 @@ /** * The source-compilation type */ - public static final int SOURCE_COMPILATION_TYPE = 4; + public static final int SOURCE_COMPILATION_TYPE = 3; /** * The instance of the source-compilation type @@ -78,7 +68,7 @@ /** * The load-generated-classes type */ - public static final int LOAD_GENERATED_CLASSES_TYPE = 5; + public static final int LOAD_GENERATED_CLASSES_TYPE = 4; /** * The instance of the load-generated-classes type @@ -88,7 +78,7 @@ /** * The unmarshal-reference type */ - public static final int UNMARSHAL_REFERENCE_TYPE = 6; + public static final int UNMARSHAL_REFERENCE_TYPE = 5; /** * The instance of the unmarshal-reference type @@ -98,7 +88,7 @@ /** * The marshal-to-disk type */ - public static final int MARSHAL_TO_DISK_TYPE = 7; + public static final int MARSHAL_TO_DISK_TYPE = 6; /** * The instance of the marshal-to-disk type @@ -108,7 +98,7 @@ /** * The compare-to-reference type */ - public static final int COMPARE_TO_REFERENCE_TYPE = 8; + public static final int COMPARE_TO_REFERENCE_TYPE = 7; /** * The instance of the compare-to-reference type @@ -118,7 +108,7 @@ /** * The second-compare type */ - public static final int SECOND_COMPARE_TYPE = 9; + public static final int SECOND_COMPARE_TYPE = 8; /** * The instance of the second-compare type @@ -128,7 +118,7 @@ /** * The listener-comparison type */ - public static final int LISTENER_COMPARISON_TYPE = 10; + public static final int LISTENER_COMPARISON_TYPE = 9; /** * The instance of the listener-comparison type @@ -138,7 +128,7 @@ /** * The second-unmarshal type */ - public static final int SECOND_UNMARSHAL_TYPE = 11; + public static final int SECOND_UNMARSHAL_TYPE = 10; /** * The instance of the second-unmarshal type @@ -148,7 +138,7 @@ /** * The custom-test type */ - public static final int CUSTOM_TEST_TYPE = 12; + public static final int CUSTOM_TEST_TYPE = 11; /** * The instance of the custom-test type @@ -218,7 +208,6 @@ Hashtable members = new Hashtable(); members.put("parse-schema", PARSE_SCHEMA); members.put("write-schema", WRITE_SCHEMA); - members.put("compare-schema", COMPARE_SCHEMA); members.put("source-generation", SOURCE_GENERATION); members.put("source-compilation", SOURCE_COMPILATION); members.put("load-generated-classes", LOAD_GENERATED_CLASSES);