changeset 2654:a75c78c40110

Updated examples to match interfaces.json
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Mon, 13 Feb 2017 12:20:15 +0000
parents 0fafb872a1a3
children 33c76ab5924a a86d9e9d1b54 68bc1003770a
files tests/examples/horizontal_example.xml tests/examples/radio_example.xml tests/examples/timeline.xml
diffstat 3 files changed, 36 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/tests/examples/horizontal_example.xml	Mon Feb 13 12:05:58 2017 +0000
+++ b/tests/examples/horizontal_example.xml	Mon Feb 13 12:20:15 2017 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
     <waet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test-schema.xsd">
-        <setup interface="ABC" projectReturn="save.php">
+        <setup interface="horizontal" projectReturn="save.php">
             <metric>
                 <metricenable>testTimer</metricenable>
                 <metricenable>elementTimer</metricenable>
--- a/tests/examples/radio_example.xml	Mon Feb 13 12:05:58 2017 +0000
+++ b/tests/examples/radio_example.xml	Mon Feb 13 12:20:15 2017 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
     <waet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test-schema.xsd">
-        <setup interface="likert" projectReturn="save.php" crossFade="3.0">
+        <setup interface="discrete" projectReturn="save.php" crossFade="3.0">
             <metric>
                 <metricenable>testTimer</metricenable>
                 <metricenable>elementTimer</metricenable>
--- a/tests/examples/timeline.xml	Mon Feb 13 12:05:58 2017 +0000
+++ b/tests/examples/timeline.xml	Mon Feb 13 12:20:15 2017 +0000
@@ -32,21 +32,23 @@
             </interface>
             <audioelement url="0.wav" id="track-1" />
             <audioelement url="1.wav" id="track-2" />
-            <commentquestion id="preference" type="radio">
-                <statement>Please enter your overall preference</statement>
-                <option name="worst">Very Bad</option>
-                <option name="bad"></option>
-                <option name="OK">OK</option>
-                <option name="Good"></option>
-                <option name="Great">Great</option>
-            </commentquestion>
-            <commentquestion id="character" type="checkbox">
-                <statement>Please describe the overall character</statement>
-                <option name="funky">Funky</option>
-                <option name="mellow">Mellow</option>
-                <option name="laidback">Laid back</option>
-                <option name="heavy">Heavy</option>
-            </commentquestion>
+            <commentquestions>
+                <commentradio id="preference">
+                    <statement>Please enter your overall preference</statement>
+                    <option name="worst">Very Bad</option>
+                    <option name="bad"></option>
+                    <option name="OK">OK</option>
+                    <option name="Good"></option>
+                    <option name="Great">Great</option>
+                </commentradio>
+                <commentcheckbox id="character">
+                    <statement>Please describe the overall character</statement>
+                    <option name="funky">Funky</option>
+                    <option name="mellow">Mellow</option>
+                    <option name="laidback">Laid back</option>
+                    <option name="heavy">Heavy</option>
+                </commentcheckbox>
+            </commentquestions>
         </page>
         <page id='test-1' hostURL="media/example/" randomiseOrder='true' repeatCount='4' loop='true' loudness="-23">
             <title>My Test</title>
@@ -61,20 +63,22 @@
             </interface>
             <audioelement url="0.wav" id="track-3" />
             <audioelement url="1.wav" id="track-4" />
-            <commentquestion id="preference1" type="radio">
-                <statement>Please enter your overall preference</statement>
-                <option name="worst">Very Bad</option>
-                <option name="bad"></option>
-                <option name="OK">OK</option>
-                <option name="Good"></option>
-                <option name="Great">Great</option>
-            </commentquestion>
-            <commentquestion id="character1" type="checkbox">
-                <statement>Please describe the overall character</statement>
-                <option name="funky">Funky</option>
-                <option name="mellow">Mellow</option>
-                <option name="laidback">Laid back</option>
-                <option name="heavy">Heavy</option>
-            </commentquestion>
+            <commentquestions>
+                <commentradio id="preference1">
+                    <statement>Please enter your overall preference</statement>
+                    <option name="worst">Very Bad</option>
+                    <option name="bad"></option>
+                    <option name="OK">OK</option>
+                    <option name="Good"></option>
+                    <option name="Great">Great</option>
+                </commentradio>
+                <commentcheckbox id="character1">
+                    <statement>Please describe the overall character</statement>
+                    <option name="funky">Funky</option>
+                    <option name="mellow">Mellow</option>
+                    <option name="laidback">Laid back</option>
+                    <option name="heavy">Heavy</option>
+                </commentcheckbox>
+            </commentquestions>
         </page>
     </waet>