pshell_config/ncs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
boccioli_m
2017-10-13 09:54:14 +02:00
parent 1eafa0cfc9
commit 8a5356725f
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/TestingListDetails.java
View File

@@ -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());

2
script/tests/tests.properties
View File

@@ -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

6
script/tests/tests/sad/jtr/.config
View File

@@ -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

4
script/tests/tests/sad/jtr/help.html
View File

@@ -2,10 +2,10 @@
<!-- Copyright (c) 2015 Paul Scherrer Institute. All rights reserved. -->
<body>
<h2>Description</h2>
d v
bla
<h2>Parameters</h2>
<table>
<tr><td><code>dv </code></td><td>fdv</td></tr>
<tr><td><code>a </code></td><td>bla</td></tr>
</table>
<h2>Contact</h2>

4
script/tests/tests/sad/jtr/jtr.py
View File

@@ -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()