diff --git a/script/tests/devices/bx84/.config b/script/tests/devices/bx84/.config index b99fbcf..b944ec3 100644 --- a/script/tests/devices/bx84/.config +++ b/script/tests/devices/bx84/.config @@ -2,4 +2,4 @@ name=bx84 tests=sad description=simulation device in playground -parameters=delay\:.2\:delay between 2 steps;bla\:234\:bla bla;setVal\:11\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask; +parameters=delay|.2|delay between 2 steps;bla|234|bla bla;setVal|11|value to set;expectedVal|18.1|expected returned value;mask|2|bit mask; diff --git a/script/tests/devices/bx84_2/.config b/script/tests/devices/bx84_2/.config index ab59f6d..576c342 100644 --- a/script/tests/devices/bx84_2/.config +++ b/script/tests/devices/bx84_2/.config @@ -2,4 +2,4 @@ name=bx84_2 tests=sad description=simulation device in playground -parameters=delay\:.2\:delay between 2 steps;bla\:234\:bla bla;setVal\:21\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask; +parameters=delay|.2|delay between 2 steps;bla|234|bla bla;setVal|21|value to set;expectedVal|18.1|expected returned value;mask|2|bit mask; diff --git a/script/tests/tests.properties b/script/tests/tests.properties index f7bbd60..3941810 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Fri Oct 13 09:54:22 CEST 2017 +#Fri Oct 13 10:01:59 CEST 2017 customPanel= showEnabledTestsOnly= listFilter=rps-try diff --git a/script/tests/tests/Collimator Tests pro/Monitor Movement/.config b/script/tests/tests/Collimator Tests pro/Monitor Movement/.config index aeb83a0..9e2588e 100644 --- a/script/tests/tests/Collimator Tests pro/Monitor Movement/.config +++ b/script/tests/tests/Collimator Tests pro/Monitor Movement/.config @@ -1,4 +1,4 @@ #Fri Jun 09 14:14:06 CEST 2017 name=Monitor Movement description=Monitor the movements during the specified time interval. No commands are sent. -parameters=monitorTime\:20\:How long the monitoring is performed [s];samplingDelay\:0.1\:Delay between each sample is taken [s]; +parameters=monitorTime|20|How long the monitoring is performed [s];samplingDelay|0.1|Delay between each sample is taken [s]; diff --git a/script/tests/tests/Collimator Tests pro/monitorAllParams/.config b/script/tests/tests/Collimator Tests pro/monitorAllParams/.config index 9a7b936..96fe64c 100644 --- a/script/tests/tests/Collimator Tests pro/monitorAllParams/.config +++ b/script/tests/tests/Collimator Tests pro/monitorAllParams/.config @@ -1,4 +1,4 @@ #Fri Sep 11 13:31:33 CEST 2015 name=monitorAllParams -parameters=monitorTime\:0.1\:This is the parameter n.1 with unit [unit];samplingDelay\:30\:This is the parameter n.2 with unit [unit]; +parameters=monitorTime|0.1|This is the parameter n.1 with unit [unit];samplingDelay|30|This is the parameter n.2 with unit [unit]; description=d diff --git a/script/tests/tests/Linear Slide Tests/Check Linearity/.config b/script/tests/tests/Linear Slide Tests/Check Linearity/.config index 51e58de..6ff579f 100644 --- a/script/tests/tests/Linear Slide Tests/Check Linearity/.config +++ b/script/tests/tests/Linear Slide Tests/Check Linearity/.config @@ -1,4 +1,4 @@ #Fri Sep 04 11:43:56 CEST 2015 name=Check Linearity description=Go to absolute position A, then move +B steps, then -2B steps, then +2Bsteps (ie oscillate round centre position, logging after each movement); repeat N times -parameters=repeatTimes\:2\:Repeat N times;midPoint\:41.0\:Middle point A;spanFromMidPoint\:10.0\:B steps around middle point A;delayS\:0\:Delay between each oscillation [s]; +parameters=repeatTimes|2|Repeat N times;midPoint|41.0|Middle point A;spanFromMidPoint|10.0|B steps around middle point A;delayS|0|Delay between each oscillation [s]; diff --git a/script/tests/tests/PS Tests/newTest/.config b/script/tests/tests/PS Tests/newTest/.config index 10f482c..85aed22 100644 --- a/script/tests/tests/PS Tests/newTest/.config +++ b/script/tests/tests/PS Tests/newTest/.config @@ -1,4 +1,4 @@ #Wed Jan 13 15:10:04 CET 2016 name=newTest -parameters=examplePar1\:2\:This is the parameter n.1 with unit [unit];examplePar2\:4.5\:This is the parameter n.2 with unit [unit]; +parameters=examplePar1|2|This is the parameter n.1 with unit [unit];examplePar2|4.5|This is the parameter n.2 with unit [unit]; description=try new template diff --git a/script/tests/tests/PS Tests/playground-pw84/.config b/script/tests/tests/PS Tests/playground-pw84/.config index a650db1..422f726 100644 --- a/script/tests/tests/PS Tests/playground-pw84/.config +++ b/script/tests/tests/PS Tests/playground-pw84/.config @@ -1,4 +1,4 @@ #Mon Oct 26 15:46:18 CET 2015 name=playground-pw84 -parameters=examplePar1\:2\:This is the parameter n.1 with unit [unit];examplePar2\:4.5\:This is the parameter n.2 with unit [unit]; +parameters=examplePar1|2|This is the parameter n.1 with unit [unit];examplePar2|4.5|This is the parameter n.2 with unit [unit]; description=on dir playground, iocsh pw84.db diff --git a/script/tests/tests/PS Tests/test without ioc 2/.config b/script/tests/tests/PS Tests/test without ioc 2/.config index 41bda32..53309e4 100644 --- a/script/tests/tests/PS Tests/test without ioc 2/.config +++ b/script/tests/tests/PS Tests/test without ioc 2/.config @@ -1,4 +1,4 @@ #Mon Sep 07 10:48:01 CEST 2015 name=test without ioc 2 description=test that does not use any connection to IOC. It is useful to test pure pshell graphical features. -parameters=repeatTimes\:3\:how many times the test is repeated;howManySamples\:300\:How many samples are plotted;delayBetweenSampleS\:0.05\:delay [s] between two samples; +parameters=repeatTimes|3|how many times the test is repeated;howManySamples|300|How many samples are plotted;delayBetweenSampleS|0.05|delay [s] between two samples; diff --git a/script/tests/tests/PS Tests/test without ioc 3/.config b/script/tests/tests/PS Tests/test without ioc 3/.config index bbcff15..03d8fe4 100644 --- a/script/tests/tests/PS Tests/test without ioc 3/.config +++ b/script/tests/tests/PS Tests/test without ioc 3/.config @@ -1,4 +1,4 @@ #Mon Sep 07 10:48:01 CEST 2015 name=test without ioc 3 description=test that does not use any connection to IOC. It is useful to test pure pshell graphical features. -parameters=repeatTimes\:3\:how many times the test is repeated;howManySamples\:300\:How many samples are plotted;delayBetweenSampleS\:0.05\:delay [s] between two samples; +parameters=repeatTimes|3|how many times the test is repeated;howManySamples|300|How many samples are plotted;delayBetweenSampleS|0.05|delay [s] between two samples; diff --git a/script/tests/tests/PS Tests/test without ioc/.config b/script/tests/tests/PS Tests/test without ioc/.config index 4ab9730..368be24 100644 --- a/script/tests/tests/PS Tests/test without ioc/.config +++ b/script/tests/tests/PS Tests/test without ioc/.config @@ -1,4 +1,4 @@ #Wed Sep 16 16:17:06 CEST 2015 name=test without ioc description=test that does not use any connection to IOC. It is useful to test pure pshell graphical features. -parameters=repeatTimes\:3\:how many times the test is repeated;howManySamples\:50\:How many samples are plotted;delayBetweenSampleS\:0.05\:delay [s] between two samples; +parameters=repeatTimes|3|how many times the test is repeated;howManySamples|50|How many samples are plotted;delayBetweenSampleS|0.05|delay [s] between two samples; diff --git a/script/tests/tests/sad/jtr/.config b/script/tests/tests/sad/jtr/.config index 390aa6a..a043e41 100644 --- a/script/tests/tests/sad/jtr/.config +++ b/script/tests/tests/sad/jtr/.config @@ -1,4 +1,4 @@ #Fri Oct 13 09:44:28 CEST 2017 name=jtr -parameters=a|2,IQCOM,$GNT3,1,DIA\:23|bla; +parameters=a|2,IQCOM,$GNT3,1,DIA|23|bla; description=bla diff --git a/script/tests/tests/sad/ltr/.config b/script/tests/tests/sad/ltr/.config index cc1f4ac..38a2e5b 100644 --- a/script/tests/tests/sad/ltr/.config +++ b/script/tests/tests/sad/ltr/.config @@ -1,4 +1,4 @@ #Thu Oct 12 16:38:23 CEST 2017 name=ltr -parameters=dv&2,IQCOM,$GNT3,1,DIA\:23&fdv; +parameters=dv&2,IQCOM,$GNT3,1,DIA|23&fdv; description=d v diff --git a/script/tests/tests/sad/rightleft/.config b/script/tests/tests/sad/rightleft/.config index 7a9ab27..1bca8d0 100644 --- a/script/tests/tests/sad/rightleft/.config +++ b/script/tests/tests/sad/rightleft/.config @@ -1,4 +1,4 @@ #Tue Aug 29 14:40:54 CEST 2017 name=rightleft -parameters=delay\:.2\:delay between 2 steps;centre\:2\:centre where to move around;moveAround\:10\:move right and left from centre;steps\:1\:steps of each move;maxErr\:5\:maximum allowed error; +parameters=delay|.2|delay between 2 steps;centre|2|centre where to move around;moveAround|10|move right and left from centre;steps|1|steps of each move;maxErr|5|maximum allowed error; description=move around a value and plot the result diff --git a/script/tests/tests/sad/rpstry/.config b/script/tests/tests/sad/rpstry/.config index cdad9ce..5e07cb6 100644 --- a/script/tests/tests/sad/rpstry/.config +++ b/script/tests/tests/sad/rpstry/.config @@ -1,4 +1,4 @@ #Tue Oct 03 13:56:33 CEST 2017 name=rpstry -parameters=delay\:.2\:delay between 2 steps;bla\:234\:bla bla;setVal\:13\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask; +parameters=delay|.2|delay between 2 steps;bla|234|bla bla;setVal|13|value to set;expectedVal|18.1|expected returned value;mask|2|bit mask; description=try to use pshell for rps test diff --git a/script/tests/tests/sad/sdd/.config b/script/tests/tests/sad/sdd/.config index 98c1513..7f9a242 100644 --- a/script/tests/tests/sad/sdd/.config +++ b/script/tests/tests/sad/sdd/.config @@ -1,4 +1,4 @@ #Tue Jan 12 09:17:43 CET 2016 name=sdd -parameters=examplePar1\:2\:This is the parameter n.1 with unit [unit];examplePar2\:4.5\:This is the parameter n.2 with unit [unit]; +parameters=examplePar1|2|This is the parameter n.1 with unit [unit];examplePar2|4.5|This is the parameter n.2 with unit [unit]; description=ad