diff --git a/plugins/TestingListDetails.form b/plugins/TestingListDetails.form index c81959f..2c82ace 100644 --- a/plugins/TestingListDetails.form +++ b/plugins/TestingListDetails.form @@ -18,53 +18,75 @@ - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - + - - + + @@ -77,10 +99,22 @@ - + + + + + + + + + + + + + @@ -88,32 +122,25 @@ - + - - - + + + + + + + - - - - - - - - - - - - + diff --git a/plugins/TestingListDetails.java b/plugins/TestingListDetails.java index b5e7a54..e0efd68 100644 --- a/plugins/TestingListDetails.java +++ b/plugins/TestingListDetails.java @@ -245,43 +245,56 @@ public class TestingListDetails extends javax.swing.JPanel { layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .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(jLabel1) - .addComponent(jLabel10)) - .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.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(txtDeviceName) - .addComponent(txtDeviceDescription) - .addComponent(jScrollPaneTestDesc) - .addComponent(jScrollPaneRes, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jScrollPaneParam, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(txtTestResultSummary, javax.swing.GroupLayout.PREFERRED_SIZE, 440, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(jButtonMoreResult)) + .addComponent(jLabel8) + .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.LEADING)) + .addGap(65, 65, 65) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(txtTestSuite) - .addGroup(layout.createSequentialGroup() - .addComponent(txtTestName, javax.swing.GroupLayout.PREFERRED_SIZE, 441, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jButtonMoreTest)))) + .addComponent(jScrollPaneTestDesc))) .addGroup(layout.createSequentialGroup() - .addComponent(jButtonOkDev) - .addGap(18, 18, 18) - .addComponent(jButtonOk, javax.swing.GroupLayout.PREFERRED_SIZE, 131, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(18, 18, 18) - .addComponent(jScrollPaneHtml, javax.swing.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE) + .addGap(163, 163, 163) + .addComponent(txtDeviceDescription)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .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) + .addComponent(jLabel5) + .addComponent(jLabel10)) + .addComponent(jLabel7, javax.swing.GroupLayout.Alignment.LEADING)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jScrollPaneParam, javax.swing.GroupLayout.DEFAULT_SIZE, 581, Short.MAX_VALUE) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(txtDeviceName, javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(txtTestName, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 513, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jButtonMoreTest)))) + .addGroup(layout.createSequentialGroup() + .addComponent(jButtonOkDev) + .addGap(18, 18, 18) + .addComponent(jButtonOk, javax.swing.GroupLayout.PREFERRED_SIZE, 131, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel6) + .addComponent(jLabel9)) + .addGap(53, 53, 53) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(txtTestResultSummary) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jButtonMoreResult)) + .addComponent(jScrollPaneRes, javax.swing.GroupLayout.PREFERRED_SIZE, 581, javax.swing.GroupLayout.PREFERRED_SIZE)))) + .addComponent(jLabel1) + .addComponent(jLabel2)) + .addGap(0, 0, Short.MAX_VALUE))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(jScrollPaneHtml, javax.swing.GroupLayout.DEFAULT_SIZE, 215, Short.MAX_VALUE) .addContainerGap()) ); layout.setVerticalGroup( @@ -292,35 +305,38 @@ public class TestingListDetails extends javax.swing.JPanel { .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(txtTestName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jButtonMoreTest) .addComponent(jLabel5)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel1) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(txtDeviceName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jButtonMoreTest))) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(txtDeviceDescription, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel2)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(txtTestSuite, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel4)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel8) - .addComponent(jScrollPaneTestDesc, javax.swing.GroupLayout.PREFERRED_SIZE, 62, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(jScrollPaneTestDesc, javax.swing.GroupLayout.PREFERRED_SIZE, 54, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jButtonMoreResult) - .addComponent(jLabel6)) - .addComponent(txtTestResultSummary, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGroup(layout.createSequentialGroup() + .addComponent(jLabel6) + .addGap(5, 5, 5)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(txtTestResultSummary, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jButtonMoreResult))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel9) .addComponent(jScrollPaneRes, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel1) - .addComponent(txtDeviceName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(txtDeviceDescription, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(jLabel2)) - .addGap(18, 18, 18) + .addGap(48, 48, 48) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPaneParam, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() @@ -507,29 +523,29 @@ public class TestingListDetails extends javax.swing.JPanel { this.jButtonMoreResult.setText("Less"); this.jScrollPaneRes.setVisible(true); this.jLabel9.setVisible(true); - this.txtDeviceName.setVisible(true); - this.jLabel1.setVisible(true); - this.jLabel2.setVisible(true); - this.txtDeviceDescription.setVisible(true); }else{ this.jScrollPaneRes.setVisible(false); this.jLabel9.setVisible(false); - this.txtDeviceName.setVisible(false); - this.jLabel1.setVisible(false); - this.jLabel2.setVisible(false); - this.txtDeviceDescription.setVisible(false); this.jButtonMoreResult.setText("More"); } }//GEN-LAST:event_jButtonMoreResultActionPerformed private void jButtonMoreTestActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButtonMoreTestActionPerformed if(this.jButtonMoreTest.getText()=="More"){ + this.txtDeviceName.setVisible(true); + this.jLabel1.setVisible(true); + this.jLabel2.setVisible(true); + this.txtDeviceDescription.setVisible(true); this.jButtonMoreTest.setText("Less"); this.jScrollPaneTestDesc.setVisible(true); this.jLabel4.setVisible(true); this.txtTestSuite.setVisible(true); this.jLabel8.setVisible(true); }else{ + this.txtDeviceName.setVisible(false); + this.jLabel1.setVisible(false); + this.jLabel2.setVisible(false); + this.txtDeviceDescription.setVisible(false); this.jScrollPaneTestDesc.setVisible(false); this.jLabel4.setVisible(false); this.txtTestSuite.setVisible(false); diff --git a/script/tests/devices/bx84/.config b/script/tests/devices/bx84/.config index 88adcb1..b99fbcf 100644 --- a/script/tests/devices/bx84/.config +++ b/script/tests/devices/bx84/.config @@ -1,5 +1,5 @@ -#Fri Aug 25 16:13:54 CEST 2017 +#Tue Oct 03 13:56:43 CEST 2017 name=bx84 tests=sad description=simulation device in playground -parameters=setVal\:11\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask;bla\:234\:bla bla; +parameters=delay\:.2\:delay between 2 steps;bla\:234\:bla bla;setVal\:11\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask; diff --git a/script/tests/tests/sad/rpstry/.config b/script/tests/tests/sad/rpstry/.config index e02f377..cdad9ce 100644 --- a/script/tests/tests/sad/rpstry/.config +++ b/script/tests/tests/sad/rpstry/.config @@ -1,4 +1,4 @@ -#Tue Oct 03 13:15:14 CEST 2017 +#Tue Oct 03 13:56:33 CEST 2017 name=rpstry +parameters=delay\:.2\:delay between 2 steps;bla\:234\:bla bla;setVal\:13\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask; description=try to use pshell for rps test -parameters=delay\:.2\:delay between 2 steps;bla\:234\:bla bla;setVal\:12\:value to set;expectedVal\:18.1\:expected returned value;mask\:2\:bit mask;