From c922b26f52f3590f8d15ff52be037ca8e3d38866 Mon Sep 17 00:00:00 2001 From: sskoryk Date: Fri, 25 May 2018 14:22:25 +0300 Subject: [PATCH 1/4] add checking use cases from #8674 issue to CreateAndDeleteProjectsTest --- .../dashboard/CreateAndDeleteProjectsTest.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java index 70bddaf63ca..5a116f8dcf6 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java @@ -17,7 +17,6 @@ import static org.eclipse.che.selenium.pageobject.dashboard.workspaces.WorkspaceDetails.TabNames.PROJECTS; import com.google.inject.Inject; -import java.util.concurrent.ExecutionException; import org.eclipse.che.selenium.core.SeleniumWebDriver; import org.eclipse.che.selenium.core.TestGroup; import org.eclipse.che.selenium.core.client.TestWorkspaceServiceClient; @@ -44,7 +43,8 @@ @Test(groups = TestGroup.OSIO) public class CreateAndDeleteProjectsTest { - private final String WORKSPACE = generate("workspace", 4); + private static final String WORKSPACE = generate("workspace", 4); + private static final String SECOND_PROJECT_NAME = WEB_JAVA_SPRING + "-1"; @Inject private Dashboard dashboard; @Inject private WorkspaceProjects workspaceProjects; @@ -74,7 +74,7 @@ public void tearDown() throws Exception { } @Test - public void createAndDeleteProjectTest() throws ExecutionException, InterruptedException { + public void createAndDeleteProjectTest() { dashboard.waitDashboardToolbarTitle(); dashboard.selectWorkspacesItemOnDashboard(); workspaces.clickOnAddWorkspaceBtn(); @@ -88,12 +88,16 @@ public void createAndDeleteProjectTest() throws ExecutionException, InterruptedE projectSourcePage.selectSample(WEB_JAVA_SPRING); projectSourcePage.selectSample(CONSOLE_JAVA_SIMPLE); projectSourcePage.clickOnAddProjectButton(); + projectSourcePage.clickOnAddOrImportProjectButton(); + projectSourcePage.selectSample(WEB_JAVA_SPRING); + projectSourcePage.clickOnAddProjectButton(); newWorkspace.clickOnCreateButtonAndOpenInIDE(); String dashboardWindow = seleniumWebDriverHelper.switchToIdeFrameAndWaitAvailability(); toastLoader.waitToastLoaderAndClickStartButton(); ide.waitOpenedWorkspaceIsReadyToUse(); + explorer.waitItem(WEB_JAVA_SPRING); explorer.waitItem(CONSOLE_JAVA_SIMPLE); notificationsPopupPanel.waitPopupPanelsAreClosed(); mavenPluginStatusBar.waitClosingInfoPanel(); @@ -110,6 +114,7 @@ public void createAndDeleteProjectTest() throws ExecutionException, InterruptedE workspaceProjects.openSettingsForProjectByName(WEB_JAVA_SPRING); workspaceProjects.clickOnDeleteProject(); workspaceProjects.clickOnDeleteItInDialogWindow(); + workspaceProjects.waitProjectIsPresent(SECOND_PROJECT_NAME); workspaceProjects.waitProjectIsNotPresent(WEB_JAVA_SPRING); workspaceProjects.openSettingsForProjectByName(CONSOLE_JAVA_SIMPLE); workspaceProjects.clickOnDeleteProject(); From 4f071eae121ff12a389ff14467b23de107c7d931 Mon Sep 17 00:00:00 2001 From: sskoryk Date: Thu, 31 May 2018 14:59:56 +0300 Subject: [PATCH 2/4] add comments --- .../dashboard/CreateAndDeleteProjectsTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java index 5a116f8dcf6..af3053261dd 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java @@ -29,7 +29,6 @@ import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.ToastLoader; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; -import org.eclipse.che.selenium.pageobject.dashboard.NavigationBar; import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace; import org.eclipse.che.selenium.pageobject.dashboard.ProjectSourcePage; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.WorkspaceDetails; @@ -44,12 +43,11 @@ public class CreateAndDeleteProjectsTest { private static final String WORKSPACE = generate("workspace", 4); - private static final String SECOND_PROJECT_NAME = WEB_JAVA_SPRING + "-1"; + private static final String SECOND_WEB_JAVA_SPRING_PROJECT_NAME = WEB_JAVA_SPRING + "-1"; @Inject private Dashboard dashboard; @Inject private WorkspaceProjects workspaceProjects; @Inject private WorkspaceDetails workspaceDetails; - @Inject private NavigationBar navigationBar; @Inject private NewWorkspace newWorkspace; @Inject private ProjectSourcePage projectSourcePage; @Inject private ProjectExplorer explorer; @@ -93,18 +91,22 @@ public void createAndDeleteProjectTest() { projectSourcePage.clickOnAddProjectButton(); newWorkspace.clickOnCreateButtonAndOpenInIDE(); + // switch to the IDE and wait for workspace is ready to use String dashboardWindow = seleniumWebDriverHelper.switchToIdeFrameAndWaitAvailability(); toastLoader.waitToastLoaderAndClickStartButton(); ide.waitOpenedWorkspaceIsReadyToUse(); + // wait for project initializing explorer.waitItem(WEB_JAVA_SPRING); explorer.waitItem(CONSOLE_JAVA_SIMPLE); + explorer.waitItem(SECOND_WEB_JAVA_SPRING_PROJECT_NAME); notificationsPopupPanel.waitPopupPanelsAreClosed(); mavenPluginStatusBar.waitClosingInfoPanel(); explorer.waitDefinedTypeOfFolder(CONSOLE_JAVA_SIMPLE, PROJECT_FOLDER); explorer.waitDefinedTypeOfFolder(WEB_JAVA_SPRING, PROJECT_FOLDER); notificationsPopupPanel.waitPopupPanelsAreClosed(); + // delete projects from workspace detais page switchToWindow(dashboardWindow); dashboard.selectWorkspacesItemOnDashboard(); workspaces.selectWorkspaceItemName(WORKSPACE); @@ -114,8 +116,8 @@ public void createAndDeleteProjectTest() { workspaceProjects.openSettingsForProjectByName(WEB_JAVA_SPRING); workspaceProjects.clickOnDeleteProject(); workspaceProjects.clickOnDeleteItInDialogWindow(); - workspaceProjects.waitProjectIsPresent(SECOND_PROJECT_NAME); workspaceProjects.waitProjectIsNotPresent(WEB_JAVA_SPRING); + workspaceProjects.waitProjectIsPresent(SECOND_WEB_JAVA_SPRING_PROJECT_NAME); workspaceProjects.openSettingsForProjectByName(CONSOLE_JAVA_SIMPLE); workspaceProjects.clickOnDeleteProject(); workspaceProjects.clickOnDeleteItInDialogWindow(); From 7f6fc689602de6302da23abbe251eb20dc8a5f1a Mon Sep 17 00:00:00 2001 From: sskoryk Date: Tue, 12 Jun 2018 11:22:58 +0300 Subject: [PATCH 3/4] fix comments --- .../che/selenium/dashboard/CreateAndDeleteProjectsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java index af3053261dd..2f9794de673 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java @@ -96,7 +96,7 @@ public void createAndDeleteProjectTest() { toastLoader.waitToastLoaderAndClickStartButton(); ide.waitOpenedWorkspaceIsReadyToUse(); - // wait for project initializing + // wait for projects initializing explorer.waitItem(WEB_JAVA_SPRING); explorer.waitItem(CONSOLE_JAVA_SIMPLE); explorer.waitItem(SECOND_WEB_JAVA_SPRING_PROJECT_NAME); @@ -106,7 +106,7 @@ public void createAndDeleteProjectTest() { explorer.waitDefinedTypeOfFolder(WEB_JAVA_SPRING, PROJECT_FOLDER); notificationsPopupPanel.waitPopupPanelsAreClosed(); - // delete projects from workspace detais page + // delete projects from workspace details page switchToWindow(dashboardWindow); dashboard.selectWorkspacesItemOnDashboard(); workspaces.selectWorkspaceItemName(WORKSPACE); From 0475656f785661350ed642960619278a2b2d4e26 Mon Sep 17 00:00:00 2001 From: sskoryk Date: Tue, 12 Jun 2018 14:56:55 +0300 Subject: [PATCH 4/4] add comments --- .../selenium/dashboard/CreateAndDeleteProjectsTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java index 2f9794de673..76a5cf22ee6 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/CreateAndDeleteProjectsTest.java @@ -11,6 +11,7 @@ package org.eclipse.che.selenium.dashboard; import static org.eclipse.che.commons.lang.NameGenerator.generate; +import static org.eclipse.che.selenium.core.constant.TestStacksConstants.JAVA; import static org.eclipse.che.selenium.pageobject.ProjectExplorer.FolderTypes.PROJECT_FOLDER; import static org.eclipse.che.selenium.pageobject.dashboard.ProjectSourcePage.Template.CONSOLE_JAVA_SIMPLE; import static org.eclipse.che.selenium.pageobject.dashboard.ProjectSourcePage.Template.WEB_JAVA_SPRING; @@ -20,7 +21,6 @@ import org.eclipse.che.selenium.core.SeleniumWebDriver; import org.eclipse.che.selenium.core.TestGroup; import org.eclipse.che.selenium.core.client.TestWorkspaceServiceClient; -import org.eclipse.che.selenium.core.constant.TestStacksConstants; import org.eclipse.che.selenium.core.user.DefaultTestUser; import org.eclipse.che.selenium.core.webdriver.SeleniumWebDriverHelper; import org.eclipse.che.selenium.pageobject.Ide; @@ -80,12 +80,16 @@ public void createAndDeleteProjectTest() { // we are selecting 'Java' stack from the 'All Stack' tab for compatibility with OSIO newWorkspace.clickOnAllStacksTab(); - newWorkspace.selectStack(TestStacksConstants.JAVA.getId()); + newWorkspace.selectStack(JAVA.getId()); newWorkspace.typeWorkspaceName(WORKSPACE); + + // create 'web-java-spring' and 'console-java-simple' projects projectSourcePage.clickOnAddOrImportProjectButton(); projectSourcePage.selectSample(WEB_JAVA_SPRING); projectSourcePage.selectSample(CONSOLE_JAVA_SIMPLE); projectSourcePage.clickOnAddProjectButton(); + + // create 'web-java-spring-1' project projectSourcePage.clickOnAddOrImportProjectButton(); projectSourcePage.selectSample(WEB_JAVA_SPRING); projectSourcePage.clickOnAddProjectButton();