Skip to content

Commit 2160b5c

Browse files
sbouchetsbouchet
committed
chore: fix sonar issues
Signed-off-by: Stephane Bouchet <[email protected]>
1 parent 6095643 commit 2160b5c

File tree

8 files changed

+51
-30
lines changed

8 files changed

+51
-30
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,18 +162,16 @@ public void openSettingsDialog() {
162162
JTreeFixture jTreeFixture = remoteRobot.find(JTreeFixture.class, byXpath(XPathDefinitions.TREE));
163163
jTreeFixture.findText("Customize").click();
164164
if (remoteRobot.isMac()) {
165-
resizeWelcomeWindow(900);
165+
resizeWelcomeWindow();
166166
}
167167
remoteRobot.find(ContainerFixture.class, byXpath(XPathDefinitions.DIALOG_PANEL)).findText("All settings" + '\u2026').click();
168168
}
169169
}
170170

171171
/**
172172
* Resize the Welcome to IntelliJ IDEA window
173-
*
174-
* @param newHeight Integer of new height to use
175173
*/
176-
private void resizeWelcomeWindow(int newHeight) {
174+
private void resizeWelcomeWindow() {
177175
try {
178176
remoteRobot.callJs(String.format("""
179177
importClass(java.awt.Frame);
@@ -192,7 +190,7 @@ private void resizeWelcomeWindow(int newHeight) {
192190
}
193191
}
194192
resized;
195-
""", newHeight));
193+
""", 900));
196194
Thread.sleep(5000);
197195
} catch (Exception e) {
198196
LOGGER.log(Level.WARNING, "Failed to resize the Welcome window: {0}", e.getMessage());

‎src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/toolwindowspane/AbstractToolWinPane.java‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,9 @@ protected AbstractToolWinPane(@NotNull RemoteRobot remoteRobot, @NotNull RemoteC
4343

4444
/**
4545
* Open project explorer
46-
*
47-
* @return the Project Explorer fixture
4846
*/
49-
public ProjectExplorer openProjectExplorer() {
50-
return togglePane(ButtonLabels.PROJECT_STRIPE_BUTTON_LABEL, ProjectExplorer.class, true);
47+
public void openProjectExplorer() {
48+
togglePane(ButtonLabels.PROJECT_STRIPE_BUTTON_LABEL, ProjectExplorer.class, true);
5149
}
5250

5351
/**
@@ -59,11 +57,9 @@ public void closeProjectExplorer() {
5957

6058
/**
6159
* Open maven build tool pane
62-
*
63-
* @return the Maven Build Tool Pane fixture
6460
*/
65-
public MavenBuildToolPane openMavenBuildToolPane() {
66-
return togglePane(ButtonLabels.MAVEN_STRIPE_BUTTON_LABEL, MavenBuildToolPane.class, true);
61+
public void openMavenBuildToolPane() {
62+
togglePane(ButtonLabels.MAVEN_STRIPE_BUTTON_LABEL, MavenBuildToolPane.class, true);
6763
}
6864

6965
/**
@@ -75,11 +71,9 @@ public void closeMavenBuildToolPane() {
7571

7672
/**
7773
* Open gradle build tool pane
78-
*
79-
* @return the Gradle Build Tool Pane fixture
8074
*/
81-
public GradleBuildToolPane openGradleBuildToolPane() {
82-
return togglePane(ButtonLabels.GRADLE_STRIPE_BUTTON_LABEL, GradleBuildToolPane.class, true);
75+
public void openGradleBuildToolPane() {
76+
togglePane(ButtonLabels.GRADLE_STRIPE_BUTTON_LABEL, GradleBuildToolPane.class, true);
8377
}
8478

8579
/**
@@ -111,14 +105,12 @@ public JButtonFixture stripeButton(String label, boolean isPaneOpened) {
111105
return button(byXpath(XPathDefinitions.label(label)), Duration.ofSeconds(2));
112106
}
113107

114-
protected <T extends Fixture> T togglePane(String label, Class<T> fixtureClass, boolean openPane) {
108+
protected void togglePane(String label, Class<? extends Fixture> fixtureClass, boolean openPane) {
115109
if ((!isPaneOpened(fixtureClass) && openPane)) {
116110
clickOnStripeButton(label, false);
117-
return find(fixtureClass, Duration.ofSeconds(10));
118111
} else if (isPaneOpened(fixtureClass) && !openPane) {
119112
clickOnStripeButton(label, true);
120113
}
121-
return null;
122114
}
123115

124116
private boolean isPaneOpened(Class<? extends Fixture> fixtureClass) {

‎src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/toolwindowspane/ToolWindowRightToolbar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
@DefaultXpath(by = "ToolWindowRightToolbar type", xpath = "//div[@class='ToolWindowRightToolbar']")
1717
@FixtureName(name = "Tool Window Right Toolbar")
18-
public class ToolWindowRightToolbar extends CommonContainerFixture {
18+
public class ToolWindowRightToolbar extends CommonContainerFixture {
1919

2020
public ToolWindowRightToolbar(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComponent remoteComponent) {
2121
super(remoteRobot, remoteComponent);

‎src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/toolwindowspane/buildtoolpane/GradleBuildToolPane.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,6 @@ public JTreeFixture gradleTaskTree() {
109109

110110
private boolean isGradleTreeVisible() {
111111
String treeContent = TextUtils.listOfRemoteTextToString(gradleTaskTree().findAllText());
112-
return !treeContent.toLowerCase(Locale.ROOT).contains("nothing") && !treeContent.equals("");
112+
return !treeContent.toLowerCase(Locale.ROOT).contains("nothing") && !treeContent.isEmpty();
113113
}
114114
}

‎src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/toolwindowspane/buildtoolpane/MavenBuildToolPane.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,6 @@ public JTreeFixture mavenTargetTree() {
9393

9494
private boolean isMavenTreeVisible() {
9595
String treeContent = TextUtils.listOfRemoteTextToString(mavenTargetTree().findAllText());
96-
return !treeContent.toLowerCase(Locale.ROOT).contains("nothing") && !treeContent.equals("");
96+
return !treeContent.toLowerCase(Locale.ROOT).contains("nothing") && !treeContent.isEmpty();
9797
}
9898
}

‎src/main/java/com/redhat/devtools/intellij/commonuitest/utils/constants/XPathDefinitions.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,15 @@ public class XPathDefinitions {
2525
public static final String BUILD_VIEW = "//div[@class='BuildView']";
2626
public static final String MAVEN_TOOL_WINDOW = "//div[@accessiblename='Maven Tool Window']";
2727
public static final String GRADLE_TOOL_WINDOW = "//div[@accessiblename='Gradle Tool Window']";
28+
@Language("XPath")
2829
public static final String LINUX_MAIN_MENU = "//div[@class='LinuxIdeMenuBar']";
30+
@Language("XPath")
2931
public static final String WINDOWS_MAIN_MENU_2024_1_AND_NEWER = "//div[@class='IdeJMenuBar']";
32+
@Language("XPath")
3033
public static final String WINDOWS_MAIN_MENU_2022_2_TO_2023_2 = "//div[@class='IdeMenuBar']";
34+
@Language("XPath")
3135
public static final String WINDOWS_MAIN_MENU_2020_3_TO_2022_1 = "//div[@class='MenuFrameHeader']";
36+
@Language("XPath")
3237
public static final String WINDOWS_MAIN_MENU_2020_2_AND_OLDER = "//div[@class='CustomHeaderMenuBar']";
3338
public static final String IDE_STATUS_BAR = "//div[@class='IdeStatusBarImpl']";
3439
@Language("XPath")
@@ -38,6 +43,7 @@ public class XPathDefinitions {
3843
@Language("XPath")
3944
public static final String FLAT_WELCOME_FRAME = "//div[@class='FlatWelcomeFrame']";
4045
public static final String NEW_PROJECT_DIALOG_WIZARD = "//div[@accessiblename='New Project' and @class='MyDialog']";
46+
@Language("XPath")
4147
public static final String DIALOG_ROOT_PANE = "//div[@class='DialogRootPane']";
4248
public static final String SEARCH_EVERYWHERE_POPUP = "//div[@accessiblename='Search everywhere' and @class='SearchEverywhereUI']";
4349
public static final String IDE_FATAL_ERRORS_DIALOG = "//div[@accessiblename='IDE Fatal Errors' and @class='MyDialog']";
@@ -53,7 +59,9 @@ public class XPathDefinitions {
5359
public static final String RECENT_PROJECT_PANEL_NEW_2 = "//div[@class='JBViewport']/*";
5460
@Language("XPath")
5561
public static final String IDE_ERROR_ICON = "//div[@class='IdeErrorsIcon']";
62+
@Language("XPath")
5663
public static final String BUILD_VIEW_EDITOR = "//div[@accessiblename='Editor']";
64+
@Language("XPath")
5765
public static final String JCOMBOBOX = "//div[@class='JComboBox']";
5866
@Language("XPath")
5967
public static final String MORE_SETTINGS_TITLED_SEPARATOR = "//div[@class='TitledSeparator']/../../*";
@@ -69,21 +77,35 @@ public class XPathDefinitions {
6977
public static final String MY_DIALOG = "//div[@class='MyDialog']";
7078
@Language("XPath")
7179
public static final String TREE = "//div[@class='Tree']";
80+
@Language("XPath")
7281
public static final String TOOLTIP_TEXT_PROJECT = "//div[@tooltiptext='Project']";
82+
@Language("XPath")
7383
public static final String TOOLTIP_TEXT_HIDE = "//div[contains(@myvisibleactions, 'View),')]//div[@tooltiptext='Hide']";
84+
@Language("XPath")
7485
public static final String MAIN_MENU = "//div[@tooltiptext='Main Menu']";
86+
@Language("XPath")
7587
public static final String MY_ICON_GEAR_PLAIN = "//div[contains(@myvisibleactions, 'View),')]//div[@myicon='gearPlain.svg']";
88+
@Language("XPath")
7689
public static final String MY_ICON_MORE_VERTICAL = "//div[@myicon='moreVertical.svg']";
90+
@Language("XPath")
7791
public static final String MY_ICON_COLLAPSE_ALL = "//div[contains(@myvisibleactions, 'View),')]//div[@myicon='collapseall.svg']";
92+
@Language("XPath")
7893
public static final String MY_ICON_COLLAPSE_ALL_2024_2 = "//div[@myicon='collapseAll.svg']";
94+
@Language("XPath")
7995
public static final String MY_ICON_COLLAPSE_ALL_FOR = "//div[contains(@myvisibleactions, 'For')]//div[@myicon='collapseall.svg']";
96+
@Language("XPath")
8097
public static final String MY_ICON_COLLAPSE_ALL_IDE = "//div[contains(@myvisibleactions, 'IDE')]//div[@myicon='collapseall.svg']";
98+
@Language("XPath")
8199
public static final String MY_ICON_EXPAND_ALL = "//div[contains(@myvisibleactions, 'View),')]//div[@myicon='expandall.svg']";
100+
@Language("XPath")
82101
public static final String MY_ICON_EXPAND_ALL_2024_2 = "//div[@myicon='expandAll.svg']";
102+
@Language("XPath")
83103
public static final String MY_ICON_EXPAND_ALL_IDE = "//div[contains(@myvisibleactions, 'IDE')]//div[@myicon='expandall.svg']";
84104
@Language("XPath")
85105
public static final String MY_ICON_LOCATE_SVG = "//div[@myicon='locate.svg']";
106+
@Language("XPath")
86107
public static final String MY_ICON_REFRESH = "//div[@myicon='refresh.svg']";
108+
@Language("XPath")
87109
public static final String CONTENT_COMBO_LABEL = "//div[@class='ContentComboLabel']";
88110
@Language("XPath")
89111
public static final String JBLIST = "//div[@class='JBList']";
@@ -98,10 +120,15 @@ public class XPathDefinitions {
98120
public static final String EMPTY_PROJECT = "//div[@visible_text='Empty Project']";
99121
@Language("XPath")
100122
public static final String SINGLE_HEIGHT_LABEL = "//div[@class='SingleHeightLabel']";
123+
@Language("XPath")
101124
public static final String COLLAPSIBLE_TITLED_SEPARATOR = "//div[@class='CollapsibleTitledSeparator']";
125+
@Language("XPath")
102126
public static final String COLLAPSIBLE_TITLED_SEPARATOR_NEW = "//div[@class='CollapsibleTitledSeparatorImpl']";
127+
@Language("XPath")
103128
public static final String COLLAPSIBLE_TITLED_SEPARATOR_SIBLINGS = COLLAPSIBLE_TITLED_SEPARATOR + "/../*";
129+
@Language("XPath")
104130
public static final String COLLAPSIBLE_TITLED_SEPARATOR_NEW_SIBLINGS = COLLAPSIBLE_TITLED_SEPARATOR_NEW + "/../*";
131+
@Language("XPath")
105132
public static final String EXTENDABLE_TEXT_FIELD = "//div[@class='ExtendableTextField']";
106133
@Language("XPath")
107134
public static final String JBTEXT_FIELD = "//div[@class='JBTextField']";
@@ -113,9 +140,13 @@ public class XPathDefinitions {
113140
public static final String SET_BUILD_SYSTEM = "//div[@class='SegmentedButtonComponent'][.//div[@action.key='buildsystem.type.intellij']]";
114141
@Language("XPath")
115142
public static final String SET_BUILD_SYSTEM_2024_2_AND_NEWER = "//div[@accessiblename='Build system:' and @class='SegmentedButtonComponent']"; // works for IntelliJ Idea 2024.1 and higher
143+
@Language("XPath")
116144
public static final String GET_SET_MODULE_NAME = "//div[@accessiblename='Module name:' and @class='JBTextField']";
145+
@Language("XPath")
117146
public static final String GET_SET_MODULE_NAME_2024_2_AND_NEWER = "//div[@accessiblename='Module name:' and @class='JBTextField']";
147+
@Language("XPath")
118148
public static final String GET_SET_CONTENT_ROOT = "//div[@accessiblename='Content root:' and @class='ExtendableTextField']";
149+
@Language("XPath")
119150
public static final String GET_SET_MODULE_FILE_LOCATION = "//div[@accessiblename='Module file location:' and @class='ExtendableTextField']";
120151
@Language("XPath")
121152
public static final String CREATE_NEW_PROJECT = "//div[@defaulticon='createNewProjectTab.svg']"; // works for IntelliJ Idea 2024.1 and higher

‎src/main/java/com/redhat/devtools/intellij/commonuitest/utils/runner/IntelliJVersion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public enum IntelliJVersion {
2626
COMMUNITY_V_2022_3("IC-2022.3"),
2727
COMMUNITY_V_2023_1("IC-2023.1"),
2828
COMMUNITY_V_2023_2("IC-2023.2"),
29-
COMMUNITY_V_2023_3("IC-2023.2"),
29+
COMMUNITY_V_2023_3("IC-2023.3"),
3030
COMMUNITY_V_2024_1("IC-2024.1"),
3131
COMMUNITY_V_2024_2("IC-2024.2"),
3232
COMMUNITY_V_2024_3("IC-2024.3");

‎src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/mainidewindow/toolwindowspane/openclose/AbstractToolWinPane.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ protected static boolean isPaneOpened(Class<? extends CommonContainerFixture> fi
5858

5959
protected void closePane(String label, Class<? extends CommonContainerFixture> fixtureClass) {
6060
if (isPaneOpened(fixtureClass)) {
61-
clickOnStripeButton(label, true);
61+
clickOnStripeButton(label);
6262
}
6363
}
6464

65-
protected void clickOnStripeButton(String label, boolean isPaneOpened) {
66-
waitFor(Duration.ofSeconds(30), Duration.ofSeconds(2), "The '" + label + "' stripe button is not available.", () -> isStripeButtonAvailable(label, isPaneOpened));
65+
protected void clickOnStripeButton(String label) {
66+
waitFor(Duration.ofSeconds(30), Duration.ofSeconds(2), "The '" + label + "' stripe button is not available.", () -> isStripeButtonAvailable(label));
6767

6868
if (UITestRunner.getIdeaVersionInt() >= 20242) { // For IntelliJ IDEA 2024.2 and newer
6969
if (isRightToolbarButton(label)) {
@@ -74,11 +74,11 @@ protected void clickOnStripeButton(String label, boolean isPaneOpened) {
7474
toolWindowLeftToolbar.clickStripeButton(label);
7575
}
7676
} else { // For older versions
77-
toolWinPane.stripeButton(label, isPaneOpened).click();
77+
toolWinPane.stripeButton(label, true).click();
7878
}
7979
}
8080

81-
protected boolean isStripeButtonAvailable(String label, boolean isPaneOpened) {
81+
protected boolean isStripeButtonAvailable(String label) {
8282
try {
8383
if (UITestRunner.getIdeaVersionInt() >= 20242) { // For IntelliJ IDEA 2024.2 and newer
8484
if (isRightToolbarButton(label)) {
@@ -89,7 +89,7 @@ protected boolean isStripeButtonAvailable(String label, boolean isPaneOpened) {
8989
toolWindowLeftToolbar.findStripeButton(label);
9090
}
9191
} else { // For older versions
92-
toolWinPane.stripeButton(label, isPaneOpened);
92+
toolWinPane.stripeButton(label, true);
9393
}
9494
return true;
9595
} catch (WaitForConditionTimeoutException e) {

0 commit comments

Comments
 (0)