You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/03/31 08:41:42 UTC
svn commit: r1670266 - in /directory/studio/trunk: plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/

Author: seelmann
Date: Tue Mar 31 06:41:41 2015
New Revision: 1670266

URL: http://svn.apache.org/r1670266
Log:
Fix test and handling of radio button selection (DIRSTUDIO-1021)

Modified:
    directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java?rev=1670266&r1=1670265&r2=1670266&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportDsmlToWizardPage.java Tue Mar 31 06:41:41 2015
@@ -77,7 +77,7 @@ public class ExportDsmlToWizardPage exte
             .getString( "ExportDsmlToWizardPage.SaveAs" ), 1 ); //$NON-NLS-1$
         Composite saveAsComposite = BaseWidgetUtils.createColumnContainer( saveAsGroup, 2, 1 );
 
-        Button saveAsDsmlResponseButton = BaseWidgetUtils.createRadiobutton( saveAsComposite, Messages
+        final Button saveAsDsmlResponseButton = BaseWidgetUtils.createRadiobutton( saveAsComposite, Messages
             .getString( "ExportDsmlToWizardPage.DSMLResponse" ), 2 ); //$NON-NLS-1$
         saveAsDsmlResponseButton.setSelection( true );
         wizard.setSaveAsType( ExportDsmlWizardSaveAsType.RESPONSE );
@@ -85,20 +85,26 @@ public class ExportDsmlToWizardPage exte
         {
             public void widgetSelected( SelectionEvent e )
             {
-                wizard.setSaveAsType( ExportDsmlWizardSaveAsType.RESPONSE );
+                if ( saveAsDsmlResponseButton.getSelection() )
+                {
+                    wizard.setSaveAsType( ExportDsmlWizardSaveAsType.RESPONSE );
+                }
             }
         } );
         BaseWidgetUtils.createRadioIndent( saveAsComposite, 1 );
         BaseWidgetUtils.createWrappedLabel( saveAsComposite, Messages
             .getString( "ExportDsmlToWizardPage.SearchSaveAsResponse" ), 1 ); //$NON-NLS-1$
 
-        Button saveAsDsmlRequestButton = BaseWidgetUtils.createRadiobutton( saveAsComposite, Messages
+        final Button saveAsDsmlRequestButton = BaseWidgetUtils.createRadiobutton( saveAsComposite, Messages
             .getString( "ExportDsmlToWizardPage.DSMLRequest" ), 2 ); //$NON-NLS-1$
         saveAsDsmlRequestButton.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
             {
-                wizard.setSaveAsType( ExportDsmlWizardSaveAsType.REQUEST );
+                if ( saveAsDsmlRequestButton.getSelection() )
+                {
+                    wizard.setSaveAsType( ExportDsmlWizardSaveAsType.REQUEST );
+                }
             }
         } );
         BaseWidgetUtils.createRadioIndent( saveAsComposite, 1 );

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java?rev=1670266&r1=1670265&r2=1670266&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java Tue Mar 31 06:41:41 2015
@@ -167,7 +167,7 @@ public class ImportExportTest extends Ab
         wizardBot.typeFile( file );
         wizardBot.selectDsmlRequest();
         wizardBot.clickFinishButton();
-        wizardBot.waitTillExportFinished( file, 600 ); // is actually 651 bytes
+        wizardBot.waitTillExportFinished( file, 500 ); // is actually 542 bytes
 
         // verify that exported DSML contains the Base64 encoded DN
         String content = FileUtils.readFileToString( new File( file ), "UTF-8" );