make tests more robust

Author: Remi-Gau

tests/test_getDesignInput.m

@@ -13,10 +13,10 @@ function test_setSpeedTargets_MT()
 
     [nbRepetitions, nbEventsPerBlock, maxNbPerBlock, nbBlocks] = getDesignInput(cfg);
 
-    assertEqual(nbRepetitions, 12);
+    assertEqual(nbRepetitions, cfg.design.nbRepetitions);
     assertEqual(nbEventsPerBlock, cfg.design.nbEventsPerBlock);
     assertEqual(maxNbPerBlock, 2);
-    assertEqual(nbBlocks, 24);
+    assertEqual(nbBlocks, length(cfg.design.names) * nbRepetitions);
 
 end
 
@@ -27,9 +27,9 @@ function test_setSpeedTargets_MST()
 
     [nbRepetitions, nbEventsPerBlock, maxNbPerBlock, nbBlocks] = getDesignInput(cfg);
 
-    assertEqual(nbRepetitions, 24);
+    assertEqual(nbRepetitions, cfg.design.nbRepetitions);
     assertEqual(nbEventsPerBlock, cfg.design.nbEventsPerBlock);
     assertEqual(maxNbPerBlock, 2);
-    assertEqual(nbBlocks, 48);
+    assertEqual(nbBlocks, length(cfg.design.names) * nbRepetitions);
 
 end

tests/test_setBlocksConditions.m

@@ -13,9 +13,12 @@ function test_getDirectionBaseVectors_MT()
 
     [conditionNamesVector, idxCondition1, idxCondition2] = setBlocksConditions(cfg);
 
-    assertEqual(conditionNamesVector, repmat({'static'; 'motion'}, 12, 1));
-    assertEqual(idxCondition1, [1:2:23]');
-    assertEqual(idxCondition2, [2:2:24]');
+    conditions = {'static'; 'motion'};
+    nbRepeats = cfg.design.nbRepetitions;
+
+    assertEqual(conditionNamesVector, repmat(conditions, nbRepeats, 1));
+    assertEqual(idxCondition1, (1:2:numel(conditions)*nbRepeats)');
+    assertEqual(idxCondition2, (2:2:numel(conditions)*nbRepeats)');
 
 end
 
@@ -26,8 +29,11 @@ function test_getDirectionBaseVectors_MST()
 
     [conditionNamesVector, idxCondition1, idxCondition2] = setBlocksConditions(cfg);
 
-    assertEqual(conditionNamesVector, repmat({'static'; 'motion'}, 24, 1));
-    assertEqual(idxCondition1, [1:2:47]');
-    assertEqual(idxCondition2, [2:2:48]');
+    conditions = {'static'; 'motion'};
+    nbRepeats = cfg.design.nbRepetitions;
+
+    assertEqual(conditionNamesVector, repmat(conditions, nbRepeats, 1));
+    assertEqual(idxCondition1, (1:2:numel(conditions)*nbRepeats)');
+    assertEqual(idxCondition2, (2:2:numel(conditions)*nbRepeats)');
 
 end

tests/test_setDirections.m

@@ -13,13 +13,14 @@ function test_setDirections_MT()
 
     directions = setDirections(cfg);
 
-    assertEqual(size(directions), [24, cfg.design.nbEventsPerBlock]);
+    assertEqual(size(directions), [cfg.design.nbRepetitions * 2, cfg.design.nbEventsPerBlock]);
 
     % only left right and static
     assertEqual(unique(directions), [-1; 0; 180]);
 
     % static every second block
-    assertEqual(directions(1:2:end, :), ones(12, cfg.design.nbEventsPerBlock) * -1);
+    assertEqual(directions(1:2:end, :), ones(cfg.design.nbRepetitions, ...
+      cfg.design.nbEventsPerBlock) * -1);
 
 end
 
@@ -30,7 +31,7 @@ function test_setDirections_MST()
 
     directions = setDirections(cfg);
 
-    assertEqual(size(directions), [48, cfg.design.nbEventsPerBlock]);
+    assertEqual(size(directions), [cfg.design.nbRepetitions * 2, cfg.design.nbEventsPerBlock]);
 
     % only left right and static
     assertEqual(unique(directions), [-666; -1; 666]);