diff --git a/plugins/NewTest.java b/plugins/NewTest.java index ad3c647..d5cb1c5 100644 --- a/plugins/NewTest.java +++ b/plugins/NewTest.java @@ -853,7 +853,7 @@ public class NewTest extends javax.swing.JPanel { value = (String) attributes.get("value"); description = (String) attributes.get("description"); //build the python code for getting the test parameter - sTestParameters = sTestParameters + "" + name + " " + description + "
\n" ; + sTestParameters = sTestParameters + "" + name + " " + description + "\n" ; } } Attributes user = null; diff --git a/script/tests/templates/helpTemplate.html b/script/tests/templates/helpTemplate.html index 4e0fb91..8aeab66 100644 --- a/script/tests/templates/helpTemplate.html +++ b/script/tests/templates/helpTemplate.html @@ -4,7 +4,9 @@

Description

$testDescription

Parameters

+ $testParameters +

Contact

$contactFirstName $contactSurname
$contactTelephone diff --git a/script/tests/templates/testTemplate.py b/script/tests/templates/testTemplate.py index 0031187..ef05db7 100644 --- a/script/tests/templates/testTemplate.py +++ b/script/tests/templates/testTemplate.py @@ -69,7 +69,7 @@ def startTest(testName, DEVICE, params): test.log("Example - Device name: " + test.getDeviceName() ) try: test.log("Running test with the following parameters:") - test.log(params) + test.printParams() # If present, use the parameters here below for your test script. # These parameters were automatically generated: you might need to change the casting. #$testParameters diff --git a/script/tests/tests.properties b/script/tests/tests.properties index 5ea801a..fc048b4 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Tue Aug 29 11:40:15 CEST 2017 +#Tue Aug 29 13:20:25 CEST 2017 customPanel= showEnabledTestsOnly=true listFilter=test-bx84 diff --git a/script/tests/tests/PS Tests/test without ioc/test without ioc.py b/script/tests/tests/PS Tests/test without ioc/test without ioc.py index d74f831..f1835df 100644 --- a/script/tests/tests/PS Tests/test without ioc/test without ioc.py +++ b/script/tests/tests/PS Tests/test without ioc/test without ioc.py @@ -61,7 +61,7 @@ def startTest(testName, DEVICE, params): test.log("Example - Device name: "+DEVICE) try: test.log("Running test Initialise with the following parameters:") - test.log(params ) + test.printParams () #If present, use the parameters here below for your test script repeatTimes = int(test.getParam('repeatTimes')) ; howManySamples = int(test.getParam('howManySamples')) ; delayBetweenSampleS = float(test.getParam('delayBetweenSampleS')) ; except: diff --git a/script/tests/tests/sad/rightleft/.config b/script/tests/tests/sad/rightleft/.config index 9ff18c4..0576f2d 100644 --- a/script/tests/tests/sad/rightleft/.config +++ b/script/tests/tests/sad/rightleft/.config @@ -1,4 +1,4 @@ #Mon Aug 28 14:48:34 CEST 2017 name=rightleft -parameters=delay\:.1\: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; description=move around a value and plot the result +parameters=delay\:.1\: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; \ No newline at end of file diff --git a/script/tests/tests/sad/rightleft/help.html b/script/tests/tests/sad/rightleft/help.html index 32398e3..1a7d5ec 100644 --- a/script/tests/tests/sad/rightleft/help.html +++ b/script/tests/tests/sad/rightleft/help.html @@ -4,10 +4,14 @@

Description

move around a value and plot the result

Parameters

-delay delay between 2 steps
-centre centre where to move around
-moveAround move right and left from centre
-steps steps of each move
+ + + + + + +
delay delay between 2 steps
centre centre where to move around
moveAround move right and left from centre
steps steps of each move
maxErr maximum allowed error between the value when moving one direction and the corresponding value when moving to opposite direction
+

Contact

Marco Boccioli
diff --git a/script/tests/tests/sad/rightleft/rightleft.py b/script/tests/tests/sad/rightleft/rightleft.py index e7cff7c..8f469b1 100644 --- a/script/tests/tests/sad/rightleft/rightleft.py +++ b/script/tests/tests/sad/rightleft/rightleft.py @@ -68,6 +68,7 @@ def startTest(testName, DEVICE, params): # test.log("Example - Test name: " + test.getName()) # test.log("Example - Device name: " + test.getDeviceName() ) try: + test.log("-------------------------------------------") test.log("Running test with the following parameters:") test.printParams() # If present, use the parameters here below for your test script.