From f66a30142d8d1309487f70be387f1ab9d13b5cfd Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Thu, 12 Oct 2017 16:37:19 +0200 Subject: [PATCH] Closedown --- plugins/NewTest.java | 2 +- script/tests/tests.properties | 4 ++-- script/tests/tests/sad/jtr/.config | 6 +++--- script/tests/tests/sad/jtr/help.html | 5 ++--- script/tests/tests/sad/jtr/jtr.py | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/plugins/NewTest.java b/plugins/NewTest.java index bbfb48f..910fd6e 100644 --- a/plugins/NewTest.java +++ b/plugins/NewTest.java @@ -857,7 +857,7 @@ public class NewTest extends javax.swing.JPanel { if(param instanceof String){ name = (String) param; HashMap attributes = (HashMap) hmTestParams.get(param); - value = (String) attributes.get("value"); + value = attributes.get("value").toString().replace("\\:",":"); description = (String) attributes.get("description"); //build the python code for getting the test parameter sTestParameters = sTestParameters + name + "&" + value + "&" + description + ";" ; diff --git a/script/tests/tests.properties b/script/tests/tests.properties index 15c1454..f102c51 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Thu Oct 12 16:31:00 CEST 2017 +#Thu Oct 12 16:33:28 CEST 2017 customPanel= -showEnabledTestsOnly=true +showEnabledTestsOnly= listFilter=rps-try diff --git a/script/tests/tests/sad/jtr/.config b/script/tests/tests/sad/jtr/.config index c5b6a6a..f54e454 100644 --- a/script/tests/tests/sad/jtr/.config +++ b/script/tests/tests/sad/jtr/.config @@ -1,4 +1,4 @@ -#Thu Oct 12 16:26:22 CEST 2017 +#Thu Oct 12 16:32:00 CEST 2017 name=jtr -parameters=examplePar1&2,IQCOM,$GNT3,1,DIA\:22&This is the parameter n.1 with unit [unit];examplePar2&4.5&This is the parameter n.2 with unit [unit]; -description=r3 +parameters=ds&2,IQCOM,$GNT3,1,DIA\:23&bla; +description=dede diff --git a/script/tests/tests/sad/jtr/help.html b/script/tests/tests/sad/jtr/help.html index 5ae5f67..ea8c54f 100644 --- a/script/tests/tests/sad/jtr/help.html +++ b/script/tests/tests/sad/jtr/help.html @@ -2,11 +2,10 @@

Description

-r3 +dede

Parameters

- - +
examplePar1 This is the parameter n.1 with unit [unit]
examplePar2 This is the parameter n.2 with unit [unit]
ds bla

Contact

diff --git a/script/tests/tests/sad/jtr/jtr.py b/script/tests/tests/sad/jtr/jtr.py index a0a59f4..8dea6e6 100644 --- a/script/tests/tests/sad/jtr/jtr.py +++ b/script/tests/tests/sad/jtr/jtr.py @@ -1,5 +1,5 @@ # Test name: jtr -# r3 +# dede # Copyright (c) 2015 Paul Scherrer Institute. All rights reserved. ###### Init - DO NOT MODIFY THE CODE BELOW ###### @@ -72,7 +72,7 @@ def startTest(testName, DEVICE, 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. - examplePar1 = float(test.getParam('examplePar1')) ; examplePar2 = float(test.getParam('examplePar2')) ; + ds = float(test.getParam('ds')) ; except: # test failed, write the report into the variables ret and success and send feedback: ret = 'Could not retrieve testing parameters - ' + traceback.format_exc()