[Jibx-cvs] core/build/test/org/jibx/schema/codegen CodegenData.java, 1.9, 1.10 CodeGenerationTest.java, 1.20, 1.21

[Dennis S. <dso...@us...>]

Update of /cvsroot/jibx/core/build/test/org/jibx/schema/codegen
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4864/test/org/jibx/schema/codegen

Modified Files:
	CodegenData.java CodeGenerationTest.java 
Log Message:
Add test case for xs:all handling.

Index: CodeGenerationTest.java
===================================================================
RCS file: /cvsroot/jibx/core/build/test/org/jibx/schema/codegen/CodeGenerationTest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** CodeGenerationTest.java	5 Jun 2009 09:49:56 -0000	1.20
--- CodeGenerationTest.java	30 Sep 2009 12:10:07 -0000	1.21
***************
*** 153,158 ****
              "  </mapping>\n" +
              "  <mapping abstract='true' type-name='ins:simple3' class='anything.Simple3'>\n" +
!             "    <structure map-as='ins:simple1' get-method='getSimple1' set-method='setSimple1' name='simple1'/>\n" +
!             "    <structure type='anything.Mixed' get-method='getMixed' set-method='setMixed'/>\n" +
              "    <value style='attribute' name='rated' get-method='getRated' set-method='setRated' usage='optional'/>\n" +
              "    <structure map-as='ins:enum1Group-AttributeGroup' get-method='getEnum1Group' set-method='setEnum1Group'/>\n" +
--- 153,160 ----
              "  </mapping>\n" +
              "  <mapping abstract='true' type-name='ins:simple3' class='anything.Simple3'>\n" +
!             "    <structure ordered='false'>\n" +
!             "      <structure map-as='ins:simple1' get-method='getSimple1' set-method='setSimple1' name='simple1'/>\n" +
!             "      <structure type='anything.Mixed' get-method='getMixed' set-method='setMixed'/>\n" +
!             "    </structure>\n" +
              "    <value style='attribute' name='rated' get-method='getRated' set-method='setRated' usage='optional'/>\n" +
              "    <structure map-as='ins:enum1Group-AttributeGroup' get-method='getEnum1Group' set-method='setEnum1Group'/>\n" +
***************
*** 239,244 ****
              "  </mapping>\n" +
              "  <mapping abstract='true' type-name='ins:simple3' class='anything.Simple3'>\n" +
!             "    <structure map-as='ins:simple1' get-method='getSimple1' set-method='setSimple1' name='simple1'/>\n" +
!             "    <value style='element' name='mixed' get-method='getMixed' set-method='setMixed'/>\n" +
              "    <value style='attribute' name='rated' get-method='getRated' set-method='setRated' usage='optional'/>\n" +
              "    <value style='attribute' name='enum1' get-method='getEnum1' set-method='setEnum1' format='ins:enum1'/>\n" +
--- 241,248 ----
              "  </mapping>\n" +
              "  <mapping abstract='true' type-name='ins:simple3' class='anything.Simple3'>\n" +
!             "    <structure ordered='false'>\n" +
!             "      <structure map-as='ins:simple1' get-method='getSimple1' set-method='setSimple1' name='simple1'/>\n" +
!             "      <value style='element' name='mixed' get-method='getMixed' set-method='setMixed'/>\n" +
!             "    </structure>\n" +
              "    <value style='attribute' name='rated' get-method='getRated' set-method='setRated' usage='optional'/>\n" +
              "    <value style='attribute' name='enum1' get-method='getEnum1' set-method='setEnum1' format='ins:enum1'/>\n" +
***************
*** 322,327 ****
              "  </mapping>\n" +
              "  <mapping abstract='true' type-name='ins:simple3' class='anything.Simple3'>\n" +
!             "    <structure map-as='ins:simple1' get-method='getSimple1' set-method='setSimple1' name='simple1'/>\n" +
!             "    <value style='element' name='mixed' get-method='getMixed' set-method='setMixed'/>\n" +
              "    <value style='attribute' name='rated' get-method='getRated' set-method='setRated' usage='optional'/>\n" +
              "    <structure map-as='ins:enum1Group-AttributeGroup' get-method='getEnum1Group' set-method='setEnum1Group'/>\n" +
--- 326,333 ----
              "  </mapping>\n" +
              "  <mapping abstract='true' type-name='ins:simple3' class='anything.Simple3'>\n" +
!             "    <structure ordered='false'>\n" +
!             "      <structure map-as='ins:simple1' get-method='getSimple1' set-method='setSimple1' name='simple1'/>\n" +
!             "      <value style='element' name='mixed' get-method='getMixed' set-method='setMixed'/>\n" +
!             "    </structure>\n" +
              "    <value style='attribute' name='rated' get-method='getRated' set-method='setRated' usage='optional'/>\n" +
              "    <structure map-as='ins:enum1Group-AttributeGroup' get-method='getEnum1Group' set-method='setEnum1Group'/>\n" +

Index: CodegenData.java
===================================================================
RCS file: /cvsroot/jibx/core/build/test/org/jibx/schema/codegen/CodegenData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CodegenData.java	30 Mar 2009 11:21:10 -0000	1.9
--- CodegenData.java	30 Sep 2009 12:10:07 -0000	1.10
***************
*** 344,351 ****
          "  <element name='mixed' type='tns:mixedUnion'/>\n" +
          "  <complexType name='simple3'>\n" +
!         "    <sequence>\n" +
          "      <element ref='tns:simple1'/>\n" +
          "      <element ref='tns:mixed'/>\n" +
!         "    </sequence>\n" +
          "    <attribute name='rated' type='tns:rating'/>\n" +
          "    <attributeGroup ref='tns:enum1Group'/>\n" +
--- 344,351 ----
          "  <element name='mixed' type='tns:mixedUnion'/>\n" +
          "  <complexType name='simple3'>\n" +
!         "    <all>\n" +
          "      <element ref='tns:simple1'/>\n" +
          "      <element ref='tns:mixed'/>\n" +
!         "    </all>\n" +
          "    <attribute name='rated' type='tns:rating'/>\n" +
          "    <attributeGroup ref='tns:enum1Group'/>\n" +
***************
*** 432,439 ****
          "  <element name='mixed' type='xs:string'/>" +
          "  <complexType name='simple3'>\n" +
!         "    <sequence>\n" +
          "      <element ref='tns:simple1'/>\n" +
          "      <element ref='tns:mixed'/>\n" +
!         "    </sequence>\n" +
          "    <attribute name='rated' type='xs:float'/>\n" +
          "    <attributeGroup ref='tns:enum1Group'/>\n" +
--- 432,439 ----
          "  <element name='mixed' type='xs:string'/>" +
          "  <complexType name='simple3'>\n" +
!         "    <all>\n" +
          "      <element ref='tns:simple1'/>\n" +
          "      <element ref='tns:mixed'/>\n" +
!         "    </all>\n" +
          "    <attribute name='rated' type='xs:float'/>\n" +
          "    <attributeGroup ref='tns:enum1Group'/>\n" +