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-23 13:35:04 +02:00
parent 8362c66e44
commit 4929a40a9c
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/TestingList.java
View File

@@ -2303,12 +2303,12 @@ public class TestingList extends Panel {
*/
private void addToTable(String deviceName,
String deviceDescription,
//String devicePath,
String devicePath,
String testSuite,
String testName,
String testParams,
String testDescription,
//String testPath,
String testPath,
String testHelp) {
String sDate = "";
if (testName.equals("") || deviceName.equals("")) {
@@ -2318,11 +2318,11 @@ public class TestingList extends Panel {
ImageIcon icon = null;// new ImageIcon(getClass().getResource("/icons/button_pause-16px.png"));
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 otestPath = Paths.get(TESTS_TESTS_DEFAULT_DIR.toString(), testSuite, testName, testName + ".py").toString();
String odevicePath = Paths.get(TESTS_DEVICES_DEFAULT_DIR.toString(), deviceName, deviceName + ".config").toString();
//System.out.println("Old Test Path = " + otestPath);
//System.out.println("Old Dev Path = " + odevicePath);
System.out.println("Old Test Path = " + otestPath);
System.out.println("Old Dev Path = " + odevicePath);
System.out.println("Test Path = " + testPath);
System.out.println("Dev Path = " + devicePath);
@@ -2416,12 +2416,12 @@ public class TestingList extends Panel {
ist.close();
addToTable(propDevice.getProperty("name"),
propDevice.getProperty("description"),
//deviceInList.getPath(),
deviceInList.getPath(),
propDevice.getProperty("tests"),
propTest.getProperty("name"),
"", //test parameters
"", //test description
//testinList.getPath(),
testinList.getPath(),
propTest.getProperty("help"));
iCounter++;
}

23
plugins/TestingListDetails.java
View File

@@ -47,6 +47,13 @@ public class TestingListDetails extends javax.swing.JPanel {
public static Path TESTS_DEVICES_DEFAULT_DIR = Paths.get(".", "home", "script", "tests", "devices");
public static String VALUE_SEPARATOR = "&";
public static String PARAM_SEPARATOR = ";";
private String testName;
private String testDescription;
private String testPath;
private String deviceName;
private String deviceDescription;
private String devicePath;
/**
* 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
@@ -344,18 +351,26 @@ public class TestingListDetails extends javax.swing.JPanel {
private void fillComponents(HashMap hDetails) {
Details details = new Details(hDetails);
testName = details.get("testName");
testDescription = details.get("testDescription");
testPath = details.get("testPath");
deviceName = details.get("deviceName");
deviceDescription = details.get("deviceDescription");
devicePath = details.get("devicePath");
//add values to each text box
this.txtDeviceName.setText(details.get("deviceName"));
this.txtDeviceDescription.setText(details.get("deviceDescription"));
this.txtTestDescription.setText(details.get("testDescription"));
this.txtDeviceName.setText(deviceName);
this.txtDeviceDescription.setText(deviceDescription);
this.txtTestDescription.setText(testDescription);
this.txtTestName.setText(testName);
this.txtTestSuite.setText(details.get("testSuite"));
this.txtTestName.setText(details.get("testName"));
this.txtTestResult.setText(details.get("time") + "\n" +
details.get("deviceName") + " - " +
details.get("testName") + "\n" +
details.get("testResult"));
this.txtTestResultSummary.setText( details.get("testResult"));
this.txtTestResultSummary.setCaretPosition(0);
System.out.println("detail testPath: "+testPath);
System.out.println("detail devicePath: "+devicePath);
//help text
showHelp(details.get("testPath"), details.get("testHelp"));
//parameters table