commit a543b2d9c7154f913ab5a61af34ad5e8416b0fbb
author Stefan Seelmann <mail@stefan-seelmann.de> Sun Jan 10 18:19:11 2021 +0100
committer Stefan Seelmann <mail@stefan-seelmann.de> Sun Jan 10 18:19:11 2021 +0100
tree 07324d8d69343aa6ceba5e57cea6e383350dd376
parent ddd7be43c51790414be44539cee79add8972b18b

Stabilize UI tests

tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BotUtils.java

diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BotUtils.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BotUtils.java
index 600b3e0..93d01b2 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BotUtils.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BotUtils.java
@@ -55,15 +55,7 @@
             {
                 public boolean test() throws Exception
                 {
-                    String shellText = bot.activeShell().getText();
-                    for ( String label : labels )
-                    {
-                        if ( shellText.equals( label ) && bot.button( "OK" ) != null )
-                        {
-                            return true;
-                        }
-                    }
-                    return false;
+                    return getShell( labels ) != null;
                 }
 
 
@@ -80,7 +72,28 @@
             ErrorDialog.AUTOMATED_MODE = errorDialogAutomatedMode;
         }
 
-        return bot.activeShell();
+        return getShell( labels );
+    }
+
+
+    private static SWTBotShell getShell( final String... labels )
+    {
+        SWTBotShell[] shells = bot.shells();
+        for ( SWTBotShell shell : shells )
+        {
+            String shellText = shell.getText();
+            for ( String label : labels )
+            {
+                if ( shellText.equals( label ) )
+                {
+                    shell.activate();
+                    if( bot.button( "OK" ) != null) {
+                        return shell;
+                    }
+                }
+            }
+        }
+        return null;
     }
 
 

tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java

diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java
index ff904a4..341afbe 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/StudioBot.java
@@ -154,6 +154,7 @@
                     IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
 
                     // set default/dark theme
+                    /*
                     IThemeManager tm = workbench.getService( IThemeManager.class );
                     IThemeEngine te = tm.getEngineForDisplay( Display.getCurrent() );
                     int random = new Random().nextInt( 3 );
@@ -169,6 +170,7 @@
                             te.setTheme( "org.eclipse.e4.ui.css.theme.high-contrast", false );
                             break;
                     }
+                    */
 
                     // close welcome view
                     IWorkbenchPage page = window.getActivePage();

tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/WizardBot.java

diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/WizardBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/WizardBot.java
index 92489f2..db3e9ad 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/WizardBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/WizardBot.java
@@ -60,6 +60,7 @@
 
     protected boolean isButtonEnabled( String buttonTitle )
     {
+        activate();
         return bot.button( buttonTitle ).isEnabled();
     }