From edc81f550f15de4e1d7f0fb626f2596da4689dcc Mon Sep 17 00:00:00 2001
From: boccioli_m <marco.boccioli@psi.ch>
Date: Mon, 16 Oct 2017 14:48:18 +0200
Subject: [PATCH] Closedown

---
 plugins/TestingListDetails.java                          | 9 ++++-----
 script/tests/devices/bis-BMA1/.config                    | 4 ++--
 .../tests/RPS Tests Betriebsmode/Betriebsmode/.config    | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/TestingListDetails.java b/plugins/TestingListDetails.java
index 8a9a341..8ce87e9 100644
--- a/plugins/TestingListDetails.java
+++ b/plugins/TestingListDetails.java
@@ -422,7 +422,7 @@ public class TestingListDetails extends javax.swing.JPanel {
         HashMap mParameterAttributes = new HashMap(); //contians value and description
         for(int row=0 ; row<jTableParams.getRowCount() ; row++){
             String sParam = jTableParams.getValueAt(row, 0).toString();
-            String sVal = "\"" + jTableParams.getValueAt(row, 1).toString() + "\"";
+            String sVal = "\"" + jTableParams.getValueAt(row, 1).toString().replace("\"", "").replace("&","") + "\"";
             String sDescr = "\"" +jTableParams.getValueAt(row, 2).toString() + "\"";
             mParameterAttributes = new HashMap();
             mParameterAttributes.put("value", (Object) sVal);
@@ -441,7 +441,6 @@ public class TestingListDetails extends javax.swing.JPanel {
         boolean success = false;        
         try {        
             Path path = Paths.get(testDir + FilenameUtils.separatorsToSystem("/"+TESTS_CONFIG_FILENAME));
-            File configFile = path.toFile();
             //Loop among the test parameters and generate variable assignement syntax for python
             String sTestParameters = "";
             String name="", value="", description="";
@@ -449,9 +448,9 @@ public class TestingListDetails extends javax.swing.JPanel {
                 Object param = entry;
                 if(param instanceof String){
                     name = (String) param;
-                    HashMap attributes = (HashMap) hmTestParams.get(param);
-                    value = (String) attributes.get("value");
-                    description = (String) attributes.get("description");
+                    Details attributes = new Details((HashMap) hmTestParams.get(param));
+                    value = attributes.get("value");
+                    description = attributes.get("description");
                     //build the python code for getting the test parameter
                     sTestParameters = sTestParameters + name + VALUE_SEPARATOR + value + VALUE_SEPARATOR + description + PARAM_SEPARATOR ; 
                 }               
diff --git a/script/tests/devices/bis-BMA1/.config b/script/tests/devices/bis-BMA1/.config
index 415aa38..f7db6b9 100644
--- a/script/tests/devices/bis-BMA1/.config
+++ b/script/tests/devices/bis-BMA1/.config
@@ -1,5 +1,5 @@
-#Fri Oct 13 11:25:53 CEST 2017
+#Mon Oct 16 14:37:25 CEST 2017
 name=bis-BMA1
 tests=RPS Tests Betriebsmode
-parameters=channel&"PXXF\:VAL\:2"&"ssp";mode&"2,IQCOM,$BMA1,1,DIA"&"vla";
+parameters=mode&"2,IQCOM,$BMA1,1,DIA"&"vla";channel&"PXXF\:VAL\:3"&"ssp";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";setGetDelay&"1000"&"[ms] delay between set and get";
 description=rps section till BMA1
diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config
index 24f6de8..9675194 100644
--- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config	
+++ b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/.config	
@@ -1,4 +1,4 @@
-#Fri Oct 13 11:12:22 CEST 2017
+#Mon Oct 16 14:28:18 CEST 2017
 name=Betriebsmode
-parameters=mode&"2,IQCOM,$BMA1,1,DIA"&"[string] Betriebsmode";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";setGetDelay&"1000"&"[ms] delay between set and get";
 description=Verify that the different RPS Modes give correct Outputs on the RPS modules
+parameters=mode&"2,IQCOM,$BMA1,1,DIA"&"vla";channel&"PXXF\:VAL\:3"&"ssp";expectedVal14&"0x0000"&"[hex] Expected value for channels 1-4";expectedVal58&"0x0000"&"[hex] Expected value for channels 5-8";setGetDelay&"1000"&"[ms] delay between set and get";