fix: fix Main Menu

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

Author: sbouchet

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

@@ -18,6 +18,7 @@
 import com.intellij.remoterobot.fixtures.FixtureName;
 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;
@@ -77,7 +78,11 @@ public void maximizeIdeWindow() {
      * Close the currently opened project
      */
     public void closeProject() {
-        new MenuBar(remoteRobot).navigateTo("File", "Close Project");
+        if (UITestRunner.getIdeaVersionInt() == 20233 && remoteRobot.isLinux()) {
+            invokeCmdUsingSearchEverywherePopup("Close Project");
+        } else {
+            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);");

src/main/java/com/redhat/devtools/intellij/commonuitest/utils/project/CreateCloseUtils.java

@@ -117,8 +117,7 @@ public static void createEmptyProject(RemoteRobot remoteRobot, String projectNam
     public static void waitAfterOpeningProject(RemoteRobot remoteRobot) {
         IdeStatusBar ideStatusBar = remoteRobot.find(IdeStatusBar.class, Duration.ofSeconds(10));
         ideStatusBar.waitUntilProjectImportIsComplete();
-        int ideaVersionInt = UITestRunner.getIdeaVersionInt();
-        if (ideaVersionInt > 20233) {
+        if (UITestRunner.getIdeaVersionInt() > 20233) {
             MainIdeWindow mainIdeWindow = remoteRobot.find(MainIdeWindow.class, Duration.ofSeconds(5));
             mainIdeWindow.maximizeIdeWindow();
         }