fix: fix for 2023.3 use case

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

Author: sbouchet

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

@@ -78,10 +78,10 @@ public void maximizeIdeWindow() {
      * Close the currently opened project
      */
     public void closeProject() {
-        if (remoteRobot.isWin()) {
-            new MenuBar(remoteRobot).navigateTo("File", "Close Project");
-        } else {
+        if (remoteRobot.isMac()) {
             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" +

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

@@ -13,10 +13,15 @@
 import com.intellij.remoterobot.RemoteRobot;
 import com.intellij.remoterobot.fixtures.ActionButtonFixture;
 import com.intellij.remoterobot.fixtures.CommonContainerFixture;
+import com.intellij.remoterobot.fixtures.ComponentFixture;
 import com.intellij.remoterobot.fixtures.JButtonFixture;
 import com.intellij.remoterobot.fixtures.JPopupMenuFixture;
+import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText;
+import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
 import com.redhat.devtools.intellij.commonuitest.UITestRunner;
+import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.MainIdeWindow;
 import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions;
+import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
 import java.util.List;
@@ -83,7 +88,11 @@ private JButtonFixture mainMenuItem(String label) {
         if (remoteRobot.isMac()) {
             return null;
         }
+        return getMainMenu().button(byXpath(XPathDefinitions.label(label)), Duration.ofSeconds(10));
+    }
 
+    @NotNull
+    public CommonContainerFixture getMainMenu() {
         CommonContainerFixture cf;
         if (remoteRobot.isLinux() && ideaVersionInt <= 20242) {
             cf = remoteRobot.find(CommonContainerFixture.class, byXpath(XPathDefinitions.LINUX_MAIN_MENU), Duration.ofSeconds(10));
@@ -96,7 +105,20 @@ private JButtonFixture mainMenuItem(String label) {
         } else {
             cf = remoteRobot.find(CommonContainerFixture.class, byXpath(XPathDefinitions.WINDOWS_MAIN_MENU_2020_2_AND_OLDER), Duration.ofSeconds(10));
         }
+        return cf;
+    }
 
-        return cf.button(byXpath(XPathDefinitions.label(label)), Duration.ofSeconds(10));
+    public void setVisible(){
+        // check menu already visible
+        try {
+            getMainMenu();
+        } catch (WaitForConditionTimeoutException e) {
+            // not visible
+            MainIdeWindow mainIdeWindow = remoteRobot.find(MainIdeWindow.class, Duration.ofSeconds(5));
+            mainIdeWindow.invokeCmdUsingSearchEverywherePopup("Appearance");
+            ComponentFixture appearanceDialog = remoteRobot.find(ComponentFixture.class, byXpath("//div[@class='JBViewport'][.//div[@class='MyList']]"));
+            List<RemoteText> items = appearanceDialog.findAllText();
+            items.stream().filter(remoteText -> remoteText.getText().equals("Main Menu")).findFirst().ifPresent(RemoteText::click);
+        }
     }
 }

src/test-project/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 plugins {
     id("java")
     id("jacoco")
-    id("org.jetbrains.intellij.platform") version ("2.2.1")
+    id("org.jetbrains.intellij.platform") version ("2.6.0")
 }
 
 group = "com.redhat.devtools.intellij"

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

@@ -41,6 +41,8 @@ class MenuBarTest extends AbstractLibraryBaseTest {
     @BeforeAll
     static void prepareProject() {
         CreateCloseUtils.createNewProject(remoteRobot, PROJECT_NAME, CreateCloseUtils.NewProjectType.PLAIN_JAVA);
+        //ensure main menu is visible
+        new MenuBar(remoteRobot).setVisible();
     }
 
     @AfterAll