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/dialogs/navigation/SearchEverywherePopup.java

@@ -67,11 +67,21 @@ public void activateTab(String tabName) {
      * @param cmdToEnter command that will be invoked using the search field
      */
     public void invokeCmd(String cmdToEnter) {
+        invokeSearch(cmdToEnter, true);
+    }
+
+    public void searchText(String searchString){
+        invokeSearch(searchString, false);
+    }
+
+    private void invokeSearch(String searchText, boolean invoke){
         JTextFieldFixture searchField = textField(JTextFieldFixture.Companion.byType(), Duration.ofSeconds(2));
         searchField.click();
-        searchField.setText(cmdToEnter);
-        waitFor(Duration.ofSeconds(30), Duration.ofSeconds(1), "the search dialog in the Search Everywhere popup to load in 30 seconds.", () -> didSearchFinish(cmdToEnter));
-        new Keyboard(remoteRobot).hotKey(KeyEvent.VK_ENTER);
+        searchField.setText(searchText);
+        waitFor(Duration.ofSeconds(30), Duration.ofSeconds(1), "the search dialog in the Search Everywhere popup to load in 30 seconds.", () -> didSearchFinish(searchText));
+        if(invoke){
+            new Keyboard(remoteRobot).hotKey(KeyEvent.VK_ENTER);
+        }
     }
 
     private boolean didSearchFinish(String cmdToInvoke) {

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

@@ -98,6 +98,11 @@ public void invokeCmdUsingSearchEverywherePopup(String cmdToInvoke) {
         searchEverywherePopup.invokeCmd(cmdToInvoke);
     }
 
+    public void searchEverywhere(String searchString) {
+        SearchEverywherePopup searchEverywherePopup = openSearchEverywherePopup();
+        searchEverywherePopup.searchText(searchString);
+    }
+
     private SearchEverywherePopup openSearchEverywherePopup() {
         try {
             find(ActionButtonFixture.class, byXpath("//div[@myicon='search.svg']"), Duration.ofSeconds(5)).click();

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

@@ -116,11 +116,11 @@ public void setVisible(){
         } catch (WaitForConditionTimeoutException e) {
             // not visible
             MainIdeWindow mainIdeWindow = remoteRobot.find(MainIdeWindow.class, Duration.ofSeconds(5));
-            mainIdeWindow.invokeCmdUsingSearchEverywherePopup("Appearance");
+            mainIdeWindow.searchEverywhere("Appearance");
             ScreenshotUtils.takeScreenshot(remoteRobot);
             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);
+            items.stream().filter(remoteText -> remoteText.getText().equals("View | Appearance: Main Menu")).findFirst().ifPresent(RemoteText::click);
         }
     }
 }

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

@@ -41,6 +41,8 @@
  */
 public class CreateCloseUtils {
 
+    static final int ideaVersionInt = UITestRunner.getIdeaVersionInt();
+
     /**
      * Create new project with given project name according to given project type
      *
@@ -52,8 +54,6 @@ public static void createNewProject(RemoteRobot remoteRobot, String projectName,
         NewProjectDialogWizard newProjectDialogWizard = openNewProjectDialogFromWelcomeDialog(remoteRobot);
         NewProjectFirstPage newProjectFirstPage = newProjectDialogWizard.find(NewProjectFirstPage.class, Duration.ofSeconds(10));
 
-        final int ideaVersionInt = UITestRunner.getIdeaVersionInt();
-
         if (ideaVersionInt >= 20221) {
             newProjectFirstPage.selectNewProjectType("New Project");
             newProjectFirstPage.setLanguage("Java");
@@ -121,8 +121,10 @@ 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();
-        MainIdeWindow mainIdeWindow = remoteRobot.find(MainIdeWindow.class, Duration.ofSeconds(5));
-        mainIdeWindow.maximizeIdeWindow();
+        if (ideaVersionInt > 20233) {
+            MainIdeWindow mainIdeWindow = remoteRobot.find(MainIdeWindow.class, Duration.ofSeconds(5));
+            mainIdeWindow.maximizeIdeWindow();
+        }
         ideStatusBar.waitUntilAllBgTasksFinish(500);
         CodeWithMeDialog.closeCodeWithMePopupIfItAppears(remoteRobot);
         //ensure main menu is visible