# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1492525253 -3600
# Node ID e9c5cf559ecfde8f4c1caaeba7d0486028ed6472
# Parent  03edc9db9f8c6e58a004c11ec96421117c09787d# Parent  07fcccd5e1a68c1e38430794f411bda28e8ff4d2
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r 03edc9db9f8c -r e9c5cf559ecf test_create/interface-specs.xml
--- a/test_create/interface-specs.xml	Sat Apr 15 12:20:51 2017 +0100
+++ b/test_create/interface-specs.xml	Tue Apr 18 15:20:53 2017 +0100
@@ -500,7 +500,7 @@
             </test>
             <test name="AB" interface="AB">
                 <descriptions>
-                    <description lang="en">Each page has only two audio fragments. The user must select one of the two fragments to proceed. There can be one hidden reference.</description>
+                    <description lang="en">A page contains a number of audio fragments. The user must select one of the fragments to proceed. There can be a hidden reference.</description>
                 </descriptions>
                 <checks>
                     <entry name="fragmentPlayed" support="none" />
@@ -520,7 +520,7 @@
             </test>
             <test name="ABX" interface="ABX">
                 <descriptions>
-                    <description lang="en">Each page has two audio fragments presented as A and B. The test duplicates one of the fragments and presents it as X. The user must choose which, out of A or B, is closest to X.</description>
+                    <description lang="en">Each page has a number of audio fragments presented as A and B (and C, ...). The test duplicates one of the fragments and presents it as X. The user must choose which, out of A or B (or C, ...), is closest to X.</description>
                 </descriptions>
             </test>
             <test name="timeline" interface="timeline">
diff -r 03edc9db9f8c -r e9c5cf559ecf tests/pool.xml
--- a/tests/pool.xml	Sat Apr 15 12:20:51 2017 +0100
+++ b/tests/pool.xml	Tue Apr 18 15:20:53 2017 +0100
@@ -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" poolSize="3">
+        <setup interface="discrete" projectReturn="save.php" crossFade="0.1" poolSize="3">
             <metric>
                 <metricenable>testTimer</metricenable>
                 <metricenable>elementTimer</metricenable>