From f75ad220c675cb0e4b850acf315564ee3aea5bc6 Mon Sep 17 00:00:00 2001
From: boccioli_m <marco.boccioli@psi.ch>
Date: Mon, 23 Oct 2017 09:10:11 +0200
Subject: [PATCH] Startup

---
 plugins/TestingList.java      | 7 ++++---
 script/tests/tests.properties | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/TestingList.java b/plugins/TestingList.java
index 468c1c2..200bb2e 100644
--- a/plugins/TestingList.java
+++ b/plugins/TestingList.java
@@ -2301,10 +2301,12 @@ public class TestingList extends Panel {
      */
     private void addToTable(String deviceName,
             String deviceDescription,
+            String devicePath,
             String testSuite,
             String testName,
             String testParams,
             String testDescription,
+            String testPath,
             String testHelp) {
         String sDate = "";
         if (testName.equals("") || deviceName.equals("")) {
@@ -2313,9 +2315,6 @@ public class TestingList extends Panel {
         try {
             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();
             //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
@@ -2407,10 +2406,12 @@ public class TestingList extends Panel {
                                     ist.close();
                                     addToTable(propDevice.getProperty("name"),
                                             propDevice.getProperty("description"),
+                                            deviceInList.getPath(),
                                             propDevice.getProperty("tests"),
                                             propTest.getProperty("name"),
                                             "", //test parameters
                                             "", //test description
+                                            testinList.getPath(),
                                             propTest.getProperty("help"));
                                     iCounter++;
                                 }
diff --git a/script/tests/tests.properties b/script/tests/tests.properties
index 8c5d948..95b63ea 100644
--- a/script/tests/tests.properties
+++ b/script/tests/tests.properties
@@ -1,5 +1,5 @@
 #TestingList for pshell: configuration properties
-#Fri Oct 20 16:32:14 CEST 2017
+#Mon Oct 23 09:09:52 CEST 2017
 customPanel=
 showEnabledTestsOnly=true
 listFilter=rps-test