@eclipse-che/che-e2e 7.56.1-dev-b76c7da → 7.56.1-dev-8788793

package/tests/plugins/{PythonPlugin.spec.ts → theia/PythonPlugin.spec.ts}

@@ -8,25 +8,25 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES } from '../../inversify.types';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { TestConstants } from '../../TestConstants';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { TestConstants } from '../../../TestConstants';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
 import { Key } from 'selenium-webdriver';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { Logger } from '../../utils/Logger';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { PreferencesHandler } from '../../utils/PreferencesHandler';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { Logger } from '../../../utils/Logger';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { PreferencesHandlerTheia } from '../../../utils/theia/PreferencesHandlerTheia';
+import { TimeoutConstants } from '../../../TimeoutConstants';
 
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 
 const devFileUrl: string = 'https://github.com/che-samples/python-hello-world/tree/devfilev2';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devFileUrl}`;

package/tests/plugins/{TypescriptPlugin.spec.ts → theia/TypescriptPlugin.spec.ts}

@@ -8,25 +8,25 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES } from '../../inversify.types';
-import { Ide, LeftToolbarButton } from '../../pageobjects/ide/Ide';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { TestConstants } from '../../TestConstants';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { Ide, LeftToolbarButton } from '../../../pageobjects/ide/theia/Ide';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { TestConstants } from '../../../TestConstants';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
 import { Key, By } from 'selenium-webdriver';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { TopMenu } from '../../pageobjects/ide/TopMenu';
-import { DebugView } from '../../pageobjects/ide/DebugView';
-import { Terminal } from '../../pageobjects/ide/Terminal';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { Logger } from '../../utils/Logger';
-import { PreferencesHandler } from '../../utils/PreferencesHandler';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { TopMenu } from '../../../pageobjects/ide/theia/TopMenu';
+import { DebugView } from '../../../pageobjects/ide/theia/DebugView';
+import { Terminal } from '../../../pageobjects/ide/theia/Terminal';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { Logger } from '../../../utils/Logger';
+import { PreferencesHandlerTheia } from '../../../utils/theia/PreferencesHandlerTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -36,7 +36,7 @@ const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
 const debugView: DebugView = e2eContainer.get(CLASSES.DebugView);
 const terminal: Terminal = e2eContainer.get(CLASSES.Terminal);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 
 const devfileUrl: string = 'https://github.com/che-samples/web-nodejs-sample/tree/typescript-plugin';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;

package/tests/plugins/{VscodeKubernetesPlugin.spec.ts → theia/VscodeKubernetesPlugin.spec.ts}

@@ -8,19 +8,19 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES } from '../../inversify.types';
-import { Ide } from '../../pageobjects/ide/Ide';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { TestConstants } from '../../TestConstants';
-import { KubernetesPlugin } from '../../pageobjects/ide/plugins/KubernetesPlugin';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { Logger } from '../../utils/Logger';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { TopMenu } from '../../pageobjects/ide/TopMenu';
-import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
-import { OpenDialogWidget, Buttons } from '../../pageobjects/ide/OpenDialogWidget';
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { Ide } from '../../../pageobjects/ide/theia/Ide';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { TestConstants } from '../../../TestConstants';
+import { KubernetesPlugin } from '../../../pageobjects/ide/theia/plugins/KubernetesPlugin';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { Logger } from '../../../utils/Logger';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { TopMenu } from '../../../pageobjects/ide/theia/TopMenu';
+import { QuickOpenContainer } from '../../../pageobjects/ide/theia/QuickOpenContainer';
+import { OpenDialogWidget, Buttons } from '../../../pageobjects/ide/theia/OpenDialogWidget';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);

package/tests/plugins/{VscodeShellcheckPlugin.spec.ts → theia/VscodeShellcheckPlugin.spec.ts}

@@ -8,23 +8,23 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES } from '../../inversify.types';
-import { Ide } from '../../pageobjects/ide/Ide';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { TestConstants } from '../../TestConstants';
-import { PreferencesHandler } from '../../utils/PreferencesHandler';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { Ide } from '../../../pageobjects/ide/theia/Ide';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { TestConstants } from '../../../TestConstants';
+import { PreferencesHandlerTheia } from '../../../utils/theia/PreferencesHandlerTheia';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
 import { Key } from 'selenium-webdriver';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { Logger } from '../../utils/Logger';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { Logger } from '../../../utils/Logger';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 

package/tests/plugins/{VscodeValePlugin.spec.ts → theia/VscodeValePlugin.spec.ts}

@@ -8,18 +8,18 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { Ide } from '../../../pageobjects/ide/theia/Ide';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { TestConstants } from '../../../TestConstants';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { Terminal } from '../../../pageobjects/ide/theia/Terminal';
+import { Logger } from '../../../utils/Logger';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
 import { Key } from 'selenium-webdriver';
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES } from '../../inversify.types';
-import { Ide } from '../../pageobjects/ide/Ide';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { TestConstants } from '../../TestConstants';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { Terminal } from '../../pageobjects/ide/Terminal';
-import { Logger } from '../../utils/Logger';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);

package/tests/plugins/{VscodeXmlPlugin.spec.ts → theia/VscodeXmlPlugin.spec.ts}

@@ -8,23 +8,23 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { TestConstants } from '../../../TestConstants';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { PreferencesHandlerTheia } from '../../../utils/theia/PreferencesHandlerTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
 import { Key } from 'selenium-webdriver';
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES } from '../../inversify.types';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { TestConstants } from '../../TestConstants';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { PreferencesHandler } from '../../utils/PreferencesHandler';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 
 const devfileUrl: string = TestConstants.TS_TEST_WORKSPACE_DEVFILE_REPO || 'https://github.com/che-samples/web-nodejs-sample/tree/xml-plugin';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;

package/tests/plugins/{VscodeYamlPlugin.spec.ts → theia/VscodeYamlPlugin.spec.ts}

@@ -8,23 +8,23 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { TestConstants } from '../../../TestConstants';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { PreferencesHandlerTheia } from '../../../utils/theia/PreferencesHandlerTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
 import { Key } from 'selenium-webdriver';
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES } from '../../inversify.types';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { TestConstants } from '../../TestConstants';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { PreferencesHandler } from '../../utils/PreferencesHandler';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 
 const devfileUrl: string = TestConstants.TS_TEST_WORKSPACE_DEVFILE_REPO || 'https://github.com/che-samples/web-nodejs-sample/tree/yaml-plugin';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;

package/testsLibrary/WorkspaceHandlingTests.ts

@@ -8,143 +8,118 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
- import 'reflect-metadata';
- import { inject, injectable } from 'inversify';
- import { CLASSES } from '../inversify.types';
- import { Dashboard } from '../pageobjects/dashboard/Dashboard';
- import { CreateWorkspace } from '../pageobjects/dashboard/CreateWorkspace';
- import { Workspaces } from '../pageobjects/dashboard/Workspaces';
- import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
- import { Logger } from '../utils/Logger';
- import { ApiUrlResolver } from '../utils/workspace/ApiUrlResolver';
- import { TimeoutConstants } from '../TimeoutConstants';
- import { DriverHelper } from '../utils/DriverHelper';
- import { Ide } from '../pageobjects/ide/Ide';
- import { By, error } from 'selenium-webdriver';
- import { TestConstants } from '../TestConstants';
-
- @injectable()
- export class WorkspaceHandlingTests {
-
-     private static START_WORKSPACE_PAGE_NAME_LOCATOR: By = By.xpath(`//div[@class="ui-container"]/div[@class="pf-c-page"]//div[@class="pf-c-content"]/h1`);
-     private static READY_TO_READ_WORKSPACE_NAME_LOCATOR: By = By.xpath(`//div[@class="ui-container"]/div[@class="pf-c-page"]//div[@class="pf-c-content"]/h1[contains(.,'Starting workspace ')]`);
-     private static workspaceName: string = 'undefined';
-     private static parentGUID: string;
-
-     public static getWorkspaceName(): string {
-         return WorkspaceHandlingTests.workspaceName;
-     }
-
-     public static setWorkspaceName(workspaceName: string) {
-         WorkspaceHandlingTests.workspaceName = workspaceName;
-     }
-
-     public setWindowHandle(guid: string) {
-         WorkspaceHandlingTests.parentGUID = guid;
-     }
-
-     public getWindowHandle(): string {
-         return WorkspaceHandlingTests.parentGUID;
-     }
-
-     constructor(
-         @inject(CLASSES.Dashboard) private readonly dashboard: Dashboard,
-         @inject(CLASSES.CreateWorkspace) private readonly createWorkspace: CreateWorkspace,
-         @inject(CLASSES.Workspaces) private readonly workspaces: Workspaces,
-         @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil,
-         @inject(CLASSES.ApiUrlResolver) private readonly apiUrlResolver: ApiUrlResolver,
-         @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
-         @inject(CLASSES.Ide) private readonly ide: Ide) {}
-
-     public createAndOpenWorkspace(stack: string) {
-         test(`Create and open new workspace, stack:${stack}`, async () => {
-             await this.dashboard.waitPage();
-             Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
-             await this.apiUrlResolver.getWorkspacesApiUrl();
-             await this.dashboard.clickCreateWorkspaceButton();
-             await this.createWorkspace.waitPage();
-             WorkspaceHandlingTests.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
-             await this.createWorkspace.clickOnSample(stack);
-             await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests.parentGUID, TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
-         });
-     }
-
-     public openExistingWorkspace(workspaceName: string) {
-         test('Open and start existing workspace', async () => {
-             await this.dashboard.waitPage();
-             Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
-             await this.apiUrlResolver.getWorkspacesApiUrl();
-             await this.dashboard.clickWorkspacesButton();
-             await this.workspaces.waitPage();
-             await this.workspaces.clickOpenButton(workspaceName);
-         });
-     }
-
-     public obtainWorkspaceNameFromStartingPage() {
-         test('Obtain workspace name from workspace loader page', async() => {
-             try {
-                 Logger.info("Waiting for workspace name on workspace loader page");
-                 await this.driverHelper.waitVisibility(WorkspaceHandlingTests.READY_TO_READ_WORKSPACE_NAME_LOCATOR, TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT);
-
-                 const timeout: number = TimeoutConstants.TS_IDE_LOAD_TIMEOUT;
-                 const polling: number = TestConstants.TS_SELENIUM_DEFAULT_POLLING;
-                 const attempts: number = Math.ceil(timeout / polling);
-                 let startingWorkspaceLineContent: string;
-
-                 for (let i = 0; i < attempts; i++) {
-                     startingWorkspaceLineContent = await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests.START_WORKSPACE_PAGE_NAME_LOCATOR).getAttribute('innerHTML');
-
-                     // cutting away leading text
-                     WorkspaceHandlingTests.workspaceName = startingWorkspaceLineContent.substring('Starting workspace '.length).trim();
-                     if (WorkspaceHandlingTests.workspaceName !== '') {
-                         Logger.info(`Obtained workspace name from workspace loader page: ${WorkspaceHandlingTests.workspaceName}`);
-                         break;
-                     }
-
-                     this.driverHelper.sleep(polling);
-                 }
-             } catch (err) {
-                 Logger.error(`Failed to obtain workspace name from workspace loader page: ${err}`);
-                 throw err;
-             }
-         });
-     }
-
-     public switchBackToFirstOpenIdeTabFromLeftToRight() {
-         test('WorkspaceHandlingTests.switchBackToIdeTab', async () => {
-             let tabs = await this.driverHelper.getDriver().getAllWindowHandles();
-             Logger.trace(`WorkspaceHandlingTests.switchBackToIdeTab Found ${tabs.length} window handles, iterating...`);
-             for (let i = 0; i < tabs.length; i++) {
-                 await this.browserTabsUtil.switchToWindow(tabs[i]);
-                 try {
-                     await this.ide.waitIde(TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
-                     Logger.debug(`WorkspaceHandlingTests.switchBackToIdeTab located and switched to IDE tab`);
-                     return;
-                 } catch (err) {
-                     if (err instanceof error.TimeoutError) {
-                         Logger.warn(`WorkspaceHandlingTests.switchBackToIdeTab Locator timed out, trying with another window handle.`);
-                         continue;
-                     }
-                     Logger.error(`WorkspaceHandlingTests.switchBackToIdeTab Received unexpected exception while trying to locate IDE tab:${err}`);
-                     throw err;
-                 }
-             }
-             Logger.error(`WorkspaceHandlingTests.switchBackToIdeTab Failed to locate IDE tab, out of window handles.`);
-         });
-     }
-
-     public async stopWorkspace(workspaceName: string) {
-         await this.dashboard.openDashboard();
-         await this.dashboard.stopWorkspaceByUI(workspaceName);
-     }
-
-     public async removeWorkspace(workspaceName: string) {
-         await this.dashboard.openDashboard();
-         await this.dashboard.deleteStoppedWorkspaceByUI(workspaceName);
-     }
-
-     public async stopAndRemoveWorkspace(workspaceName: string) {
-         await this.dashboard.openDashboard();
-         await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
-     }
- }
+import 'reflect-metadata';
+import { inject, injectable } from 'inversify';
+import { CLASSES } from '../inversify.types';
+import { Dashboard } from '../pageobjects/dashboard/Dashboard';
+import { CreateWorkspace } from '../pageobjects/dashboard/CreateWorkspace';
+import { Workspaces } from '../pageobjects/dashboard/Workspaces';
+import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
+import { Logger } from '../utils/Logger';
+import { ApiUrlResolver } from '../utils/workspace/ApiUrlResolver';
+import { TimeoutConstants } from '../TimeoutConstants';
+import { DriverHelper } from '../utils/DriverHelper';
+import { By } from 'selenium-webdriver';
+import { TestConstants } from '../TestConstants';
+
+@injectable()
+export class WorkspaceHandlingTests {
+
+    private static START_WORKSPACE_PAGE_NAME_LOCATOR: By = By.xpath(`//div[@class="ui-container"]/div[@class="pf-c-page"]//div[@class="pf-c-content"]/h1`);
+    private static READY_TO_READ_WORKSPACE_NAME_LOCATOR: By = By.xpath(`//div[@class="ui-container"]/div[@class="pf-c-page"]//div[@class="pf-c-content"]/h1[contains(.,'Starting workspace ')]`);
+    private static workspaceName: string = 'undefined';
+    private static parentGUID: string;
+
+    public static getWorkspaceName(): string {
+        return WorkspaceHandlingTests.workspaceName;
+    }
+
+    public static setWorkspaceName(workspaceName: string) {
+        WorkspaceHandlingTests.workspaceName = workspaceName;
+    }
+
+    public setWindowHandle(guid: string) {
+        WorkspaceHandlingTests.parentGUID = guid;
+    }
+
+    public getWindowHandle(): string {
+        return WorkspaceHandlingTests.parentGUID;
+    }
+
+    constructor(
+        @inject(CLASSES.Dashboard) private readonly dashboard: Dashboard,
+        @inject(CLASSES.CreateWorkspace) private readonly createWorkspace: CreateWorkspace,
+        @inject(CLASSES.Workspaces) private readonly workspaces: Workspaces,
+        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil,
+        @inject(CLASSES.ApiUrlResolver) private readonly apiUrlResolver: ApiUrlResolver,
+        @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper) {}
+
+    public createAndOpenWorkspace(stack: string) {
+        test(`Create and open new workspace, stack:${stack}`, async () => {
+            await this.dashboard.waitPage();
+            Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
+            await this.apiUrlResolver.getWorkspacesApiUrl();
+            await this.dashboard.clickCreateWorkspaceButton();
+            await this.createWorkspace.waitPage();
+            WorkspaceHandlingTests.parentGUID = await this.browserTabsUtil.getCurrentWindowHandle();
+            await this.createWorkspace.clickOnSample(stack);
+            await this.browserTabsUtil.waitAndSwitchToAnotherWindow(WorkspaceHandlingTests.parentGUID, TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
+        });
+    }
+
+    public openExistingWorkspace(workspaceName: string) {
+        test('Open and start existing workspace', async () => {
+            await this.dashboard.waitPage();
+            Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
+            await this.apiUrlResolver.getWorkspacesApiUrl();
+            await this.dashboard.clickWorkspacesButton();
+            await this.workspaces.waitPage();
+            await this.workspaces.clickOpenButton(workspaceName);
+        });
+    }
+
+    public obtainWorkspaceNameFromStartingPage() {
+        test('Obtain workspace name from workspace loader page', async() => {
+            try {
+                Logger.info('Waiting for workspace name on workspace loader page');
+                await this.driverHelper.waitVisibility(WorkspaceHandlingTests.READY_TO_READ_WORKSPACE_NAME_LOCATOR, TimeoutConstants.TS_WAIT_LOADER_PRESENCE_TIMEOUT);
+
+                const timeout: number = TimeoutConstants.TS_IDE_LOAD_TIMEOUT;
+                const polling: number = TestConstants.TS_SELENIUM_DEFAULT_POLLING;
+                const attempts: number = Math.ceil(timeout / polling);
+                let startingWorkspaceLineContent: string;
+
+                for (let i = 0; i < attempts; i++) {
+                    startingWorkspaceLineContent = await this.driverHelper.getDriver().findElement(WorkspaceHandlingTests.START_WORKSPACE_PAGE_NAME_LOCATOR).getAttribute('innerHTML');
+
+                    // cutting away leading text
+                    WorkspaceHandlingTests.workspaceName = startingWorkspaceLineContent.substring('Starting workspace '.length).trim();
+                    if (WorkspaceHandlingTests.workspaceName !== '') {
+                        Logger.info(`Obtained workspace name from workspace loader page: ${WorkspaceHandlingTests.workspaceName}`);
+                        break;
+                    }
+
+                    this.driverHelper.sleep(polling);
+                }
+            } catch (err) {
+                Logger.error(`Failed to obtain workspace name from workspace loader page: ${err}`);
+                throw err;
+            }
+        });
+    }
+
+    public async stopWorkspace(workspaceName: string) {
+        await this.dashboard.openDashboard();
+        await this.dashboard.stopWorkspaceByUI(workspaceName);
+    }
+
+    public async removeWorkspace(workspaceName: string) {
+        await this.dashboard.openDashboard();
+        await this.dashboard.deleteStoppedWorkspaceByUI(workspaceName);
+    }
+
+    public async stopAndRemoveWorkspace(workspaceName: string) {
+        await this.dashboard.openDashboard();
+        await this.dashboard.stopAndRemoveWorkspaceByUI(workspaceName);
+    }
+}

package/testsLibrary/{CodeExecutionTests.ts → theia/CodeExecutionTestsTheia.ts}

@@ -10,21 +10,21 @@
 
 import 'reflect-metadata';
 import Axios from 'axios';
-import { CLASSES } from '../inversify.types';
+import { CLASSES } from '../../inversify.types';
 import { inject, injectable } from 'inversify';
 import { By, error, Key } from 'selenium-webdriver';
-import { Ide } from '../pageobjects/ide/Ide';
-import { Terminal } from '../pageobjects/ide/Terminal';
-import { TopMenu } from '../pageobjects/ide/TopMenu';
-import { DialogWindow } from '../pageobjects/ide/DialogWindow';
-import { DriverHelper } from '../utils/DriverHelper';
-import { Logger } from '../utils/Logger';
-import { QuickOpenContainer } from '../pageobjects/ide/QuickOpenContainer';
-import { WorkspaceHandlingTests } from './WorkspaceHandlingTests';
-import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
+import { Ide } from '../../pageobjects/ide/theia/Ide';
+import { Terminal } from '../../pageobjects/ide/theia/Terminal';
+import { TopMenu } from '../../pageobjects/ide/theia/TopMenu';
+import { DialogWindow } from '../../pageobjects/ide/theia/DialogWindow';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { Logger } from '../../utils/Logger';
+import { QuickOpenContainer } from '../../pageobjects/ide/theia/QuickOpenContainer';
+import { WorkspaceHandlingTests } from '../WorkspaceHandlingTests';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
 @injectable()
-export class CodeExecutionTests {
+export class CodeExecutionTestsTheia {
 
     private static lastApplicationUrl: string = '';
 
@@ -115,7 +115,7 @@ export class CodeExecutionTests {
             this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
             await this.ide.clickOnNotificationButton(notificationText, buttonText);
             await this.driverHelper.wait(5_000);
-            CodeExecutionTests.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
+            CodeExecutionTestsTheia.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
         });
     }
 
@@ -129,7 +129,7 @@ export class CodeExecutionTests {
             this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
             await this.ide.clickOnNotificationButton(notificationText, 'Open In Preview');
             await this.driverHelper.wait(5_000);
-            CodeExecutionTests.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
+            CodeExecutionTestsTheia.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
         });
     }
 
@@ -140,7 +140,7 @@ export class CodeExecutionTests {
             this.workspaceHandlingTests.setWindowHandle(await this.browserTabsUtil.getCurrentWindowHandle());
             await this.ide.waitNotificationAndOpenLink(portOpenText, timeout);
             await this.driverHelper.wait(5_000);
-            CodeExecutionTests.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
+            CodeExecutionTestsTheia.lastApplicationUrl = await this.driverHelper.getDriver().getCurrentUrl();
         });
     }
 
@@ -169,7 +169,7 @@ export class CodeExecutionTests {
     }
 
     public getLastApplicationUrl(): string {
-        return CodeExecutionTests.lastApplicationUrl;
+        return CodeExecutionTestsTheia.lastApplicationUrl;
     }
 
     /**