Skip to content

Commit f8f010e

Browse files
sbouchetsbouchet
committed
chore: fix integration tests
Signed-off-by: Stephane Bouchet <[email protected]>
1 parent f9cd413 commit f8f010e

File tree

7 files changed

+31
-18
lines changed

7 files changed

+31
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.settings.SettingsDialog;
3232
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.settings.pages.NotificationsPage;
3333
import com.redhat.devtools.intellij.commonuitest.utils.constants.ButtonLabels;
34+
import com.redhat.devtools.intellij.commonuitest.utils.constants.ProjectLocation;
3435
import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions;
35-
import com.redhat.devtools.intellij.commonuitest.utils.project.CreateCloseUtils;
3636
import com.redhat.devtools.intellij.commonuitest.utils.steps.SharedSteps;
3737
import org.jetbrains.annotations.NotNull;
3838

@@ -109,7 +109,7 @@ public void clickOnLink(String label) {
109109
public void clearWorkspace() {
110110
// Remove projects on disk
111111
try {
112-
String pathToDirToMakeEmpty = CreateCloseUtils.PROJECT_LOCATION;
112+
String pathToDirToMakeEmpty = ProjectLocation.PROJECT_LOCATION;
113113
Path path = Paths.get(pathToDirToMakeEmpty);
114114
boolean doesProjectDirExists = Files.exists(path);
115115
if (doesProjectDirExists) {

‎src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/dialogs/project/pages/NewProjectFirstPage.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,20 +157,23 @@ public void setProjectSdkIfAvailable(String targetSdkName) {
157157
CommonContainerFixture parentFixture = waitFor(Duration.ofSeconds(20), Duration.ofSeconds(2), "Wait for the 'Project SDK' list to finish loading all items.", "The project JDK list did not load all items in 20 seconds.", this::didProjectSdkListLoadAllItems);
158158
JPopupMenuFixture projectSdkList = parentFixture.jPopupMenus(byXpath(XPathDefinitions.HEAVY_WEIGHT_WINDOW)).get(0); // issue https://github.com/JetBrains/intellij-ui-test-robot/issues/104
159159
List<String> sdkItems = projectSdkList.jList().collectItems();
160-
System.out.println("Items: " + sdkItems);
161160
Map<String, String> foundItems = new HashMap<>();
162161
sdkItems.forEach(item ->
163162
Arrays.stream(item.split(" ")).filter(s ->
164163
s.startsWith(targetSdkName)).findFirst().ifPresent(s -> foundItems.put(s, item))
165164
);
166165
if (!foundItems.isEmpty()) {
167166
String label = foundItems.values().stream().findFirst().get();
168-
System.out.println("About to click on "+label);
169167
projectSdkList.jList().clickItem(label, true);
170-
ScreenshotUtils.takeScreenshot(remoteRobot, "After click on "+ label);
168+
//ScreenshotUtils.takeScreenshot(remoteRobot);
169+
try {
170+
waitFor(Duration.ofSeconds(10), Duration.ofMillis(250), "HeavyWeightWindow still visible.", this::noHeavyWeightWindowVisible);
171+
} catch (WaitForConditionTimeoutException e) {
172+
// wait for "Resolving JDK..." dialog to disappear
173+
}
174+
//ScreenshotUtils.takeScreenshot(remoteRobot);
171175
} else {
172-
System.out.println("No SDK found starting with "+targetSdkName);
173-
ScreenshotUtils.takeScreenshot(remoteRobot);
176+
//ScreenshotUtils.takeScreenshot(remoteRobot, "No SDK found starting with " + targetSdkName);
174177
}
175178

176179
});

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.redhat.devtools.intellij.commonuitest.utils.constants;
2+
3+
import java.io.File;
4+
import java.util.Optional;
5+
6+
public class ProjectLocation {
7+
// For more info on testProjectLocation please check README
8+
public static final String PROJECT_LOCATION = Optional.ofNullable(System.getProperty("testProjectLocation"))
9+
.filter(s -> !s.isEmpty())
10+
.orElseGet(() -> System.getProperty("user.home") + File.separator + "IdeaProjects" + File.separator + "intellij-ui-test-projects");
11+
12+
}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.pages.NewProjectFirstPage;
2323
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.MainIdeWindow;
2424
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.idestatusbar.IdeStatusBar;
25+
import com.redhat.devtools.intellij.commonuitest.utils.constants.ProjectLocation;
2526
import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions;
2627

27-
import java.io.File;
2828
import java.time.Duration;
2929
import java.util.List;
30-
import java.util.Optional;
3130

3231
import static com.intellij.remoterobot.search.locators.Locators.byXpath;
3332
import static com.intellij.remoterobot.utils.RepeatUtilsKt.waitFor;
@@ -38,9 +37,6 @@
3837
* @author [email protected]
3938
*/
4039
public class CreateCloseUtils {
41-
public static final String PROJECT_LOCATION = Optional.ofNullable(System.getProperty("testProjectLocation")) // For more info on testProjectLocation please check README
42-
.filter(s -> !s.isEmpty())
43-
.orElseGet(() -> System.getProperty("user.home") + File.separator + "IdeaProjects" + File.separator + "intellij-ui-test-projects");
4440

4541
/**
4642
* Create new project with given project name according to given project type
@@ -76,7 +72,7 @@ public static void createNewProject(RemoteRobot remoteRobot, String projectName,
7672
newProjectFirstPage.getProjectNameTextField().click(); // Click to gain focus on newProjectFirstPage
7773

7874
newProjectFirstPage.setProjectName(projectName);
79-
newProjectFirstPage.setProjectLocation(PROJECT_LOCATION);
75+
newProjectFirstPage.setProjectLocation(ProjectLocation.PROJECT_LOCATION);
8076
} else {
8177
newProjectDialogWizard.next();
8278
// Plain java project has more pages in the 'New project' dialog
@@ -105,7 +101,7 @@ public static void createEmptyProject(RemoteRobot remoteRobot, String projectNam
105101
ensureEmptyProjectPageIsOpened(newProjectFirstPage, remoteRobot);
106102

107103
newProjectFirstPage.setProjectName(projectName);
108-
newProjectFirstPage.setProjectLocation(PROJECT_LOCATION);
104+
newProjectFirstPage.setProjectLocation(ProjectLocation.PROJECT_LOCATION);
109105

110106
newProjectDialogWizard.finish();
111107
waitAfterOpeningProject(remoteRobot);

‎src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/FlatWelcomeFrameTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import com.redhat.devtools.intellij.commonuitest.LibraryTestBase;
1717
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
1818
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.NewProjectDialogWizard;
19+
import com.redhat.devtools.intellij.commonuitest.utils.constants.ProjectLocation;
1920
import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions;
2021
import com.redhat.devtools.intellij.commonuitest.utils.internalerror.IdeInternalErrorUtils;
21-
import com.redhat.devtools.intellij.commonuitest.utils.project.CreateCloseUtils;
2222
import org.apache.commons.io.filefilter.FileFilterUtils;
2323
import org.junit.jupiter.api.AfterEach;
2424
import org.junit.jupiter.api.Test;
@@ -78,7 +78,7 @@ public void clearExceptionsTest() {
7878
}
7979

8080
private int getNumberOfProjectsOnDisk() {
81-
String pathToIdeaProjectsFolder = CreateCloseUtils.PROJECT_LOCATION;
81+
String pathToIdeaProjectsFolder = ProjectLocation.PROJECT_LOCATION;
8282
File[] files = new File(pathToIdeaProjectsFolder).listFiles((FileFilter) FileFilterUtils.directoryFileFilter());
8383
if (files != null) {
8484
return files.length;

‎src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/information/CodeWithMeDialogTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.pages.NewProjectFirstPage;
2020
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.MainIdeWindow;
2121
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.idestatusbar.IdeStatusBar;
22+
import com.redhat.devtools.intellij.commonuitest.utils.constants.ProjectLocation;
2223
import com.redhat.devtools.intellij.commonuitest.utils.project.CreateCloseUtils;
2324
import org.junit.jupiter.api.AfterAll;
2425
import org.junit.jupiter.api.BeforeAll;
@@ -48,7 +49,7 @@ public static void prepareProject() {
4849
newProjectFirstPage.selectNewProjectType("New Project");
4950
newProjectFirstPage.getProjectNameTextField().click(); // Click to gain focus on newProjectFirstPage
5051
newProjectFirstPage.setProjectName(PROJECT_NAME);
51-
newProjectFirstPage.setProjectLocation(CreateCloseUtils.PROJECT_LOCATION);
52+
newProjectFirstPage.setProjectLocation(ProjectLocation.PROJECT_LOCATION);
5253
newProjectFirstPage.setLanguage("Java");
5354
newProjectFirstPage.setBuildSystem("IntelliJ");
5455
newProjectFirstPage.setProjectSdkIfAvailable("17");

‎src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/mainidewindow/idestatusbar/IdeStatusBarTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.pages.NewProjectFirstPage;
2020
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.MainIdeWindow;
2121
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.idestatusbar.IdeStatusBar;
22+
import com.redhat.devtools.intellij.commonuitest.utils.constants.ProjectLocation;
2223
import com.redhat.devtools.intellij.commonuitest.utils.project.CreateCloseUtils;
2324
import com.redhat.devtools.intellij.commonuitest.utils.texttranformation.TextUtils;
2425
import org.junit.jupiter.api.AfterEach;
@@ -55,7 +56,7 @@ public void prepareProject() {
5556
newProjectFirstPage.selectNewProjectType("New Project");
5657
newProjectFirstPage.getProjectNameTextField().click(); // Click to gain focus on newProjectFirstPage
5758
newProjectFirstPage.setProjectName(PROJECT_NAME);
58-
newProjectFirstPage.setProjectLocation(CreateCloseUtils.PROJECT_LOCATION);
59+
newProjectFirstPage.setProjectLocation(ProjectLocation.PROJECT_LOCATION);
5960
newProjectFirstPage.selectNewProjectType("New Project");
6061
newProjectFirstPage.setBuildSystem("Maven");
6162
} else {

0 commit comments

Comments
 (0)