diff --git a/plugins/NewTest.java b/plugins/NewTest.java index 46c99f3..bbfb48f 100644 --- a/plugins/NewTest.java +++ b/plugins/NewTest.java @@ -62,7 +62,7 @@ public class NewTest extends javax.swing.JPanel { public static String TESTS_HELP_FILENAME = "help.html"; public static String ALLOWED_CHARSET1 = "[a-z A-Z 0-9 . _ \\- \\[\\] () : , < > = \\$]*"; //les restricted set of chars public static String ALLOWED_CHARSET2 = "[a-z A-Z 0-9 . _ \\- \\[\\] () : , \\$]*"; //more restricted set of chars - public static String ALLOWED_CHARSET3 = "[a-zA-Z0-9._\\-\\$,:]*"; //even more restricted set of chars + public static String ALLOWED_CHARSET3 = "[a-zA-Z0-9._ \\- \\$ , :]*"; //even more restricted set of chars /** * enumeration of table column indexes @@ -425,7 +425,7 @@ public class NewTest extends javax.swing.JPanel { String[] dsParameterAttributes = null; String[] dsParameters = parametersString.split(";"); for (String sParameter : dsParameters) { - dsParameterAttributes = sParameter.split(":"); + dsParameterAttributes = sParameter.split("&"); if (dsParameterAttributes.length > 2) { mParameterAttributes = new HashMap(); mParameterAttributes.put("value", (Object) dsParameterAttributes[1]); diff --git a/script/tests/tests/sad/jtr/.config b/script/tests/tests/sad/jtr/.config index d9605d8..c5b6a6a 100644 --- a/script/tests/tests/sad/jtr/.config +++ b/script/tests/tests/sad/jtr/.config @@ -1,4 +1,4 @@ -#Thu Oct 12 16:24:43 CEST 2017 +#Thu Oct 12 16:26:22 CEST 2017 name=jtr -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=eed +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 diff --git a/script/tests/tests/sad/jtr/help.html b/script/tests/tests/sad/jtr/help.html index 3ec858e..5ae5f67 100644 --- a/script/tests/tests/sad/jtr/help.html +++ b/script/tests/tests/sad/jtr/help.html @@ -2,7 +2,7 @@

Description

-eed +r3

Parameters

diff --git a/script/tests/tests/sad/jtr/jtr.py b/script/tests/tests/sad/jtr/jtr.py index a9eed91..a0a59f4 100644 --- a/script/tests/tests/sad/jtr/jtr.py +++ b/script/tests/tests/sad/jtr/jtr.py @@ -1,5 +1,5 @@ # Test name: jtr -# eed +# r3 # Copyright (c) 2015 Paul Scherrer Institute. All rights reserved. ###### Init - DO NOT MODIFY THE CODE BELOW ######
examplePar1 This is the parameter n.1 with unit [unit]