diff --git a/plugins/TestingListDetails.form b/plugins/TestingListDetails.form index cace79b..1242246 100644 --- a/plugins/TestingListDetails.form +++ b/plugins/TestingListDetails.form @@ -20,24 +20,28 @@ - + - - - - - - - + + + + + + + + + - + + + + - @@ -118,8 +122,6 @@ - - @@ -269,7 +271,7 @@ - + <Editor/> <Renderer/> @@ -458,14 +460,6 @@ <AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="jLabel9.setVisible(false);"/> </AuxValues> </Component> - <Component class="javax.swing.JLabel" name="jLabel10"> - <Properties> - <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> - <Font name="Tahoma" size="14" style="0"/> - </Property> - <Property name="text" type="java.lang.String" value="(Value valid for all devices)"/> - </Properties> - </Component> <Component class="javax.swing.JButton" name="jButtonOk1"> <Properties> <Property name="text" type="java.lang.String" value="Save for this device"/> diff --git a/plugins/TestingListDetails.java b/plugins/TestingListDetails.java index 46713fc..f440581 100644 --- a/plugins/TestingListDetails.java +++ b/plugins/TestingListDetails.java @@ -80,7 +80,6 @@ public class TestingListDetails extends javax.swing.JPanel { jButtonMoreResult = new javax.swing.JButton(); jButtonMoreTest = new javax.swing.JButton(); jLabel9 = new javax.swing.JLabel(); - jLabel10 = new javax.swing.JLabel(); jButtonOk1 = new javax.swing.JButton(); jLabelDeviceName.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N @@ -149,7 +148,7 @@ public class TestingListDetails extends javax.swing.JPanel { jScrollPaneParam.setViewportView(jTableParams); if (jTableParams.getColumnModel().getColumnCount() > 0) { jTableParams.getColumnModel().getColumn(0).setMinWidth(150); - jTableParams.getColumnModel().getColumn(0).setPreferredWidth(150); + jTableParams.getColumnModel().getColumn(0).setPreferredWidth(120); jTableParams.getColumnModel().getColumn(0).setMaxWidth(150); jTableParams.getColumnModel().getColumn(1).setPreferredWidth(120); jTableParams.getColumnModel().getColumn(1).setMaxWidth(200); @@ -225,9 +224,6 @@ public class TestingListDetails extends javax.swing.JPanel { jLabel9.setText("Last Result Details"); jLabel9.setVisible(false); - jLabel10.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N - jLabel10.setText("(Value valid for all devices)"); - jButtonOk1.setText("Save for this device"); jButtonOk1.setToolTipText("Save parameters values for this specific device"); jButtonOk1.addActionListener(new java.awt.event.ActionListener() { @@ -244,20 +240,22 @@ public class TestingListDetails extends javax.swing.JPanel { .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel5) - .addComponent(jLabel8) - .addComponent(jLabel6) - .addComponent(jLabel9) - .addComponent(jLabelDeviceName) - .addComponent(jLabel10)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel5) + .addComponent(jLabel8) + .addComponent(jLabel6) + .addComponent(jLabel9) + .addComponent(jLabelDeviceName)) + .addGap(18, 18, 18)) .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.LEADING)) .addComponent(jLabel2, javax.swing.GroupLayout.Alignment.LEADING)) - .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.LEADING)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createSequentialGroup() + .addComponent(jLabel7) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) .addComponent(txtDeviceName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(txtDeviceDescription) @@ -322,8 +320,6 @@ public class TestingListDetails extends javax.swing.JPanel { .addComponent(jScrollPaneParam, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() .addComponent(jLabel7) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel10) .addGap(0, 0, Short.MAX_VALUE))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) @@ -520,7 +516,6 @@ public class TestingListDetails extends javax.swing.JPanel { private javax.swing.JButton jButtonOk; private javax.swing.JButton jButtonOk1; private javax.swing.JEditorPane jEditorPaneHelp; - private javax.swing.JLabel jLabel10; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel4; private javax.swing.JLabel jLabel5; diff --git a/script/tests/devices/newdev/.config b/script/tests/devices/newdev/.config index 64893ff..64271c8 100644 --- a/script/tests/devices/newdev/.config +++ b/script/tests/devices/newdev/.config @@ -1,5 +1,5 @@ #Fri Oct 13 12:10:12 CEST 2017 name=newdev tests=RPS Tests Betriebsmode -parameters=pv&PXXF\:VAL\:2&ssp;ds&2,IQCOM,$BMA1,1,DIA&vla; +parameters="pv"&"PXXF\:VAL\:2"&"ssp";"ds"&"2,IQCOM,$BMA1,1,DIA"&"vla"; description=del diff --git a/script/tests/tests.properties b/script/tests/tests.properties index 204310c..a67caaf 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Fri Oct 13 12:22:31 CEST 2017 +#Fri Oct 13 12:53:24 CEST 2017 customPanel= showEnabledTestsOnly= listFilter=rps-try diff --git a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py index f68293a..5953939 100644 --- a/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py +++ b/script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py @@ -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. - mode = float(test.getParam('mode')) ; expectedVal14 = float(test.getParam('expectedVal14')) ; expectedVal58 = float(test.getParam('expectedVal58')) ; setGetDelay = float(test.getParam('setGetDelay')) ; + mode = string(test.getParam('mode')) ; expectedVal14 = int(test.getParam('expectedVal14')) ; expectedVal58 = int(test.getParam('expectedVal58')) ; setGetDelay = float(test.getParam('setGetDelay')) ; except: # test failed, write the report into the variables ret and success and send feedback: ret = 'Could not retrieve testing parameters - ' + traceback.format_exc()