pshell_config/ncs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
boccioli_m
2017-10-13 12:53:37 +02:00
parent c3144d4226
commit cbc49fde5d
5 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/TestingListDetails.form
View File

@@ -20,24 +20,28 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel5" alignment="0" max="-2" attributes="0"/>
<Component id="jLabel8" alignment="0" max="-2" attributes="0"/>
<Component id="jLabel6" alignment="0" max="-2" attributes="0"/>
<Component id="jLabel9" alignment="0" max="-2" attributes="0"/>
<Component id="jLabelDeviceName" alignment="0" max="-2" attributes="0"/>
<Component id="jLabel10" alignment="0" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jLabel5" alignment="0" max="-2" attributes="0"/>
<Component id="jLabel8" alignment="0" max="-2" attributes="0"/>
<Component id="jLabel6" alignment="0" max="-2" attributes="0"/>
<Component id="jLabel9" alignment="0" max="-2" attributes="0"/>
<Component id="jLabelDeviceName" alignment="0" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="jLabel4" alignment="0" max="-2" attributes="0"/>
</Group>
<Component id="jLabel2" alignment="0" max="-2" attributes="0"/>
</Group>
<Component id="jLabel7" alignment="0" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<Component id="jLabel7" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="txtDeviceName" alignment="0" max="32767" attributes="0"/>
<Component id="txtDeviceDescription" alignment="0" max="32767" attributes="0"/>
@@ -118,8 +122,6 @@
<Component id="jScrollPaneParam" pref="0" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="jLabel7" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel10" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
@@ -269,7 +271,7 @@
</Property>
<Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
<TableColumnModel selectionModel="0">
<Column maxWidth="150" minWidth="150" prefWidth="150" resizable="true">
<Column maxWidth="150" minWidth="150" prefWidth="120" resizable="true">
<Title/>
<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"/>

31
plugins/TestingListDetails.java
View File

@@ -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;

2
script/tests/devices/newdev/.config
View File

@@ -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

2
script/tests/tests.properties
View File

@@ -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

2
script/tests/tests/RPS Tests Betriebsmode/Betriebsmode/Betriebsmode.py
View File

@@ -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()