chore: bump minimal version to 2022.3, due to IJ gradle plugin 2.x used.

see https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#requirements

fixes #287

Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>

Author: sbouchet

.github/workflows/ci.yml

@@ -56,12 +56,6 @@ jobs:
 
     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:
@@ -104,12 +98,6 @@ jobs:
     runs-on: windows-latest
     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:
@@ -144,12 +132,6 @@ jobs:
     runs-on: macos-latest
     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:

.github/workflows/validate.yml

@@ -1,8 +1,6 @@
 name: Validate against IJ versions
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
     branches: [ main ]
 
@@ -13,29 +11,16 @@ jobs:
     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
+          # - 2024.3 is the current one
 
     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:

.gitignore

@@ -32,4 +32,5 @@ build/
 target/
 pom.xml
 
-/src/test-project/.intellijPlatform/self-update.lock
+/src/test-project/.intellijPlatform/
+/.intellijPlatform/

build.gradle.kts

@@ -18,6 +18,7 @@ repositories {
 
 dependencies {
     implementation(libs.kotlin.reflect)
+    implementation(libs.openapi)
     api(libs.junit.jupiter.api)
     api(libs.remote.robot)
     api(libs.remote.fixtures)

gradle/libs.versions.toml

@@ -3,6 +3,7 @@
 remote-robot = "0.11.23"
 kotlin = "2.1.0"
 junit-jupiter = "5.12.2"
+openapi = "7.0.3"
 
 # plugins
 sonarqube = "5.1.0.4882"
@@ -12,6 +13,7 @@ kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", vers
 junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter" }
 remote-robot = { group = "com.intellij.remoterobot", name = "remote-robot", version.ref = "remote-robot" }
 remote-fixtures = { group = "com.intellij.remoterobot", name = "remote-fixtures", version.ref = "remote-robot" }
+openapi = { group = "com.intellij", name = "openapi", version.ref = "openapi" }
 
 [plugins]
 sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }

src/main/java/com/redhat/devtools/intellij/commonuitest/UITestRunner.java

@@ -10,6 +10,7 @@
  ******************************************************************************/
 package com.redhat.devtools.intellij.commonuitest;
 
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.remoterobot.RemoteRobot;
 import com.intellij.remoterobot.stepsProcessing.StepLogger;
 import com.intellij.remoterobot.stepsProcessing.StepWorker;
@@ -47,7 +48,6 @@ public class UITestRunner {
     private static final String ACCEPTED_SOURCE_LOCATION = "accepted";
     private static final String COPY_ACCEPTED_FILE_STEP_DESCRIPTION = "Copy the 'accepted' file to the appropriate location";
     private static final Logger LOGGER = Logger.getLogger(UITestRunner.class.getName());
-    private static final String OS_NAME = System.getProperty("os.name").toLowerCase();
     private static final String USER_HOME = System.getProperty("user.home");
     private static final String NEW_ITEM_PROPERTY = "New-ItemProperty";
     private static final String NAME_PARAM = "-Name";
@@ -74,11 +74,10 @@ public static RemoteRobot runIde(IntelliJVersion ideaVersionUnderTest, int port)
         }
 
         return step("Start IntelliJ Idea ('" + ideaVersion + "') listening on port " + port, () -> {
-            System.setProperty("uitestlib.idea.version", Integer.toString(ideaVersion.toInt()));
 
             acceptAllTermsAndConditions();
 
-            String fileExtension = OS_NAME.contains("windows") ? ".bat" : "";
+            String fileExtension = SystemInfo.isWindows ? ".bat" : "";
             String platformVersion = generatePlatformVersion();
 
             ProcessBuilder pb = new ProcessBuilder("." + File.separator + "gradlew" + fileExtension, "runIdeForUiTests", "-PideaVersion=" + platformVersion, "-Drobot-server.port=" + port);
@@ -116,22 +115,13 @@ public static void closeIde() {
         ideProcess.destroy();
     }
 
-    /**
-     * Return the IdeaVersion representation of the currently running IntelliJ Idea version
-     *
-     * @return version of the currently running IntelliJ Idea
-     */
-    public static IntelliJVersion getIdeaVersion() {
-        return ideaVersion;
-    }
-
     /**
      * Return the integer representation of the currently running IntelliJ Idea version
      *
      * @return version of the currently running IntelliJ Idea
      */
     public static int getIdeaVersionInt() {
-        return getIdeaVersion().toInt();
+        return ideaVersion.toInt();
     }
 
     /**
@@ -172,7 +162,7 @@ private static void acceptAllTermsAndConditions() {
             linuxPrefsXmlSourceLocation = "prefs_xml/2022_1/prefs.xml";
         }
 
-        if (OS_NAME.contains("linux")) {
+        if (SystemInfo.isLinux) {
             step("Copy the 'prefs.xml' file to the appropriate location", () -> {
                 String prefsXmlDir = USER_HOME + "/.java/.userPrefs/jetbrains/_!(!!cg\"p!(}!}@\"j!(k!|w\"w!'8!b!\"p!':!e@==";
                 createDirectoryHierarchy(prefsXmlDir);
@@ -184,7 +174,7 @@ private static void acceptAllTermsAndConditions() {
                 createDirectoryHierarchy(acceptedDir);
                 copyFileFromJarResourceDir(ACCEPTED_SOURCE_LOCATION, acceptedDir + "/accepted");
             });
-        } else if (OS_NAME.contains("os x")) {
+        } else if (SystemInfo.isMac) {
             step("Copy the 'com.apple.java.util.prefs.plist' file to the appropriate location", () -> {
                 String plistDir = USER_HOME + "/Library/Preferences";
                 copyFileFromJarResourceDir(osxPlistSourceLocation, plistDir + "/com.apple.java.util.prefs.plist");
@@ -205,7 +195,7 @@ private static void acceptAllTermsAndConditions() {
                     Thread.currentThread().interrupt();
                 }
             });
-        } else if (OS_NAME.contains("windows")) {
+        } else if (SystemInfo.isWindows) {
             step(COPY_ACCEPTED_FILE_STEP_DESCRIPTION, () -> {
                 String acceptedDir = USER_HOME + "\\AppData\\Roaming\\JetBrains\\consentOptions";
                 createDirectoryHierarchy(acceptedDir);

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/dialogs/FlatWelcomeFrame.java

@@ -17,9 +17,7 @@
 import com.intellij.remoterobot.fixtures.ContainerFixture;
 import com.intellij.remoterobot.fixtures.DefaultXpath;
 import com.intellij.remoterobot.fixtures.FixtureName;
-import com.intellij.remoterobot.fixtures.HeavyWeightWindowFixture;
 import com.intellij.remoterobot.fixtures.JButtonFixture;
-import com.intellij.remoterobot.fixtures.JListFixture;
 import com.intellij.remoterobot.fixtures.JPopupMenuFixture;
 import com.intellij.remoterobot.fixtures.JTreeFixture;
 import com.intellij.remoterobot.utils.UtilsKt;
@@ -91,14 +89,7 @@ public void openProject(String projectName) {
      * @param label label of the link to click on
      */
     public void clickOnLink(String label) {
-        // Code for IntelliJ IDEA 2020.3 or newer
-        if (ideaVersionInt >= 20203) {
-            welcomeFrameLink(label).click();
-        }
-        // Code for IntelliJ IDEA 2020.2 or earlier
-        else {
-            actionLink(label).click();
-        }
+        welcomeFrameLink(label).click();
     }
 
     /**
@@ -134,11 +125,11 @@ public void clearWorkspace() {
     public void clearExceptions() {
         try {
             ideErrorsIcon().click();
-            find(IdeFatalErrorsDialog.class, Duration.ofSeconds(10)).clearAll();
+            find(IdeFatalErrorsDialog.class, Duration.ofSeconds(5)).clearAll();
         } catch (WaitForConditionTimeoutException e) {
             LOGGER.log(Level.INFO, "No fatal errors dialog found to clear.");
             try {
-                find(IdeFatalErrorsDialog.class, Duration.ofSeconds(10)).clearAll();
+                find(IdeFatalErrorsDialog.class, Duration.ofSeconds(5)).clearAll();
             } catch (Exception e2) {
                 LOGGER.log(Level.INFO, "Second attempt to clear fatal errors dialog also failed.");
             }
@@ -149,22 +140,18 @@ public void clearExceptions() {
      * Open the 'Preferences' dialog
      */
     public void openSettingsDialog() {
-        if (ideaVersionInt <= 20202) {
-            clickOnLink("Configure");
-            HeavyWeightWindowFixture heavyWeightWindowFixture = find(HeavyWeightWindowFixture.class, Duration.ofSeconds(5));
-            heavyWeightWindowFixture.findText("Preferences").click();
-        } else if (ideaVersionInt <= 20212) {
-            JListFixture jListFixture = remoteRobot.find(JListFixture.class, byXpath(XPathDefinitions.JBLIST));
-            jListFixture.clickItem("Customize", false);
-            remoteRobot.find(ContainerFixture.class, byXpath(XPathDefinitions.DIALOG_PANEL)).findText("All settings" + '\u2026').click();
-        } else {
-            JTreeFixture jTreeFixture = remoteRobot.find(JTreeFixture.class, byXpath(XPathDefinitions.TREE));
-            jTreeFixture.findText("Customize").click();
-            if (remoteRobot.isMac()) {
-                resizeWelcomeWindow();
-            }
-            remoteRobot.find(ContainerFixture.class, byXpath(XPathDefinitions.DIALOG_PANEL)).findText("All settings" + '\u2026').click();
+        JTreeFixture jTreeFixture;
+        try {
+            jTreeFixture = remoteRobot.find(JTreeFixture.class, byXpath(XPathDefinitions.TREE));
+        } catch (WaitForConditionTimeoutException e) {
+            // workaround for 2022.3
+            jTreeFixture = remoteRobot.find(JTreeFixture.class, byXpath("//div[@accessiblename='Welcome screen categories']"));
+        }
+        jTreeFixture.findText("Customize").click();
+        if (remoteRobot.isMac()) {
+            resizeWelcomeWindow();
         }
+        remoteRobot.find(ContainerFixture.class, byXpath(XPathDefinitions.DIALOG_PANEL)).findText("All settings" + '\u2026').click();
     }
 
     /**
@@ -204,25 +191,10 @@ private void resizeWelcomeWindow() {
      * @return fixture for the 'Tip Of the Day' dialog
      */
     public TipDialog openTipDialog() {
-        if (ideaVersionInt >= 20211) {
-            FlatWelcomeFrame flatWelcomeFrame = remoteRobot.find(FlatWelcomeFrame.class, Duration.ofSeconds(2));
-            if (ideaVersionInt >= 20223) {         //  COMMUNITY_V_2022_3 and higher version have different labels for Learn button
-                flatWelcomeFrame.findText(ButtonLabels.LEARN_LABEL).click();
-            } else {
-                flatWelcomeFrame.findText(ButtonLabels.LEARN_INTELLIJ_IDEA_LABEL).click();
-            }
-            SharedSteps.waitForComponentByXpath(remoteRobot, 2, 200, byXpath(XPathDefinitions.TIP_DIALOG_2));
-            flatWelcomeFrame.findText(TIP_OF_THE_DAY).click();
-        } else if (ideaVersionInt <= 20202) {
-            clickOnLink("Get Help");
-            HeavyWeightWindowFixture heavyWeightWindowFixture = find(HeavyWeightWindowFixture.class, Duration.ofSeconds(5));
-            heavyWeightWindowFixture.findText(TIP_OF_THE_DAY).click();
-        } else if (ideaVersionInt == 20203) {          // IJ 2020.3
-            actionLink("Help").click();
-            HeavyWeightWindowFixture heavyWeightWindowFixture = find(HeavyWeightWindowFixture.class, Duration.ofSeconds(5));
-            heavyWeightWindowFixture.findText(TIP_OF_THE_DAY).click();
-        }
-
+        FlatWelcomeFrame flatWelcomeFrame = remoteRobot.find(FlatWelcomeFrame.class, Duration.ofSeconds(2));
+        flatWelcomeFrame.findText(ButtonLabels.LEARN_LABEL).click();
+        SharedSteps.waitForComponentByXpath(remoteRobot, 2, 200, byXpath(XPathDefinitions.TIP_DIALOG_2));
+        flatWelcomeFrame.findText(TIP_OF_THE_DAY).click();
         return remoteRobot.find(TipDialog.class, Duration.ofSeconds(10));
     }
 
@@ -239,45 +211,26 @@ public void disableNotifications() {
         switchToProjectsPage();
     }
 
-    /**
-     * Prevent the 'Tip of the Day' dialog from opening after project import
-     */
-    public void preventTipDialogFromOpening() {
-        TipDialog tipDialog = openTipDialog();
-        tipDialog.dontShowTipsCheckBox().setValue(true);
-        tipDialog.close();
-        switchToProjectsPage();
-    }
-
     /**
      * Switch to the 'Projects' page of flat welcome frame
      */
     public void switchToProjectsPage() {
-        if (ideaVersionInt >= 20213) {
-            JTreeFixture jTreeFixture = remoteRobot.find(JTreeFixture.class, byXpath(XPathDefinitions.TREE));
-            jTreeFixture.findText(PROJECTS_BUTTON).click();
-        } else if (ideaVersionInt >= 20203) {
-            JListFixture jListFixture = remoteRobot.find(JListFixture.class, byXpath(XPathDefinitions.JBLIST));
-            jListFixture.clickItem(PROJECTS_BUTTON, false);
+        JTreeFixture jTreeFixture;
+        try {
+            jTreeFixture = remoteRobot.find(JTreeFixture.class, byXpath(XPathDefinitions.TREE));
+        } catch (WaitForConditionTimeoutException e) {
+            // workaround for 2022.3
+            jTreeFixture = remoteRobot.find(JTreeFixture.class, byXpath("//div[@accessiblename='Welcome screen categories']"));
         }
+        jTreeFixture.findText(PROJECTS_BUTTON).click();
     }
 
     private int projectsCount() {
-        if (ideaVersionInt >= 20222) {
-            try {
-                JTreeFixture projects = remoteRobot.findAll(JTreeFixture.class, byXpath(XPathDefinitions.RECENT_PROJECT_PANEL_NEW_2)).get(0);
-                return projects.findAllText().size() / 2;
-            } catch (IndexOutOfBoundsException e) {
-                return 0;
-            }
-        } else {
-            try {
-                ContainerFixture projectWrapper = find(ContainerFixture.class, byXpath(XPathDefinitions.RECENT_PROJECT_PANEL_NEW));
-                JListFixture projectList = projectWrapper.find(JListFixture.class, byXpath(XPathDefinitions.MY_LIST));
-                return projectList.collectItems().size();
-            } catch (WaitForConditionTimeoutException e) {
-                return 0;
-            }
+        try {
+            JTreeFixture projects = remoteRobot.findAll(JTreeFixture.class, byXpath(XPathDefinitions.RECENT_PROJECT_PANEL_NEW_2)).get(0);
+            return projects.findAllText().size() / 2;
+        } catch (IndexOutOfBoundsException e) {
+            return 0;
         }
     }
 
@@ -293,16 +246,11 @@ private JButtonFixture welcomeFrameLink(String label) {
     }
 
     private ComponentFixture ideErrorsIcon() {
-        return find(ComponentFixture.class, byXpath(XPathDefinitions.IDE_ERROR_ICON), Duration.ofSeconds(10));
+        return find(ComponentFixture.class, byXpath(XPathDefinitions.IDE_ERROR_ICON), Duration.ofSeconds(5));
     }
 
     private void removeTopProjectFromRecentProjects() {
-        ComponentFixture recentProjects;
-        if (ideaVersionInt >= 20222) {
-            recentProjects = remoteRobot.findAll(JTreeFixture.class, byXpath(XPathDefinitions.RECENT_PROJECT_PANEL_NEW_2)).get(0);
-        } else {
-            recentProjects = jLists(byXpath(XPathDefinitions.RECENT_PROJECTS)).get(0);
-        }
+        ComponentFixture recentProjects = remoteRobot.findAll(JTreeFixture.class, byXpath(XPathDefinitions.RECENT_PROJECT_PANEL_NEW_2)).get(0);
 
         // Clicks on X on first recent project to remove it from the recent projects list (visible only when hovered over with cursor)
         recentProjects.runJs("const horizontal_offset = component.getWidth()-22;\n" +
@@ -311,16 +259,12 @@ private void removeTopProjectFromRecentProjects() {
         if (ideaVersionInt >= 20231) {
             ComponentFixture removeDialog = remoteRobot.find(ComponentFixture.class, byXpath(XPathDefinitions.MY_DIALOG), Duration.ofSeconds(10));
             removeDialog.findText(ButtonLabels.REMOVE_FROM_LIST_LABEL).click();
-        } else if (ideaVersionInt >= 20203) {         // Code for IntelliJ Idea 2020.3 or newer
+        } else {
             List<JPopupMenuFixture> jPopupMenuFixtures = jPopupMenus(JPopupMenuFixture.Companion.byType());
             if (!jPopupMenuFixtures.isEmpty()) {
                 JPopupMenuFixture contextMenu = jPopupMenuFixtures.get(0);
-                if (ideaVersionInt >= 20222) {
-                    contextMenu.select("Remove from Recent Projects" + '\u2026');
-                    button(byXpath(XPathDefinitions.REMOVE_PROJECT_BUTTON)).click();
-                } else {
-                    contextMenu.select("Remove from Recent Projects");
-                }
+                contextMenu.select("Remove from Recent Projects" + '\u2026');
+                button(byXpath(XPathDefinitions.REMOVE_PROJECT_BUTTON)).click();
             }
         }
     }