fix: fix Main Menu

Signed-off-by: Stephane Bouchet <[email protected]>

Author: sbouchet

.github/workflows/validate.yml

@@ -1,9 +1,11 @@
-name: Validate
+name: Validate against IJ versions
+
 on:
-  workflow_run:
-    workflows: [Java CI with Gradle]
-    types:
-      - completed
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
 jobs:
   validate_versions:
     runs-on: ubuntu-latest

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/MainIdeWindow.java

@@ -14,25 +14,19 @@
 import com.intellij.remoterobot.data.RemoteComponent;
 import com.intellij.remoterobot.fixtures.ActionButtonFixture;
 import com.intellij.remoterobot.fixtures.CommonContainerFixture;
-import com.intellij.remoterobot.fixtures.ComponentFixture;
 import com.intellij.remoterobot.fixtures.DefaultXpath;
 import com.intellij.remoterobot.fixtures.FixtureName;
-import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText;
 import com.intellij.remoterobot.utils.Keyboard;
 import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
-import com.redhat.devtools.intellij.commonuitest.UITestRunner;
 import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
 import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.navigation.SearchEverywherePopup;
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.menubar.MenuBar;
 import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions;
 import com.redhat.devtools.intellij.commonuitest.utils.internalerror.IdeInternalErrorUtils;
-import com.redhat.devtools.intellij.commonuitest.utils.screenshot.ScreenshotUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.awt.event.KeyEvent;
 import java.time.Duration;
-import java.util.List;
-import java.util.Optional;
 
 import static com.intellij.remoterobot.search.locators.Locators.byXpath;
 
@@ -83,13 +77,7 @@ public void maximizeIdeWindow() {
      * Close the currently opened project
      */
     public void closeProject() {
-        if (remoteRobot.isMac() || UITestRunner.getIdeaVersionInt() <= 20242) {
-            invokeCmdUsingSearchEverywherePopup("Close Project");
-        } else {
-            MenuBar menu = new MenuBar(remoteRobot);
-            setMainMenuVisible(menu);
-            menu.navigateTo("File", "Close Project");
-        }
+        new MenuBar(remoteRobot).navigateTo("File", "Close Project");
         IdeInternalErrorUtils.clearWindowsErrorsIfTheyAppear(remoteRobot);
         remoteRobot.find(FlatWelcomeFrame.class, Duration.ofSeconds(10)).runJs("const horizontal_offset = component.getWidth()/2;\n" +
             "robot.click(component, new Point(horizontal_offset, 10), MouseButton.LEFT_BUTTON, 1);");
@@ -104,10 +92,6 @@ public void invokeCmdUsingSearchEverywherePopup(String cmdToInvoke) {
         openSearchEverywherePopup().invokeCmd(cmdToInvoke);
     }
 
-    public void searchEverywhere(String searchString) {
-        openSearchEverywherePopup().searchText(searchString);
-    }
-
     private SearchEverywherePopup openSearchEverywherePopup() {
         try {
             find(ActionButtonFixture.class, byXpath("//div[@myicon='search.svg']"), Duration.ofSeconds(5)).click();
@@ -127,19 +111,4 @@ private SearchEverywherePopup openSearchEverywherePopup() {
         }
     }
 
-    public void setMainMenuVisible(MenuBar menuBar) {
-        if (menuBar.isVisible()) {
-            return;
-        }
-        MainIdeWindow mainIdeWindow = remoteRobot.find(MainIdeWindow.class, Duration.ofSeconds(5));
-        mainIdeWindow.searchEverywhere("Appearance");
-        ComponentFixture appearanceDialog = remoteRobot.find(ComponentFixture.class, byXpath("//div[@class='SearchEverywhereUI']"));
-        List<RemoteText> items = appearanceDialog.findAllText();
-        Optional<RemoteText> item = items.stream().filter(remoteText -> remoteText.getText().equals("View | Appearance: Main Menu")).findFirst();
-        if (item.isPresent()) {
-            item.get().click();
-        } else {
-            ScreenshotUtils.takeScreenshot(remoteRobot, "Can't find 'Appearance' Main menu item");
-        }
-    }
 }

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/menubar/MenuBar.java

@@ -47,17 +47,18 @@ public MenuBar(RemoteRobot remoteRobot) {
      * @param path path to navigate in the main menu
      */
     public void navigateTo(String... path) {
-        if (!isVisible()) {
-            LOGGER.severe("Main Menu is not visible.");
-            return;
-        }
         if (path.length == 0) {
             return;
         }
         if (ideaVersionInt >= 20242) {
             remoteRobot.find(ActionButtonFixture.class, byXpath(XPathDefinitions.MAIN_MENU)).click();
         }
 
+        if (!isVisible()) {
+            LOGGER.severe("Main Menu is not visible.");
+            return;
+        }
+
         JButtonFixture mainMenuFirstItem = mainMenuItem(path[0]);
         if (mainMenuFirstItem != null) {
             if (ideaVersionInt >= 20242) {

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/mainidewindow/menubar/MenuBarTest.java

@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-
 import java.time.Duration;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;