diff --git a/plugins/NewTest.java b/plugins/NewTest.java index 78c2238..1125275 100644 --- a/plugins/NewTest.java +++ b/plugins/NewTest.java @@ -60,10 +60,10 @@ public class NewTest extends javax.swing.JPanel { public static Path TEMPLATES_DEVICECONFIG_FILEPATH = Paths.get(TESTS_ROOT_DIR, "templates","deviceTemplate.config"); public static String TESTS_CONFIG_FILENAME = ".config"; 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_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 VALUE_SEPARATOR = "|"; + public static String VALUE_SEPARATOR = "&"; public static String PARAM_SEPARATOR = ";"; /** diff --git a/plugins/TestingList.java b/plugins/TestingList.java index 8fabcef..3f56c2c 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -292,7 +292,7 @@ public class TestingList extends Panel { public final Path TESTS_LOG_DEFAULT_DIR = Paths.get(".", "home", "script", "tests", "log", "TestsLog" + getnow() + ".txt"); public static String TESTS_CONFIG_FILENAME = ".config"; public static String TESTS_HELP_FILENAME = "help.html"; - public static String VALUE_SEPARATOR = "|"; + public static String VALUE_SEPARATOR = "&"; public static String PARAM_SEPARATOR = ";"; diff --git a/plugins/TestingListDetails.java b/plugins/TestingListDetails.java index d7c3ecc..bec66cf 100644 --- a/plugins/TestingListDetails.java +++ b/plugins/TestingListDetails.java @@ -55,7 +55,7 @@ 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 VALUE_SEPARATOR = "&"; public static String PARAM_SEPARATOR = ";"; /** * This method is called from within the constructor to initialize the form. diff --git a/script/tests/tests.properties b/script/tests/tests.properties index 0d11962..173c67f 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Fri Oct 13 10:45:13 CEST 2017 +#Fri Oct 13 10:53:10 CEST 2017 customPanel= showEnabledTestsOnly= listFilter=rps-try diff --git a/script/tests/tests/sad/jtr/.config b/script/tests/tests/sad/jtr/.config index ae26e2f..45d6cdc 100644 --- a/script/tests/tests/sad/jtr/.config +++ b/script/tests/tests/sad/jtr/.config @@ -1,4 +1,4 @@ #Fri Oct 13 10:14:47 CEST 2017 name=jtr -parameters=a\|IQCOM,$GNT3,1,DIA\:23\|dfdf; +parameters=a&IQCOM,$GNT3,1,DIA\:23&dfdf; description=vv