Skip to content

Commit 9808e78

Browse files
authored
fix: IdeaProject folder getting cleared
fix: IdeaProject folder getting cleared
2 parents a8b70ff + 7336474 commit 9808e78

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.settings.pages.NotificationsPage;
2323
import com.redhat.devtools.intellij.commonuitest.utils.constants.ButtonLabels;
2424
import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions;
25+
import com.redhat.devtools.intellij.commonuitest.utils.project.CreateCloseUtils;
2526
import com.redhat.devtools.intellij.commonuitest.utils.runner.IntelliJVersion;
2627
import com.redhat.devtools.intellij.commonuitest.utils.steps.SharedSteps;
2728
import org.apache.commons.io.FileUtils;
@@ -100,12 +101,12 @@ public void clickOnLink(String label) {
100101
public void clearWorkspace() {
101102
// Remove projects on disk
102103
try {
103-
String pathToDirToMakeEmpty = System.getProperty("user.home") + File.separator + "IdeaProjects";
104+
String pathToDirToMakeEmpty = CreateCloseUtils.PROJECT_LOCATION;
104105
boolean doesProjectDirExists = Files.exists(Paths.get(pathToDirToMakeEmpty));
105106
if (doesProjectDirExists) {
106107
FileUtils.cleanDirectory(new File(pathToDirToMakeEmpty));
107108
} else {
108-
Files.createDirectory(Paths.get(pathToDirToMakeEmpty));
109+
Files.createDirectories(Paths.get(pathToDirToMakeEmpty));
109110
}
110111
} catch (IOException e) {
111112
LOGGER.log(Level.SEVERE, e.getMessage(), e);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ public static void prepareProject() {
4545

4646
if (UITestRunner.getIdeaVersionInt() >= 20221) {
4747
newProjectFirstPage.selectNewProjectType("New Project");
48+
newProjectFirstPage.getProjectNameTextField().click(); // Click to gain focus on newProjectFirstPage
4849
newProjectFirstPage.setProjectName(PROJECT_NAME);
50+
newProjectFirstPage.setProjectLocation(CreateCloseUtils.PROJECT_LOCATION);
4951
newProjectFirstPage.setLanguage("Java");
5052
newProjectFirstPage.setBuildSystem("IntelliJ");
5153
newProjectFirstPage.setProjectSdkIfAvailable("11");

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ public void prepareProject() {
5050
NewProjectFirstPage newProjectFirstPage = newProjectDialogWizard.find(NewProjectFirstPage.class, Duration.ofSeconds(10));
5151

5252
if (UITestRunner.getIdeaVersionInt() >= 20221) {
53+
newProjectFirstPage.selectNewProjectType("New Project");
54+
newProjectFirstPage.getProjectNameTextField().click(); // Click to gain focus on newProjectFirstPage
5355
newProjectFirstPage.setProjectName(PROJECT_NAME);
56+
newProjectFirstPage.setProjectLocation(CreateCloseUtils.PROJECT_LOCATION);
5457
newProjectFirstPage.selectNewProjectType("New Project");
5558
newProjectFirstPage.setBuildSystem("Maven");
5659
} else {

0 commit comments

Comments
 (0)