diff --git a/plugins/TestingListDetails.java b/plugins/TestingListDetails.java
index 68f0a05..d7c3ecc 100644
--- a/plugins/TestingListDetails.java
+++ b/plugins/TestingListDetails.java
@@ -55,7 +55,8 @@ public class TestingListDetails extends javax.swing.JPanel {
public static String TESTS_CONFIG_FILENAME = ".config";
public static Path TESTS_TESTS_DEFAULT_DIR = Paths.get(".", "home", "script", "tests", "tests");
public static Path TESTS_DEVICES_DEFAULT_DIR = Paths.get(".", "home", "script", "tests", "devices");
-
+ public static String VALUE_SEPARATOR = "|";
+ public static String PARAM_SEPARATOR = ";";
/**
* This method is called from within the constructor to initialize the form.
* WARNING: Do NOT modify this code. The content of this method is always
@@ -424,9 +425,9 @@ public class TestingListDetails extends javax.swing.JPanel {
HashMap mParameters = new HashMap(); // contains name and attributes
HashMap mParameterAttributes = new HashMap(); //contians value and description
String[] dsParameterAttributes = null;
- String[] dsParameters = parametersString.split(";");
+ String[] dsParameters = parametersString.split(PARAM_SEPARATOR);
for (String sParameter : dsParameters) {
- dsParameterAttributes = sParameter.split(":");
+ dsParameterAttributes = sParameter.split(VALUE_SEPARATOR);
if (dsParameterAttributes.length > 2) {
mParameterAttributes = new HashMap();
mParameterAttributes.put("value", (Object) dsParameterAttributes[1]);
@@ -474,7 +475,7 @@ public class TestingListDetails 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 + ":" + value + ":" + description + ";" ;
+ sTestParameters = sTestParameters + name + VALUE_SEPARATOR + value + VALUE_SEPARATOR + description + PARAM_SEPARATOR ;
}
}
FileInputStream in = new FileInputStream(path.toFile());
diff --git a/script/tests/tests.properties b/script/tests/tests.properties
index 13fc4b1..ec77cdb 100644
--- a/script/tests/tests.properties
+++ b/script/tests/tests.properties
@@ -1,5 +1,5 @@
#TestingList for pshell: configuration properties
-#Fri Oct 13 09:43:13 CEST 2017
+#Fri Oct 13 09:48:32 CEST 2017
customPanel=
showEnabledTestsOnly=
listFilter=rps-try
diff --git a/script/tests/tests/sad/jtr/.config b/script/tests/tests/sad/jtr/.config
index f1762c6..390aa6a 100644
--- a/script/tests/tests/sad/jtr/.config
+++ b/script/tests/tests/sad/jtr/.config
@@ -1,4 +1,4 @@
-#Thu Oct 12 16:38:34 CEST 2017
+#Fri Oct 13 09:44:28 CEST 2017
name=jtr
-parameters=dv&2,IQCOM,$GNT3,1,DIA\:23&fdv;
-description=d v
+parameters=a|2,IQCOM,$GNT3,1,DIA\:23|bla;
+description=bla
diff --git a/script/tests/tests/sad/jtr/help.html b/script/tests/tests/sad/jtr/help.html
index 1c5f314..2006bdd 100644
--- a/script/tests/tests/sad/jtr/help.html
+++ b/script/tests/tests/sad/jtr/help.html
@@ -2,10 +2,10 @@
Description
-d v
+bla
Parameters
Contact
diff --git a/script/tests/tests/sad/jtr/jtr.py b/script/tests/tests/sad/jtr/jtr.py
index cffc643..84ac6c1 100644
--- a/script/tests/tests/sad/jtr/jtr.py
+++ b/script/tests/tests/sad/jtr/jtr.py
@@ -1,5 +1,5 @@
# Test name: jtr
-# d v
+# bla
# 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.
- dv = float(test.getParam('dv')) ;
+ a = float(test.getParam('a')) ;
except:
# test failed, write the report into the variables ret and success and send feedback:
ret = 'Could not retrieve testing parameters - ' + traceback.format_exc()