Update the test definition schema for fuzzy cases

diff --git a/xsd/release-notes b/xsd/release-notes
index 2ef60c2..b103b2a 100644 (file)
--- a/xsd/release-notes
+++ b/xsd/release-notes
@@ -68,3 +68,15 @@ related example and Xlst is also updated for above.
 
 -- version 1.0.2-1 --
 1\ add a new int optional attribute "onload_delay" with default "3"
+
+-- version 1.0.2-2 --
+1\ Add a new sub element "capabilities" under the element "testcase"
+2\ Add a new boolean attribute "check_unsupport_error" in the element "testcase"
+
+-- version 1.0.2-3 --
+1\ Move the sub element "capabilities" from the element "testcase" to the element "set"
+
+
+-- version 1.0.2-4 --
+1\ Add a unique limitation for suite name
+2\ Add a new optional attribute "launcher" in set 

diff --git a/xsd/test_definition.xsd b/xsd/test_definition.xsd
index 15b583c..a52b8a2 100644 (file)
--- a/xsd/test_definition.xsd
+++ b/xsd/test_definition.xsd
@@ -22,13 +22,21 @@
        <xs:element name="set">
 
                <xs:complexType>
-
-                       <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                               <xs:element ref="testcase" minOccurs="0" maxOccurs="unbounded"></xs:element>
+                       <xs:sequence>
+                               <xs:element name="capabilities" type="CapabilitiesType"
+                                       minOccurs="0" maxOccurs="1">
+                               </xs:element>
+                               <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                                       <xs:element ref="testcase" minOccurs="0"
+                                               maxOccurs="unbounded">
+                                       </xs:element>
+                               </xs:sequence>
                        </xs:sequence>
 
 
+
                        <xs:attributeGroup ref="set_attribute_group"></xs:attributeGroup>
+                       <xs:attribute name="launcher" type="xs:string"></xs:attribute>
                </xs:complexType>
                <xs:unique name="uniqueCaseName">
                        <xs:selector xpath=".//testcase" />
@@ -37,12 +45,8 @@
        </xs:element>
 
        <xs:element name="testcase">
-
                <xs:complexType>
-
                        <xs:sequence minOccurs="1">
-
-
                                <xs:element ref="description"></xs:element>
                                <xs:element name="categories" type="categories"
                                        minOccurs="0" maxOccurs="1">
@@ -54,7 +58,8 @@
                                        maxOccurs="unbounded">
                                </xs:element>
                                <xs:element name="specs" type="specsType" minOccurs="0"
-                                       maxOccurs="1"></xs:element>
+                                       maxOccurs="1">
+                               </xs:element>
                                <xs:element name="result_info" type="result_info_type"
                                        minOccurs="0">
                                </xs:element>
@@ -299,6 +304,10 @@
                                </xs:element>
                        </xs:sequence>
                </xs:complexType>
+               <xs:unique name="uniqueSuiteName">
+                       <xs:selector xpath=".//suite" />
+                       <xs:field xpath="@name" />
+               </xs:unique>
        </xs:element>
 
 
@@ -316,6 +325,7 @@
                <xs:attribute name="resolution" type="xs:string"></xs:attribute>
                <xs:attribute name="host" type="xs:string"></xs:attribute>
                <xs:attribute name="cts_version" type="xs:string"></xs:attribute>
+               <xs:attribute name="build_id" type="xs:string"></xs:attribute>
        </xs:complexType>
 
 
@@ -354,5 +364,19 @@
                <xs:attribute name="usage" type="xs:boolean" default="false"></xs:attribute>
                <xs:attribute name="element_type" type="xs:string"></xs:attribute>
        </xs:complexType>
+
+       <xs:complexType name="CapabilitiesType">
+               <xs:sequence>
+                       <xs:element name="capability" type="CapabilityType"
+                               minOccurs="1" maxOccurs="unbounded"></xs:element>
+               </xs:sequence>
+       </xs:complexType>
+
+       <xs:complexType name="CapabilityType">
+               <xs:sequence minOccurs="0">
+                       <xs:element name="value" type="xs:string"></xs:element>
+               </xs:sequence>
+               <xs:attribute name="name" type="xs:string" use="required"></xs:attribute>
+       </xs:complexType>
 </xs:schema>