Revert schema to base branch

cqframework · May 20, 2024 · 500929a · 500929a
1 parent daa7280
commit 500929a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 39 deletions.
diff --git a/tests/cql/CqlOverloadMatching.xml b/tests/cql/CqlOverloadMatching.xml
diff --git a/tests/testSchema.xsd b/tests/testSchema.xsd
@@ -67,18 +67,11 @@
 	</xs:complexType>
 	<xs:complexType name="Test">
 		<xs:sequence>
-			<xs:choice>
-				<xs:element name="expression" type="Expression">
-					<xs:annotation>
-						<xs:documentation>The expression to be tested.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-				<xs:element name="library" type="Library" minOccurs="0" maxOccurs="unbounded">
-					<xs:annotation>
-						<xs:documentation>For CQL, this is an inline CQL Library. In the future, references to filesysem libraries may be supported.</xs:documentation>
-					</xs:annotation>
-				</xs:element>
-			</xs:choice>
+			<xs:element name="expression" type="Expression">
+				<xs:annotation>
+					<xs:documentation>The expression to be tested.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="output" type="Output" minOccurs="0" maxOccurs="unbounded">
 				<xs:annotation>
 					<xs:documentation>The expected output of the test.</xs:documentation>
@@ -150,11 +143,6 @@
 	<xs:complexType name="Output">
 		<xs:simpleContent>
 			<xs:extension base="xs:string">
-				<xs:attribute name="name" type="xs:string" use="optional">
-					<xs:annotation>
-						<xs:documentation>The name of the output. For CQL, this must correspond to the name of the expression definition this output corresponds to.</xs:documentation>
-					</xs:annotation>
-				</xs:attribute>
 				<xs:attribute name="type" type="OutputType" use="optional">
 					<xs:annotation>
 						<xs:documentation>The type of the expected output. If no type is provided, the value is expected to be an expression in the language under test and will be set equal to the test expression and the expected evaluation result will be true. In the special case that the output is a null, a null predicate test will be used.</xs:documentation>
@@ -163,11 +151,6 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-	<xs:complexType name="Library">
-		<xs:simpleContent>
-			<xs:extension base="xs:string"/>
-		</xs:simpleContent>
-	</xs:complexType>
 	<xs:simpleType name="OutputType">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="boolean"/>
@@ -215,4 +198,4 @@
 			</xs:enumeration>
 		</xs:restriction>
 	</xs:simpleType>
-</xs:schema>
+</xs:schema>