fix: Maven & Gradle tool windows wouldnt close on Intellij 2023.2

Signed-off-by: Martin Szuc <[email protected]>
redhat-developer · Jan 23, 2024 · 44e7c2a · 44e7c2a
1 parent df72496
commit 44e7c2a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...ols/intellij/commonuitest/fixtures/mainidewindow/toolwindowspane/AbstractToolWinPane.java b/...ols/intellij/commonuitest/fixtures/mainidewindow/toolwindowspane/AbstractToolWinPane.java
@@ -99,7 +99,11 @@ public void closeGradleBuildToolPane() {
     public JButtonFixture stripeButton(String label, boolean isPaneOpened) {
         if (isPaneOpened) {
             if (label.equals(ButtonLabels.MAVEN_STRIPE_BUTTON_LABEL) || label.equals(ButtonLabels.GRADLE_STRIPE_BUTTON_LABEL)) {
-                return button(byXpath(XPathDefinitions.toolWindowSvg(label)), Duration.ofSeconds(2));
+                if (UITestRunner.getIdeaVersionInt() >= 20232) {
+                    return button(byXpath(XPathDefinitions.toolWindowButton(label)), Duration.ofSeconds(2));
+                } else {
+                    return button(byXpath(XPathDefinitions.toolWindowSvg(label)), Duration.ofSeconds(2));
+                }
             } else if (label.equals(ButtonLabels.PROJECT_STRIPE_BUTTON_LABEL)) {
                 return button(byXpath(XPathDefinitions.TOOLTIP_TEXT_PROJECT), Duration.ofSeconds(2));
             }

diff --git a/...main/java/com/redhat/devtools/intellij/commonuitest/utils/constants/XPathDefinitions.java b/...main/java/com/redhat/devtools/intellij/commonuitest/utils/constants/XPathDefinitions.java
@@ -106,4 +106,8 @@ public static String nonOpaquePanel(String label) {
     public static String toolWindowSvg(String label) {
         return "//div[@disabledicon='toolWindow" + label + ".svg']";
     }
+
+    public static String toolWindowButton(String label) {
+        return "//div[@tooltiptext='" + label + "']";
+    }
 }