fix: fix for 2023.3 use case

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

Author: sbouchet

.github/workflows/ci.yml

@@ -179,3 +179,70 @@ jobs:
           name: macos-steplogger-logs
           path: src/test-project/build/test-results/*
         if: always()
+
+  validate_versions:
+    runs-on: ubuntu-latest
+    needs: run_on_linux
+    strategy:
+      matrix:
+        IJ:
+          - 2020.2
+          - 2020.3
+          - 2021.1
+          - 2021.2
+          - 2021.3
+          - 2022.1
+          - 2022.2
+          - 2022.3
+          - 2023.1
+          - 2023.2
+          - 2023.3
+          - 2024.1
+          - 2024.2
+          - 2024.3
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11 # Java 11 is only used for test NewProjectDialogTest/setProjectSdkIfAvailableTest
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'temurin'
+          cache: 'gradle'
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'temurin'
+          cache: 'gradle'
+      - name: Run integration tests
+        run: |
+          cd src/test-project
+          xvfb-run --server-args="-screen 0 1920x1080x24" ./gradlew integrationUITest --warning-mode none -PcommunityIdeaVersion=${{ matrix.IJ }}
+      - name: Archiving tests reports
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-test-reports
+          path: src/test-project/build/reports/tests/*
+        if: always()
+      - name: Archiving screenshots
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-screenshots
+          path: src/test-project/build/screenshots/*
+          if-no-files-found: ignore
+        if: always()
+      - name: Archiving StepLogger logs
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-steplogger-logs
+          path: src/test-project/build/test-results/*
+        if: always()
+      - name: Archiving coverage for sonar
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: sonar-coverage
+          path: |
+            src/test-project/build/test-results/**/*.xml
+            src/test-project/build/jacoco/

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

@@ -26,6 +26,7 @@
 
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
 
 import static com.intellij.remoterobot.search.locators.Locators.byXpath;
 import static com.intellij.remoterobot.utils.RepeatUtilsKt.waitFor;
@@ -66,7 +67,7 @@ public void navigateTo(String... path) {
 
             // Wait for the JPopupMenuFixture to appear
             waitFor(Duration.ofSeconds(5), Duration.ofSeconds(1), "JPopupMenu to appear", () ->
-                    !remoteRobot.findAll(JPopupMenuFixture.class, JPopupMenuFixture.Companion.byType()).isEmpty()
+                !remoteRobot.findAll(JPopupMenuFixture.class, JPopupMenuFixture.Companion.byType()).isEmpty()
             );
         }
 
@@ -109,18 +110,22 @@ public CommonContainerFixture getMainMenu() {
         return cf;
     }
 
-    public void setVisible(){
+    public void setVisible() {
         // check menu already visible
         try {
             getMainMenu();
         } catch (WaitForConditionTimeoutException e) {
             // not visible
             MainIdeWindow mainIdeWindow = remoteRobot.find(MainIdeWindow.class, Duration.ofSeconds(5));
             mainIdeWindow.searchEverywhere("Appearance");
-            ScreenshotUtils.takeScreenshot(remoteRobot);
-            ComponentFixture appearanceDialog = remoteRobot.find(ComponentFixture.class, byXpath("//div[@class='JBViewport'][.//div[@class='MyList']]"));
+            ComponentFixture appearanceDialog = remoteRobot.find(ComponentFixture.class, byXpath("//div[@class='SearchEverywhereUI']"));
             List<RemoteText> items = appearanceDialog.findAllText();
-            items.stream().filter(remoteText -> remoteText.getText().equals("View | Appearance: Main Menu")).findFirst().ifPresent(RemoteText::click);
+            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");
+            }
         }
     }
 }