From 344daee3cd61ef2986e1c63a5471ca5ef877ac2c Mon Sep 17 00:00:00 2001 From: Maxim Musienko Date: Fri, 8 Jun 2018 12:37:18 +0300 Subject: [PATCH] Remove unnecessary pageobjects related with depricated MachinePerspective view. Rename MachineTerminal to CheTerminal (#9665) --- .../MachineTerminal.java => CheTerminal.java} | 10 +- .../eclipse/che/selenium/pageobject/Ide.java | 5 +- .../CreateMachineWidget.java | 146 ------------------ .../MachineInformationTab.java | 68 -------- .../selenium/assistant/KeyBindingsTest.java | 4 +- .../ChangeVariableWithEvaluatingTest.java | 4 +- ...pOverStepReturnWithChangeVariableTest.java | 4 +- .../CheckFileWatcherExcludeFeatureTest.java | 4 +- .../AuthorizeOnGithubFromPreferencesTest.java | 4 +- .../selenium/git/GitChangeMarkersTest.java | 4 +- .../che/selenium/git/GitColorsTest.java | 4 +- .../che/selenium/git/GitPanelTest.java | 4 +- .../selenium/git/ImportWizardFormTest.java | 4 +- ...eckIntelligenceCommandFromToolbarTest.java | 4 +- .../miscellaneous/FindTextFeatureTest.java | 4 +- .../miscellaneous/ServerRuntimeInfoTest.java | 4 +- .../miscellaneous/TerminalTypingTest.java | 4 +- .../WorkingWithSplitPanelTest.java | 4 +- .../WorkingWithTerminalTest.java | 4 +- .../refactor/move/FailMoveItemTest.java | 4 +- .../refactor/packages/RenamePackageTest.java | 4 +- .../WorkingWithJavaMySqlStackTest.java | 4 +- ...spaceFromOfficialUbuntuImageStartTest.java | 4 +- .../CreateWorkspaceWithAndroidStackTest.java | 4 +- .../CreateWorkspaceWithBlankStackTest.java | 4 +- .../CreateWorkspaceWithCppStackTest.java | 4 +- .../CreateWorkspaceWithNetStackTest.java | 4 +- .../CreateWorkspaceWithNodeStackTest.java | 4 +- .../CreateWorkspaceWithPHPStackTest.java | 4 +- .../CreateWorkspaceWithPythonStackTest.java | 4 +- .../CreateWorkspaceWithRailsStackTest.java | 4 +- 31 files changed, 60 insertions(+), 277 deletions(-) rename selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/{machineperspective/MachineTerminal.java => CheTerminal.java} (97%) delete mode 100644 selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/CreateMachineWidget.java delete mode 100644 selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/MachineInformationTab.java diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/MachineTerminal.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/CheTerminal.java similarity index 97% rename from selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/MachineTerminal.java rename to selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/CheTerminal.java index 79e8dad1bb..85f5f8a738 100644 --- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/MachineTerminal.java +++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/CheTerminal.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.selenium.pageobject.machineperspective; +package org.eclipse.che.selenium.pageobject; import static java.lang.String.format; import static org.eclipse.che.selenium.core.constant.TestCommandsConstants.CUSTOM; @@ -26,8 +26,6 @@ import org.eclipse.che.selenium.core.action.ActionsFactory; import org.eclipse.che.selenium.core.client.TestCommandServiceClient; import org.eclipse.che.selenium.core.utils.WaitUtils; import org.eclipse.che.selenium.core.workspace.TestWorkspace; -import org.eclipse.che.selenium.pageobject.Consoles; -import org.eclipse.che.selenium.pageobject.Loader; import org.eclipse.che.selenium.pageobject.intelligent.CommandsPalette; import org.openqa.selenium.By; import org.openqa.selenium.Keys; @@ -41,8 +39,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Singleton -public class MachineTerminal { - private static final Logger LOG = LoggerFactory.getLogger(MachineTerminal.class); +public class CheTerminal { + private static final Logger LOG = LoggerFactory.getLogger(CheTerminal.class); private final SeleniumWebDriver seleniumWebDriver; private final Loader loader; private final ActionsFactory actionsFactory; @@ -51,7 +49,7 @@ public class MachineTerminal { private final Consoles consoles; @Inject - public MachineTerminal( + public CheTerminal( SeleniumWebDriver seleniumWebDriver, Loader loader, ActionsFactory actionsFactory, diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Ide.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Ide.java index 669dbf4706..80419125d6 100644 --- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Ide.java +++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/Ide.java @@ -21,7 +21,6 @@ import org.eclipse.che.selenium.core.SeleniumWebDriver; import org.eclipse.che.selenium.core.entrance.Entrance; import org.eclipse.che.selenium.core.workspace.TestWorkspace; import org.eclipse.che.selenium.core.workspace.TestWorkspaceUrlResolver; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; /** * @author Vitaliy Gulyy @@ -33,7 +32,7 @@ public class Ide { private final TestWorkspaceUrlResolver testWorkspaceUrlResolver; private final Entrance entrance; private final ProjectExplorer projectExplorer; - private final MachineTerminal terminal; + private final CheTerminal terminal; private final Menu menu; @Inject @@ -42,7 +41,7 @@ public class Ide { TestWorkspaceUrlResolver testWorkspaceUrlResolver, Entrance entrance, ProjectExplorer projectExplorer, - MachineTerminal terminal, + CheTerminal terminal, Menu menu) { this.seleniumWebDriver = seleniumWebDriver; this.testWorkspaceUrlResolver = testWorkspaceUrlResolver; diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/CreateMachineWidget.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/CreateMachineWidget.java deleted file mode 100644 index 8c0d6e5f8c..0000000000 --- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/CreateMachineWidget.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (c) 2012-2018 Red Hat, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.selenium.pageobject.machineperspective; - -import static org.eclipse.che.selenium.core.constant.TestTimeoutsConstants.MINIMUM_SEC; -import static org.eclipse.che.selenium.core.constant.TestTimeoutsConstants.REDRAW_UI_ELEMENTS_TIMEOUT_SEC; - -import com.google.inject.Inject; -import com.google.inject.Singleton; -import org.eclipse.che.selenium.core.SeleniumWebDriver; -import org.eclipse.che.selenium.core.action.ActionsFactory; -import org.eclipse.che.selenium.core.utils.WaitUtils; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; -import org.openqa.selenium.support.ui.ExpectedConditions; -import org.openqa.selenium.support.ui.WebDriverWait; - -/** @author Musienko Maxim */ -@Singleton -public class CreateMachineWidget { - - private final SeleniumWebDriver seleniumWebDriver; - private final ActionsFactory actionsFactory; - - @Inject - public CreateMachineWidget(SeleniumWebDriver seleniumWebDriver, ActionsFactory actionsFactory) { - this.seleniumWebDriver = seleniumWebDriver; - this.actionsFactory = actionsFactory; - PageFactory.initElements(seleniumWebDriver, this); - } - - public interface DockerImages { - String UBUNTU_JDK8 = "UBUNTU_JDK8"; - String DEBIAN_JDK8 = "DEBIAN_JDK8"; - } - - private interface Locators { - String MAIN_FORM_XPATH = "//button[@id='window-create-machine-cancel']/parent::div/parent::div"; - String NAME_FIELD_ID = "gwt-debug-createMachineView-machineName"; - String RECIPE_FIELD_ID = "gwt-debug-createMachineView-recipeURL"; - String FIND_BY_TAG_ID = "gwt-debug-createMachineView-tags"; - String CREATE_BTN_ID = "window-create-machine-create"; - String REPLACE_DEV_MASHINE_ID = "window-create-machine-replace"; - String CANCEL_ID = "window-create-machine-create"; - } - - @FindBy(xpath = Locators.MAIN_FORM_XPATH) - WebElement mainForm; - - @FindBy(id = Locators.NAME_FIELD_ID) - WebElement nameOfMashineField; - - @FindBy(id = Locators.RECIPE_FIELD_ID) - WebElement recipeUrlOfMashine; - - @FindBy(id = Locators.FIND_BY_TAG_ID) - WebElement findByNAmeField; - - @FindBy(id = Locators.CREATE_BTN_ID) - WebElement createBtn; - - @FindBy(id = Locators.REPLACE_DEV_MASHINE_ID) - WebElement replaceBtn; - - @FindBy(id = Locators.CANCEL_ID) - WebElement cancelBtn; - - /** wait main widget for creating new machine */ - public void waitCreateMachinesWidget() { - new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC) - .until(ExpectedConditions.visibilityOf(mainForm)); - } - - /** - * type the name of mashine into 'Name' field of the 'Create Machine' widget - * - * @param nameOfMachine - */ - public void typeNameOfMachine(String nameOfMachine) { - new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC) - .until(ExpectedConditions.visibilityOf(nameOfMashineField)) - .sendKeys(nameOfMachine); - new WebDriverWait(seleniumWebDriver, MINIMUM_SEC) - .until( - (WebDriver input) -> { - return nameOfMashineField.getAttribute("value").equals(nameOfMachine); - }); - } - - /** - * type the tag name of mashine into 'Name' field of the 'Create Machine' widget - * - * @param tagName - */ - public void typeFindByTags(String tagName, boolean withClearing) { - WebElement currentElem = - new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC) - .until(ExpectedConditions.visibilityOf(findByNAmeField)); - if (withClearing) { - currentElem.clear(); - // for server side - WaitUtils.sleepQuietly(1); - currentElem.sendKeys(tagName); - } else { - currentElem.sendKeys(tagName); - } - } - - /** wait and click on the create button of 'Create Machine' widget */ - public void clickCreateBTn() { - new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC) - .until(ExpectedConditions.visibilityOf(createBtn)) - .click(); - } - - /** wait and click on the create button of 'Cancel Machine' widget */ - public void clickCancelBtn() { - new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC) - .until(ExpectedConditions.visibilityOf(cancelBtn)) - .click(); - } - - /** - * select a docker image from dropdown - * - * @param dockerImg the docker image into drop dawn - */ - public void selectDockerImgFromDropDawn(String dockerImg) { - String locator = "//div[@class='gwt-PopupPanel']//td[text()='" + dockerImg + "']"; - WebElement dropdownItem = - new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC) - .until(ExpectedConditions.visibilityOfElementLocated(By.xpath(locator))); - actionsFactory.createAction(seleniumWebDriver).doubleClick(dropdownItem).perform(); - } -} diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/MachineInformationTab.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/MachineInformationTab.java deleted file mode 100644 index c8666a3f97..0000000000 --- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/machineperspective/MachineInformationTab.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2012-2018 Red Hat, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -package org.eclipse.che.selenium.pageobject.machineperspective; - -import static org.eclipse.che.selenium.core.constant.TestTimeoutsConstants.LOADER_TIMEOUT_SEC; -import static org.eclipse.che.selenium.core.constant.TestTimeoutsConstants.REDRAW_UI_ELEMENTS_TIMEOUT_SEC; - -import com.google.inject.Inject; -import com.google.inject.Singleton; -import org.eclipse.che.selenium.core.SeleniumWebDriver; -import org.openqa.selenium.By; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import org.openqa.selenium.support.PageFactory; -import org.openqa.selenium.support.ui.ExpectedConditions; -import org.openqa.selenium.support.ui.WebDriverWait; - -/** @author Musienko Maxim */ -@Singleton -public class MachineInformationTab { - private final SeleniumWebDriver seleniumWebDriver; - - @Inject - public MachineInformationTab(SeleniumWebDriver seleniumWebDriver) { - this.seleniumWebDriver = seleniumWebDriver; - PageFactory.initElements(seleniumWebDriver, this); - } - - private interface Locators { - String INFORMATION_TAB_XPATH = "//div[@id='gwt-debug-editorPanel']//div[text()='Information']"; - } - - @FindBy(xpath = Locators.INFORMATION_TAB_XPATH) - WebElement informationTab; - - /** wait appearance the main terminal container */ - public void waitInformationTab() { - new WebDriverWait(seleniumWebDriver, LOADER_TIMEOUT_SEC) - .until(ExpectedConditions.visibilityOf(informationTab)); - } - - /** select Information tab */ - public void selectInformationTab() { - waitInformationTab(); - informationTab.click(); - } - - /** - * wait expected text into Information tab - * - * @param expectedText - */ - public void waitTextIntoInfoTab(String expectedText) { - String locatorXpath = "//div[@id='gwt-debug-editorPanel']//div"; - new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC) - .until( - ExpectedConditions.textToBePresentInElementLocated( - By.xpath(locatorXpath), expectedText)); - } -} diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/assistant/KeyBindingsTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/assistant/KeyBindingsTest.java index 263065720b..424e958a9a 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/assistant/KeyBindingsTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/assistant/KeyBindingsTest.java @@ -24,6 +24,7 @@ import org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants; import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.utils.WaitUtils; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.CodenvyEditor; import org.eclipse.che.selenium.pageobject.Consoles; import org.eclipse.che.selenium.pageobject.Ide; @@ -33,7 +34,6 @@ import org.eclipse.che.selenium.pageobject.Menu; import org.eclipse.che.selenium.pageobject.NavigateToFile; import org.eclipse.che.selenium.pageobject.NotificationsPopupPanel; import org.eclipse.che.selenium.pageobject.ProjectExplorer; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.Keys; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -51,7 +51,7 @@ public class KeyBindingsTest { @Inject private KeyBindings keyBindings; @Inject private NavigateToFile navigateToFile; @Inject private NotificationsPopupPanel notificationsPopupPanel; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private Consoles consoles; @Inject private TestProjectServiceClient projectServiceClient; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/ChangeVariableWithEvaluatingTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/ChangeVariableWithEvaluatingTest.java index 1e4095c76a..6618a29913 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/ChangeVariableWithEvaluatingTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/ChangeVariableWithEvaluatingTest.java @@ -31,6 +31,7 @@ import org.eclipse.che.selenium.core.constant.TestCommandsConstants; import org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants; import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.CodenvyEditor; import org.eclipse.che.selenium.pageobject.Consoles; import org.eclipse.che.selenium.pageobject.Ide; @@ -40,7 +41,6 @@ import org.eclipse.che.selenium.pageobject.ToastLoader; import org.eclipse.che.selenium.pageobject.debug.DebugPanel; import org.eclipse.che.selenium.pageobject.debug.JavaDebugConfig; import org.eclipse.che.selenium.pageobject.intelligent.CommandsPalette; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeClass; @@ -80,7 +80,7 @@ public class ChangeVariableWithEvaluatingTest { @Inject private TestWorkspaceServiceClient workspaceServiceClient; @Inject private TestProjectServiceClient testProjectServiceClient; @Inject private CommandsPalette commandsPalette; - @Inject private MachineTerminal machineTerminal; + @Inject private CheTerminal machineTerminal; @BeforeClass public void prepare() throws Exception { diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/StepIntoStepOverStepReturnWithChangeVariableTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/StepIntoStepOverStepReturnWithChangeVariableTest.java index 394b41df61..9dc8a632e3 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/StepIntoStepOverStepReturnWithChangeVariableTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/StepIntoStepOverStepReturnWithChangeVariableTest.java @@ -30,6 +30,7 @@ import org.eclipse.che.selenium.core.constant.TestCommandsConstants; import org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants; import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.CodenvyEditor; import org.eclipse.che.selenium.pageobject.Consoles; import org.eclipse.che.selenium.pageobject.Ide; @@ -39,7 +40,6 @@ import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.debug.DebugPanel; import org.eclipse.che.selenium.pageobject.debug.JavaDebugConfig; import org.eclipse.che.selenium.pageobject.intelligent.CommandsPalette; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.Keys; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,7 +73,7 @@ public class StepIntoStepOverStepReturnWithChangeVariableTest { @Inject private Loader loader; @Inject private CommandsPalette commandsPalette; @Inject private SeleniumWebDriver seleniumWebDriver; - @Inject private MachineTerminal machineTerminal; + @Inject private CheTerminal machineTerminal; @BeforeClass public void prepare() throws Exception { diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/filewatcher/CheckFileWatcherExcludeFeatureTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/filewatcher/CheckFileWatcherExcludeFeatureTest.java index f0975ea10c..36c182f932 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/filewatcher/CheckFileWatcherExcludeFeatureTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/filewatcher/CheckFileWatcherExcludeFeatureTest.java @@ -23,6 +23,7 @@ import org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants; import org.eclipse.che.selenium.core.constant.TestProjectExplorerContextMenuConstants.ContextMenuItems; import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.CodenvyEditor; import org.eclipse.che.selenium.pageobject.Consoles; import org.eclipse.che.selenium.pageobject.Events; @@ -30,7 +31,6 @@ import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Loader; import org.eclipse.che.selenium.pageobject.Menu; import org.eclipse.che.selenium.pageobject.ProjectExplorer; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -44,7 +44,7 @@ public class CheckFileWatcherExcludeFeatureTest { @Inject private SeleniumWebDriver seleniumWebDriver; @Inject private ProjectExplorer projectExplorer; @Inject private TestWorkspace testWorkspace; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private CodenvyEditor editor; @Inject private Consoles consoles; @Inject private Loader loader; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/AuthorizeOnGithubFromPreferencesTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/AuthorizeOnGithubFromPreferencesTest.java index 1e2f1d313e..fe38fe9b14 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/AuthorizeOnGithubFromPreferencesTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/AuthorizeOnGithubFromPreferencesTest.java @@ -22,6 +22,7 @@ import org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants; import org.eclipse.che.selenium.core.webdriver.SeleniumWebDriverHelper; import org.eclipse.che.selenium.core.workspace.TestWorkspace; import org.eclipse.che.selenium.pageobject.AskDialog; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.Events; import org.eclipse.che.selenium.pageobject.GitHub; import org.eclipse.che.selenium.pageobject.Ide; @@ -32,7 +33,6 @@ import org.eclipse.che.selenium.pageobject.Preferences; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.account.KeycloakFederatedIdentitiesPage; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; @@ -62,7 +62,7 @@ public class AuthorizeOnGithubFromPreferencesTest { private boolean isMultiuser; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private Menu menu; @Inject private ImportProjectFromLocation importProject; @Inject private Preferences preferences; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitChangeMarkersTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitChangeMarkersTest.java index cada973757..4a49b7c9ac 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitChangeMarkersTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitChangeMarkersTest.java @@ -29,8 +29,8 @@ import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.user.DefaultTestUser; import org.eclipse.che.selenium.core.workspace.TestWorkspace; import org.eclipse.che.selenium.pageobject.*; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.git.Git; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.Keys; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -56,7 +56,7 @@ public class GitChangeMarkersTest { @Inject private Menu menu; @Inject private AskDialog askDialog; @Inject private AskForValueDialog askForValueDialog; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private Git git; @Inject private Events events; @Inject private Loader loader; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitColorsTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitColorsTest.java index 2589237618..d9178c5df6 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitColorsTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitColorsTest.java @@ -34,8 +34,8 @@ import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.user.DefaultTestUser; import org.eclipse.che.selenium.core.workspace.TestWorkspace; import org.eclipse.che.selenium.pageobject.*; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.git.Git; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.Keys; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -56,7 +56,7 @@ public class GitColorsTest { @Inject private ProjectExplorer projectExplorer; @Inject private Menu menu; @Inject private AskDialog askDialog; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private Git git; @Inject private Events events; @Inject private Loader loader; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitPanelTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitPanelTest.java index 1692443567..c4c2c2a1c1 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitPanelTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitPanelTest.java @@ -30,6 +30,7 @@ import org.eclipse.che.selenium.core.user.DefaultTestUser; import org.eclipse.che.selenium.core.workspace.TestWorkspace; import org.eclipse.che.selenium.pageobject.AskDialog; import org.eclipse.che.selenium.pageobject.AskForValueDialog; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.CodenvyEditor; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Loader; @@ -39,7 +40,6 @@ import org.eclipse.che.selenium.pageobject.Wizard; import org.eclipse.che.selenium.pageobject.git.Git; import org.eclipse.che.selenium.pageobject.git.GitCompare; import org.eclipse.che.selenium.pageobject.git.GitPanel; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.testng.annotations.BeforeClass; @@ -78,7 +78,7 @@ public class GitPanelTest { @Inject private Menu menu; @Inject private ProjectExplorer projectExplorer; @Inject private CodenvyEditor editor; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private AskDialog askDialog; @Inject private AskForValueDialog askForValueDialog; @Inject private TestUserPreferencesServiceClient testUserPreferencesServiceClient; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java index 9820df2f01..ba73b0ad2b 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java @@ -34,6 +34,7 @@ import org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants; import org.eclipse.che.selenium.core.webdriver.SeleniumWebDriverHelper; import org.eclipse.che.selenium.core.workspace.TestWorkspace; import org.eclipse.che.selenium.pageobject.AskDialog; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.CodenvyEditor; import org.eclipse.che.selenium.pageobject.Events; import org.eclipse.che.selenium.pageobject.GitHub; @@ -47,7 +48,6 @@ import org.eclipse.che.selenium.pageobject.Wizard; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.account.KeycloakFederatedIdentitiesPage; import org.eclipse.che.selenium.pageobject.git.Git; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; @@ -87,7 +87,7 @@ public class ImportWizardFormTest { private boolean isMultiuser; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private Menu menu; @Inject private ImportProjectFromLocation importProject; @Inject private Preferences preferences; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/intelligencecommand/CheckIntelligenceCommandFromToolbarTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/intelligencecommand/CheckIntelligenceCommandFromToolbarTest.java index b33d458335..a55f70c5c6 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/intelligencecommand/CheckIntelligenceCommandFromToolbarTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/intelligencecommand/CheckIntelligenceCommandFromToolbarTest.java @@ -24,6 +24,7 @@ import org.eclipse.che.selenium.core.TestGroup; import org.eclipse.che.selenium.core.client.TestProjectServiceClient; import org.eclipse.che.selenium.core.webdriver.SeleniumWebDriverHelper; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.Consoles; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Menu; @@ -31,7 +32,6 @@ import org.eclipse.che.selenium.pageobject.NotificationsPopupPanel; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.Wizard; import org.eclipse.che.selenium.pageobject.intelligent.CommandsToolbar; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedCondition; @@ -54,7 +54,7 @@ public class CheckIntelligenceCommandFromToolbarTest { @Inject private SeleniumWebDriver seleniumWebDriver; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private NotificationsPopupPanel notificationsPanel; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private TestProjectServiceClient projectService; @BeforeClass diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/FindTextFeatureTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/FindTextFeatureTest.java index 55301f3c7f..565e3987c0 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/FindTextFeatureTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/FindTextFeatureTest.java @@ -33,6 +33,7 @@ import org.eclipse.che.commons.lang.NameGenerator; import org.eclipse.che.selenium.core.client.TestProjectServiceClient; import org.eclipse.che.selenium.core.utils.WaitUtils; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.CodenvyEditor; import org.eclipse.che.selenium.pageobject.ConfigureClasspath; import org.eclipse.che.selenium.pageobject.Consoles; @@ -45,7 +46,6 @@ import org.eclipse.che.selenium.pageobject.NotificationsPopupPanel; import org.eclipse.che.selenium.pageobject.PanelSelector; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.Wizard; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -62,7 +62,7 @@ public class FindTextFeatureTest { @Inject private CodenvyEditor editor; @Inject private Menu menu; @Inject private ConfigureClasspath configureClasspath; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private FindText findTextPage; @Inject private TestProjectServiceClient testProjectServiceClient; @Inject private Consoles consoles; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/ServerRuntimeInfoTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/ServerRuntimeInfoTest.java index ea5775c5f5..1d06f9a7ba 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/ServerRuntimeInfoTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/ServerRuntimeInfoTest.java @@ -14,11 +14,11 @@ import com.google.common.collect.Lists; import com.google.inject.Inject; import java.util.List; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.Consoles; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Loader; import org.eclipse.che.selenium.pageobject.ProjectExplorer; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -41,7 +41,7 @@ public class ServerRuntimeInfoTest { @Inject private Consoles consoles; @Inject private Ide ide; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @BeforeClass public void setUp() throws Exception { diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/TerminalTypingTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/TerminalTypingTest.java index db1ba9c0d9..77ac5879e9 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/TerminalTypingTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/TerminalTypingTest.java @@ -14,10 +14,10 @@ import com.google.inject.Inject; import java.util.Arrays; import java.util.List; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Loader; import org.eclipse.che.selenium.pageobject.ProjectExplorer; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.Keys; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -79,7 +79,7 @@ public class TerminalTypingTest { @Inject private Loader loader; @Inject private TestWorkspace workspace; @Inject private Ide ide; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private ProjectExplorer projectExplorer; @BeforeClass diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithSplitPanelTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithSplitPanelTest.java index c2428caf42..c0ba5752eb 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithSplitPanelTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithSplitPanelTest.java @@ -26,6 +26,7 @@ import org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants; import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.workspace.TestWorkspace; import org.eclipse.che.selenium.pageobject.AskDialog; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.Consoles; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Loader; @@ -35,7 +36,6 @@ import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.git.Git; import org.eclipse.che.selenium.pageobject.intelligent.CommandsEditor; import org.eclipse.che.selenium.pageobject.intelligent.CommandsExplorer; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.Keys; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -52,7 +52,7 @@ public class WorkingWithSplitPanelTest { @Inject private ProjectExplorer projectExplorer; @Inject private Menu menu; @Inject private Loader loader; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private Consoles consoles; @Inject private MultiSplitPanel multiSplitPanel; @Inject private AskDialog askDialog; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithTerminalTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithTerminalTest.java index 2856ba4b60..94ab7bc597 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithTerminalTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithTerminalTest.java @@ -26,12 +26,12 @@ import org.eclipse.che.selenium.core.constant.TestTimeoutsConstants; import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.utils.WaitUtils; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.Consoles; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Loader; import org.eclipse.che.selenium.pageobject.PanelSelector; import org.eclipse.che.selenium.pageobject.ProjectExplorer; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.Keys; import org.openqa.selenium.TimeoutException; import org.slf4j.Logger; @@ -70,7 +70,7 @@ public class WorkingWithTerminalTest { @Inject private Ide ide; @Inject private ProjectExplorer projectExplorer; @Inject private Loader loader; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private Consoles consoles; @Inject private TestProjectServiceClient testProjectServiceClient; @Inject private PanelSelector panelSelector; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/move/FailMoveItemTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/move/FailMoveItemTest.java index f747c4dff1..cc24d6955c 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/move/FailMoveItemTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/move/FailMoveItemTest.java @@ -22,12 +22,12 @@ import org.eclipse.che.commons.lang.NameGenerator; import org.eclipse.che.selenium.core.client.TestProjectServiceClient; import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.CodenvyEditor; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Loader; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.Refactor; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -43,7 +43,7 @@ public class FailMoveItemTest { @Inject private TestWorkspace workspace; @Inject private Ide ide; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private Loader loader; @Inject private CodenvyEditor editor; @Inject private Refactor refactor; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/packages/RenamePackageTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/packages/RenamePackageTest.java index d3ff1f1db2..0be7e751a4 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/packages/RenamePackageTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/packages/RenamePackageTest.java @@ -18,13 +18,13 @@ import org.eclipse.che.selenium.core.client.TestProjectServiceClient; import org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants; import org.eclipse.che.selenium.core.project.ProjectTemplates; import org.eclipse.che.selenium.core.workspace.TestWorkspace; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.CodenvyEditor; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Loader; import org.eclipse.che.selenium.pageobject.Menu; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.Refactor; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -218,7 +218,7 @@ public class RenamePackageTest { @Inject private Refactor refactor; @Inject private Menu menu; @Inject private TestProjectServiceClient testProjectServiceClient; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @BeforeClass public void prepare() throws Exception { diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkingWithJavaMySqlStackTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkingWithJavaMySqlStackTest.java index 1061c058ef..e9b8f986cf 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkingWithJavaMySqlStackTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkingWithJavaMySqlStackTest.java @@ -35,6 +35,7 @@ import org.eclipse.che.selenium.core.client.TestWorkspaceServiceClient; import org.eclipse.che.selenium.core.user.DefaultTestUser; import org.eclipse.che.selenium.core.webdriver.SeleniumWebDriverHelper; import org.eclipse.che.selenium.pageobject.AskDialog; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.Consoles; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.Loader; @@ -45,7 +46,6 @@ 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; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.openqa.selenium.By; import org.openqa.selenium.support.ui.WebDriverWait; import org.testng.annotations.AfterClass; @@ -75,7 +75,7 @@ public class WorkingWithJavaMySqlStackTest { @Inject private Dashboard dashboard; @Inject private WorkspaceDetails workspaceDetails; @Inject private AskDialog askDialog; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private SeleniumWebDriver seleniumWebDriver; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private TestWorkspaceServiceClient workspaceServiceClient; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkspaceFromOfficialUbuntuImageStartTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkspaceFromOfficialUbuntuImageStartTest.java index 5e6996134d..edcdcec8e4 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkspaceFromOfficialUbuntuImageStartTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkspaceFromOfficialUbuntuImageStartTest.java @@ -15,10 +15,10 @@ import org.eclipse.che.selenium.core.TestGroup; import org.eclipse.che.selenium.core.workspace.InjectTestWorkspace; import org.eclipse.che.selenium.core.workspace.TestWorkspace; import org.eclipse.che.selenium.core.workspace.WorkspaceTemplate; +import org.eclipse.che.selenium.pageobject.CheTerminal; import org.eclipse.che.selenium.pageobject.Ide; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.ToastLoader; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.Test; /** @author Alexander Garagatyi */ @@ -30,7 +30,7 @@ public class WorkspaceFromOfficialUbuntuImageStartTest { @Inject private Ide ide; @Inject private ProjectExplorer projectExplorer; @Inject private ToastLoader toastLoader; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; public void ensureWorkspaceStartsFromOfficialUbuntuImage() throws Exception { ide.open(testWorkspace); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithAndroidStackTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithAndroidStackTest.java index 441d4641b1..97655eae0e 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithAndroidStackTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithAndroidStackTest.java @@ -16,11 +16,11 @@ 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.CheTerminal; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public class CreateWorkspaceWithAndroidStackTest { @Inject private NewWorkspace newWorkspace; @Inject private Dashboard dashboard; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private TestWorkspaceServiceClient workspaceServiceClient; @Inject private Workspaces workspaces; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithBlankStackTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithBlankStackTest.java index e2b1d406c8..9107123ab4 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithBlankStackTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithBlankStackTest.java @@ -16,11 +16,11 @@ 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.CheTerminal; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public class CreateWorkspaceWithBlankStackTest { @Inject private NewWorkspace newWorkspace; @Inject private Dashboard dashboard; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private TestWorkspaceServiceClient workspaceServiceClient; @Inject private Workspaces workspaces;; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithCppStackTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithCppStackTest.java index f2813668f9..a05ae5842d 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithCppStackTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithCppStackTest.java @@ -16,11 +16,11 @@ 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.CheTerminal; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public class CreateWorkspaceWithCppStackTest { @Inject private NewWorkspace newWorkspace; @Inject private Dashboard dashboard; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private TestWorkspaceServiceClient workspaceServiceClient; @Inject private Workspaces workspaces; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithNetStackTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithNetStackTest.java index e64c468d21..b0d1cb87f1 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithNetStackTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithNetStackTest.java @@ -16,11 +16,11 @@ 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.CheTerminal; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public class CreateWorkspaceWithNetStackTest { @Inject private NewWorkspace newWorkspace; @Inject private Dashboard dashboard; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private TestWorkspaceServiceClient workspaceServiceClient; @Inject private Workspaces workspaces; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithNodeStackTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithNodeStackTest.java index 6dd31b303d..0378a931e7 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithNodeStackTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithNodeStackTest.java @@ -16,11 +16,11 @@ 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.CheTerminal; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public class CreateWorkspaceWithNodeStackTest { @Inject private NewWorkspace newWorkspace; @Inject private Dashboard dashboard; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private TestWorkspaceServiceClient workspaceServiceClient; @Inject private Workspaces workspaces; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithPHPStackTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithPHPStackTest.java index 05930980b8..75110e4f1e 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithPHPStackTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithPHPStackTest.java @@ -16,11 +16,11 @@ 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.CheTerminal; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public class CreateWorkspaceWithPHPStackTest { @Inject private NewWorkspace newWorkspace; @Inject private Dashboard dashboard; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private TestWorkspaceServiceClient workspaceServiceClient; @Inject private Workspaces workspaces; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithPythonStackTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithPythonStackTest.java index 2bbb5ac44a..93b6a415fa 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithPythonStackTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithPythonStackTest.java @@ -16,11 +16,11 @@ 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.CheTerminal; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public class CreateWorkspaceWithPythonStackTest { @Inject private NewWorkspace newWorkspace; @Inject private Dashboard dashboard; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private TestWorkspaceServiceClient workspaceServiceClient; @Inject private Workspaces workspaces; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithRailsStackTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithRailsStackTest.java index 90f1ecca6a..ae0772c9b3 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithRailsStackTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/notjavastack/CreateWorkspaceWithRailsStackTest.java @@ -16,11 +16,11 @@ 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.CheTerminal; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.eclipse.che.selenium.pageobject.dashboard.Dashboard; import org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace; import org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces; -import org.eclipse.che.selenium.pageobject.machineperspective.MachineTerminal; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public class CreateWorkspaceWithRailsStackTest { @Inject private NewWorkspace newWorkspace; @Inject private Dashboard dashboard; @Inject private ProjectExplorer projectExplorer; - @Inject private MachineTerminal terminal; + @Inject private CheTerminal terminal; @Inject private SeleniumWebDriverHelper seleniumWebDriverHelper; @Inject private TestWorkspaceServiceClient workspaceServiceClient; @Inject private Workspaces workspaces;