Index: MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-many-entries.xml
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-many-entries.xml	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-many-entries.xml	(Revision 0)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xcap-directory xmlns="urn:oma:xml:xdm:xcap-directory"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="urn:oma:xml:xdm:xcap-directory test.xsd ">
+	<folder auid="resource-lists">
+		<entry uri="blah" etag="etag" size="100"></entry>
+		<entry uri="blah" etag="etag" size="100"></entry>
+	</folder>
+</xcap-directory>
\ Kein Zeilenvorschub am Ende der Datei
Index: MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-one-entry.xml
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-one-entry.xml	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-one-entry.xml	(Revision 0)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xcap-directory xmlns="urn:oma:xml:xdm:xcap-directory"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="urn:oma:xml:xdm:xcap-directory test.xsd ">
+	<folder auid="resource-lists">
+		<entry uri="blah" etag="etag" size="100"></entry>
+	</folder>
+</xcap-directory>
\ Kein Zeilenvorschub am Ende der Datei
Index: MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-error-code-and-entry.xml
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-error-code-and-entry.xml	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-error-code-and-entry.xml	(Revision 0)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xcap-directory xmlns="urn:oma:xml:xdm:xcap-directory"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="urn:oma:xml:xdm:xcap-directory test.xsd ">
+	<folder auid="resource-lists">
+		<entry uri="blah" etag="etag" size="100"></entry>
+		<error-code>error</error-code>
+	</folder>
+</xcap-directory>
\ Kein Zeilenvorschub am Ende der Datei
Index: MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-error-code.xml
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-error-code.xml	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-with-error-code.xml	(Revision 0)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xcap-directory xmlns="urn:oma:xml:xdm:xcap-directory"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="urn:oma:xml:xdm:xcap-directory test.xsd ">
+	<folder auid="resource-lists">
+		<error-code>error</error-code>
+	</folder>
+</xcap-directory>
\ Kein Zeilenvorschub am Ende der Datei
Index: MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-empty.xml
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-empty.xml	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/input-empty.xml	(Revision 0)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xcap-directory xmlns="urn:oma:xml:xdm:xcap-directory"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="urn:oma:xml:xdm:xcap-directory test.xsd ">
+	<folder auid="resource-lists" />
+</xcap-directory>
\ Kein Zeilenvorschub am Ende der Datei
Index: MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/test.xsd
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/test.xsd	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/test.xsd	(Revision 0)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema targetNamespace="urn:oma:xml:xdm:xcap-directory" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	
+	<xs:element name="xcap-directory">
+		<xs:complexType>
+			<xs:sequence minOccurs="0" maxOccurs="unbounded">
+				<xs:element name="folder">
+					<xs:complexType>
+						<xs:choice minOccurs="1">
+							<xs:sequence maxOccurs="unbounded">
+								<xs:element name="entry">
+									<xs:complexType>
+										<xs:attribute name="uri" type="xs:anyURI" use="required" />
+										<xs:attribute name="etag" type="xs:string" use="required" />
+										<xs:attribute name="size" type="xs:nonNegativeInteger" />
+										<xs:anyAttribute namespace="##any" processContents="lax" />
+									</xs:complexType>
+								</xs:element>
+							</xs:sequence>
+							<xs:element name="error-code" type="xs:string"/>
+						</xs:choice>
+						<xs:attribute name="auid" type="xs:string" use="required" />
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	
+</xs:schema>
\ Kein Zeilenvorschub am Ende der Datei
Index: MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/TestDescriptor.xml
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/TestDescriptor.xml	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithNoOptionalElements/TestDescriptor.xml	(Revision 0)
@@ -0,0 +1,39 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+    <Name>Test xs:choice where the choice contains at least one optional element definition</Name>
+    <Author>Werner Guttmann</Author>
+    <Comment>Regression test case for bug CASTOR-1902</Comment>
+    <Category>basic capability</Category>
+
+    <SourceGeneratorTest>
+        <Schema>test.xsd</Schema>
+        <Root_Object random="false" dump="true">XcapDirectory</Root_Object>
+        <UnitTestCase>
+            <Name>Test Generation</Name>
+            <Input>input-with-error-code.xml</Input>
+            <GoldFile/>
+        </UnitTestCase>
+        <UnitTestCase>
+            <Name>Test Generation</Name>
+            <Input>input-with-one-entry.xml</Input>
+            <GoldFile/>
+        </UnitTestCase>
+        <UnitTestCase>
+            <Name>Test Generation</Name>
+            <Input>input-with-many-entries.xml</Input>
+            <GoldFile/>
+        </UnitTestCase>
+        <UnitTestCase>
+            <Name>Test Generation</Name>
+            <Input>input-empty.xml</Input>
+            <GoldFile/>
+            <Failure FailureStep="unmarshal-reference">true</Failure>
+        </UnitTestCase>
+        <UnitTestCase>
+            <Name>Test Generation</Name>
+            <Input>input-with-error-code-and-entry.xml</Input>
+            <GoldFile/>
+            <Failure>true</Failure>
+        </UnitTestCase>
+    </SourceGeneratorTest>
+</TestDescriptor>
Index: MasterTestSuite/sourcegenerator/Choice/choiceWithOptionalElements/input-empty.xml
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithOptionalElements/input-empty.xml	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithOptionalElements/input-empty.xml	(Revision 0)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xcap-directory xmlns="urn:oma:xml:xdm:xcap-directory"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="urn:oma:xml:xdm:xcap-directory test.xsd ">
+	<folder auid="resource-lists" />
+</xcap-directory>
\ Kein Zeilenvorschub am Ende der Datei
Index: MasterTestSuite/sourcegenerator/Choice/choiceWithOptionalElements/test.xsd
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithOptionalElements/test.xsd	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithOptionalElements/test.xsd	(Revision 0)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema targetNamespace="urn:oma:xml:xdm:xcap-directory" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	
+	<xs:element name="xcap-directory">
+		<xs:complexType>
+			<xs:sequence minOccurs="0" maxOccurs="unbounded">
+				<xs:element name="folder">
+					<xs:complexType>
+						<xs:choice minOccurs="1">
+							<xs:sequence minOccurs="0" maxOccurs="unbounded">
+								<xs:element name="entry">
+									<xs:complexType>
+										<xs:attribute name="uri" type="xs:anyURI" use="required" />
+										<xs:attribute name="etag" type="xs:string" use="required" />
+										<xs:attribute name="last-modified" type="xs:dateTime" />
+										<xs:attribute name="size" type="xs:nonNegativeInteger" />
+										<xs:anyAttribute namespace="##any" processContents="lax" />
+									</xs:complexType>
+								</xs:element>
+							</xs:sequence>
+							<xs:element name="error-code" type="xs:string"/>
+						</xs:choice>
+						<xs:attribute name="auid" type="xs:string" use="required" />
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	
+</xs:schema>
\ Kein Zeilenvorschub am Ende der Datei
Index: MasterTestSuite/sourcegenerator/Choice/choiceWithOptionalElements/TestDescriptor.xml
===================================================================
--- MasterTestSuite/sourcegenerator/Choice/choiceWithOptionalElements/TestDescriptor.xml	(Revision 0)
+++ MasterTestSuite/sourcegenerator/Choice/choiceWithOptionalElements/TestDescriptor.xml	(Revision 0)
@@ -0,0 +1,17 @@
+<?xml version='1.0'?>
+<TestDescriptor>
+    <Name>Test xs:choice where the choice contains at least one optional element definition</Name>
+    <Author>Werner Guttmann</Author>
+    <Comment>Regression test case for bug CASTOR-1902</Comment>
+    <Category>basic capability</Category>
+
+    <SourceGeneratorTest>
+        <Schema>test.xsd</Schema>
+        <Root_Object random="false" dump="true">XcapDirectory</Root_Object>
+        <UnitTestCase>
+            <Name>Test Generation</Name>
+            <Input>input-empty.xml</Input>
+            <GoldFile/>
+        </UnitTestCase>
+    </SourceGeneratorTest>
+</TestDescriptor>