diff test-schema.xsd @ 1124:0f161e776cb4

--UNSTABLE-- Major revision. Updated Specification including verification. Added storage collector for XML results. Popup more stable.
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Wed, 06 Jan 2016 10:36:37 +0000
parents 23c3e630571b
children 3a9b869ba7f8
line wrap: on
line diff
--- a/test-schema.xsd	Tue Dec 29 13:54:56 2015 +0000
+++ b/test-schema.xsd	Wed Jan 06 10:36:37 2016 +0000
@@ -28,11 +28,11 @@
         <xs:element ref="interface" maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="interface" type="xs:string" use="required"/>
-      <xs:attribute name="project-return" use="required" type="xs:string"/>
-      <xs:attribute name="randomise-order" type="xs:boolean" default="false"/>
-      <xs:attribute name="test-pages" type="xs:nonNegativeInteger" default="0"/>
+      <xs:attribute name="projectReturn" use="required" type="xs:string"/>
+      <xs:attribute name="randomiseOrder" type="xs:boolean" default="false"/>
+      <xs:attribute name="testPages" type="xs:nonNegativeInteger" default="0"/>
       <xs:attribute name="loudness" type="xs:nonPositiveInteger" use="optional"/>
-      <xs:attribute name="sample-rate" type="xs:positiveInteger" use="optional"/>
+      <xs:attribute name="sampleRate" type="xs:positiveInteger" use="optional"/>
     </xs:complexType>
   </xs:element>
 
@@ -47,11 +47,11 @@
         <xs:element ref="survey" maxOccurs="2"/>
       </xs:sequence>
       <xs:attribute ref="id" use="required"/>
-      <xs:attribute name="host-URL" type="xs:anyURI" use="required"/>
-      <xs:attribute name="randomise-order" type="xs:boolean" default="false"/>
-      <xs:attribute name="repeat-count" type="xs:nonNegativeInteger" default="0"/>
+      <xs:attribute name="hostURL" type="xs:anyURI" use="required"/>
+      <xs:attribute name="randomiseOrder" type="xs:boolean" default="false"/>
+      <xs:attribute name="repeatCount" type="xs:nonNegativeInteger" default="0"/>
       <xs:attribute name="loop" type="xs:boolean" default="false"/>
-      <xs:attribute name="show-element-comments" type="xs:boolean" default="false"/>
+      <xs:attribute name="showElementComments" type="xs:boolean" default="false"/>
       <xs:attribute name="loudness" type="xs:nonPositiveInteger" use="optional"/>
     </xs:complexType>
   </xs:element>
@@ -115,7 +115,7 @@
     <xs:complexType>
       <xs:attribute ref="id" use="required"/>
       <xs:attribute name="url" type="xs:anyURI" use="required"/>
-      <xs:attribute name="gain" type="xs:decimal"/>
+      <xs:attribute name="gain" type="xs:decimal" default="0"/>
       <xs:attribute name="type">
         <xs:simpleType>
           <xs:restriction base="xs:string">
@@ -184,8 +184,8 @@
             </xs:sequence>
             <xs:attribute ref="id"/>
             <xs:attribute ref="mandatory"/>
-            <xs:attribute name="min"/>
-            <xs:attribute name="max"/>
+            <xs:attribute name="min" type="xs:decimal"/>
+            <xs:attribute name="max" type="xs:decimal"/>
             <xs:attribute name="type" use="required">
               <xs:simpleType>
                 <xs:restriction base="xs:string">