Merge pull request #1033 from turkeylurkey/issue-971

Wait after clicking button to open window

Author: turkeylurkey

src/test/java/io/openliberty/tools/intellij/it/SingleModJakartaLSTestCommon.java

@@ -179,7 +179,7 @@ public static void prepareEnv(String projectPath, String projectName) {
 
         UIBotTestUtils.importProject(remoteRobot, projectPath, projectName);
         UIBotTestUtils.openProjectView(remoteRobot);
-        // IntelliJ does not start building and indexing until the project is open in the UI
+        // IntelliJ does not start building and indexing until the Project View is open
         UIBotTestUtils.waitForIndexing(remoteRobot);
         UIBotTestUtils.openAndValidateLibertyToolWindow(remoteRobot, projectName);
         UIBotTestUtils.closeLibertyToolWindow(remoteRobot);

src/test/java/io/openliberty/tools/intellij/it/SingleModLibertyLSTestCommon.java

@@ -391,7 +391,7 @@ public static void prepareEnv(String projectPath, String projectName) {
 
         UIBotTestUtils.importProject(remoteRobot, projectPath, projectName);
         UIBotTestUtils.openProjectView(remoteRobot);
-        // IntelliJ does not start building and indexing until the project is open in the UI
+        // IntelliJ does not start building and indexing until the Project View is open
         UIBotTestUtils.waitForIndexing(remoteRobot);
         UIBotTestUtils.openAndValidateLibertyToolWindow(remoteRobot, projectName);
         UIBotTestUtils.closeLibertyToolWindow(remoteRobot);

src/test/java/io/openliberty/tools/intellij/it/SingleModMPLSTestCommon.java

@@ -322,7 +322,7 @@ public static void prepareEnv(String projectPath, String projectName) {
 
         UIBotTestUtils.importProject(remoteRobot, projectPath, projectName);
         UIBotTestUtils.openProjectView(remoteRobot);
-        // IntelliJ does not start building and indexing until the project is open in the UI
+        // IntelliJ does not start building and indexing until the Project View is open
         UIBotTestUtils.waitForIndexing(remoteRobot);
         UIBotTestUtils.openAndValidateLibertyToolWindow(remoteRobot, projectName);
         UIBotTestUtils.closeLibertyToolWindow(remoteRobot);

src/test/java/io/openliberty/tools/intellij/it/SingleModMPProjectTestCommon.java

@@ -915,7 +915,7 @@ public static void prepareEnv(String projectPath, String projectName) {
         remoteRobot.find(WelcomeFrameFixture.class, Duration.ofMinutes(2));
         UIBotTestUtils.importProject(remoteRobot, projectPath, projectName);
         UIBotTestUtils.openProjectView(remoteRobot);
-        // IntelliJ does not start building and indexing until the project is open in the UI
+        // IntelliJ does not start building and indexing until the Project View is open
         UIBotTestUtils.waitForIndexing(remoteRobot);
         UIBotTestUtils.openAndValidateLibertyToolWindow(remoteRobot, projectName);
         UIBotTestUtils.expandLibertyToolWindowProjectTree(remoteRobot, projectName);

src/test/java/io/openliberty/tools/intellij/it/SingleModNLTRestProjectTestCommon.java

@@ -226,7 +226,7 @@ public static void prepareEnv(String projectPath, String projectName) {
         remoteRobot.find(WelcomeFrameFixture.class, Duration.ofMinutes(2));
         UIBotTestUtils.importProject(remoteRobot, projectPath, projectName);
         UIBotTestUtils.openProjectView(remoteRobot);
-        // IntelliJ does not start building and indexing until the project is open in the UI
+        // IntelliJ does not start building and indexing until the Project View is open
         UIBotTestUtils.waitForIndexing(remoteRobot);
         UIBotTestUtils.openLibertyToolWindow(remoteRobot);
 

src/test/java/io/openliberty/tools/intellij/it/UIBotTestUtils.java

@@ -427,13 +427,17 @@ public static void openLibertyToolWindow(RemoteRobot remoteRobot) {
         Exception error = null;
         for (int i = 0; i < maxRetries; i++) {
             try {
+                TestUtils.sleepAndIgnoreException(10); // wait for UI to be rendered before searching for a button
                 error = null;
                 ProjectFrameFixture projectFrame = remoteRobot.find(ProjectFrameFixture.class, Duration.ofSeconds(10));
                 projectFrame.getBaseLabel("Liberty", "5");
                 break;
             } catch (WaitForConditionTimeoutException wfcte) {
                 // The Liberty tool window is closed. Open it.
                 clickOnWindowPaneStripeButton(remoteRobot, "Liberty");
+                // After clicking it can take seconds for the window to open on a slow cloud machine.
+                // Important since this is in a loop and you may click twice if there is no sleep.
+                TestUtils.sleepAndIgnoreException(5);
                 break;
             } catch (Exception e) {
                 // The project frame may hang for a bit while loading/processing work. Retry.
@@ -476,13 +480,17 @@ public static void openProjectView(RemoteRobot remoteRobot) {
         Exception error = null;
         for (int i = 0; i < maxRetries; i++) {
             try {
+                TestUtils.sleepAndIgnoreException(10); // wait for UI to be rendered before searching for a button
                 error = null;
                 ProjectFrameFixture projectFrame = remoteRobot.find(ProjectFrameFixture.class, Duration.ofSeconds(10));
                 projectFrame.getContentComboLabel("Project", "5");
                 break;
             } catch (WaitForConditionTimeoutException wfcte) {
                 // The project view is closed. Open it.
                 clickOnWindowPaneStripeButton(remoteRobot, "Project");
+                // After clicking it can take seconds for the window to open on a slow cloud machine.
+                // Important since this is in a loop and you may click twice if there is no sleep.
+                TestUtils.sleepAndIgnoreException(5);
                 break;
             } catch (Exception e) {
                 // The project frame may hang for a bit while loading/processing work. Retry.