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-08-31 16:11:06 +02:00
parent e36659115e
commit 76ada89dfc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/TestingList.java
View File

@@ -1594,7 +1594,7 @@ public class TestingList extends Panel {
String sLastResult = jTable1.getValueAt(row, COL.RESULT.ordinal()).toString();
String sResultTime = jTable1.getValueAt(row, COL.TIME.ordinal()).toString();
String sTestHelp = String.valueOf(jTable1.getValueAt(row, COL.TESTHELP.ordinal()));
HashMap mParameters = getTestParameters(sTestPath);
HashMap mParameters = getParameters(sTestPath, sDevicePath);
//create map for passing details to Details Panel
HashMap details = new HashMap();
details.put("deviceName", sDeviceName);
@@ -1949,13 +1949,14 @@ public class TestingList extends Panel {
*/
private HashMap buildMapFromTableRow(int row) {
String sDeviceName = jTable1.getValueAt(row, COL.DEVICENAME.ordinal()).toString();
String sDevicePath = jTable1.getValueAt(row, COL.DEVICEPATH.ordinal()).toString().replace("\\", File.separator);
String sTestName = jTable1.getValueAt(row, COL.TESTNAME.ordinal()).toString();
String sTestCaseName = jTable1.getValueAt(row, COL.TESTSUITE.ordinal()).toString();
String sTestPath = jTable1.getValueAt(row, COL.TESTPATH.ordinal()).toString().replace("\\", File.separator);
// HashMap mParameters = buildParametersMap(String.valueOf(jTable1.getValueAt(row, COL.TESTPARAMS.ordinal())));
//get the parameters directly frm he config file
// System.out.println("sTestPath: " + sTestPath);
HashMap mParameters = getTestParameters(sTestPath);
HashMap mParameters = getParameters(sTestPath, sDevicePath);
HashMap testArgs = new HashMap();
//args.put("ret", "");
testArgs.put(testArgNames.PARAMETERS.toString(), mParameters);
@@ -2236,7 +2237,7 @@ public class TestingList extends Panel {
DefaultTableModel model = (DefaultTableModel) jTable1.getModel();
//String testPath = FilenameUtils.separatorsToSystem(TESTS_TESTS_DEFAULT_DIR + testSuite + "/" + testName + "/" + testName + ".py");
String testPath = Paths.get(TESTS_TESTS_DEFAULT_DIR.toString(), testSuite, testName, testName + ".py").toString();
String devicePath = Paths.get(TESTS_DEVICES_DEFAULT_DIR.toString(), deviceName + deviceName + ".config").toString();
String devicePath = Paths.get(TESTS_DEVICES_DEFAULT_DIR.toString(), deviceName, deviceName + ".config").toString();
System.out.println("Path = " + testPath);
Object rowData[] = new Object[]{false, "", sDate, deviceName, devicePath, deviceDescription, testSuite, testName, testPath, testParams, testDescription, testHelp, "", "Pending", icon};
//vedify that this test is not already in the table

4
script/tests/tests.properties
View File

@@ -1,5 +1,5 @@
#TestingList for pshell: configuration properties
#Thu Aug 31 16:07:15 CEST 2017
#Thu Aug 31 16:08:07 CEST 2017
customPanel=
showEnabledTestsOnly=true
showEnabledTestsOnly=
listFilter=rps-try