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

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;
     }
 
     /**

package/testsLibrary/{LanguageServerTests.ts → theia/LanguageServerTestsTheia.ts}

@@ -10,18 +10,18 @@
 
 import 'reflect-metadata';
 import { inject, injectable } from 'inversify';
-import { CLASSES } from '../inversify.types';
-import { TimeoutConstants } from '../TimeoutConstants';
-import { Editor } from '../pageobjects/ide/Editor';
-import { Ide, LeftToolbarButton } from '../pageobjects/ide/Ide';
-import { TopMenu } from '../pageobjects/ide/TopMenu';
-import { DebugView } from '../pageobjects/ide/DebugView';
+import { CLASSES } from '../../inversify.types';
+import { TimeoutConstants } from '../../TimeoutConstants';
+import { Editor } from '../../pageobjects/ide/theia/Editor';
+import { Ide, LeftToolbarButton } from '../../pageobjects/ide/theia/Ide';
+import { TopMenu } from '../../pageobjects/ide/theia/TopMenu';
+import { DebugView } from '../../pageobjects/ide/theia/DebugView';
 import { Key, error } from 'selenium-webdriver';
-import { Logger } from '../utils/Logger';
-import { BrowserTabsUtil } from '../utils/BrowserTabsUtil';
+import { Logger } from '../../utils/Logger';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
 @injectable()
-export class LanguageServerTests {
+export class LanguageServerTestsTheia {
 
     constructor(
         @inject(CLASSES.Editor) private readonly editor: Editor,

package/testsLibrary/{ProjectAndFileTests.ts → theia/ProjectAndFileTestsTheia.ts}

@@ -10,24 +10,50 @@
 
 import 'reflect-metadata';
 import { inject, injectable } from 'inversify';
-import { By } from 'selenium-webdriver';
-import { Ide } from '../pageobjects/ide/Ide';
-import { ProjectTree } from '../pageobjects/ide/ProjectTree';
-import { OpenEditors } from '../pageobjects/ide/OpenEditors';
-import { Editor } from '../pageobjects/ide/Editor';
-import { TimeoutConstants } from '../TimeoutConstants';
-import { DriverHelper } from '../utils/DriverHelper';
-import { CLASSES } from '../inversify.types';
+import { By, error } from 'selenium-webdriver';
+import { Ide } from '../../pageobjects/ide/theia/Ide';
+import { ProjectTree } from '../../pageobjects/ide/theia/ProjectTree';
+import { OpenEditors } from '../../pageobjects/ide/theia/OpenEditors';
+import { Editor } from '../../pageobjects/ide/theia/Editor';
+import { TimeoutConstants } from '../../TimeoutConstants';
+import { DriverHelper } from '../../utils/DriverHelper';
+import { CLASSES } from '../../inversify.types';
+import { Logger } from '../../utils/Logger';
+import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
 
 @injectable()
-export class ProjectAndFileTests {
+export class ProjectAndFileTestsTheia {
 
     constructor(
         @inject(CLASSES.Ide) private readonly ide: Ide,
         @inject(CLASSES.DriverHelper) private readonly driverHelper: DriverHelper,
         @inject(CLASSES.ProjectTree) private readonly projectTree: ProjectTree,
         @inject(CLASSES.OpenEditors) private readonly openEditors: OpenEditors,
-        @inject(CLASSES.Editor) private readonly editor: Editor) {}
+        @inject(CLASSES.Editor) private readonly editor: Editor,
+        @inject(CLASSES.BrowserTabsUtil) private readonly browserTabsUtil: BrowserTabsUtil) {}
+
+        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 waitWorkspaceReadiness(sampleName : string, folder: string, checkNotification: boolean = true, restartWorkspaceDialogIsExpected: boolean = false) {
         test('Wait for workspace readiness', async () => {

package/utils/DriverHelper.ts

@@ -10,7 +10,7 @@
 import { IDriver } from '../driver/IDriver';
 import { inject, injectable } from 'inversify';
 import { TYPES } from '../inversify.types';
-import { error, ActionSequence } from 'selenium-webdriver';
+import { error, Actions } from 'selenium-webdriver';
 import 'reflect-metadata';
 import { ThenableWebDriver, By, until, WebElement } from 'selenium-webdriver';
 import { TestConstants } from '../TestConstants';
@@ -26,7 +26,7 @@ export class DriverHelper {
         this.driver = driver.get();
     }
 
-    public getAction(): ActionSequence {
+    public getAction(): Actions {
         Logger.trace('DriverHelper.getAction');
 
         return this.driver.actions();
@@ -717,7 +717,7 @@ export class DriverHelper {
             }
 
             try {
-                await this.getAction().mouseMove(element).perform();
+                await this.getAction().move({origin: element}).perform();
                 return;
             } catch (err) {
                 if (err instanceof error.StaleElementReferenceError) {

package/utils/{PreferencesHandler.ts → theia/PreferencesHandlerTheia.ts}

@@ -9,27 +9,27 @@
  **********************************************************************/
 
 import { injectable, inject } from 'inversify';
-import { Logger } from './Logger';
-import { CLASSES } from '../inversify.types';
-import { CheApiRequestHandler } from './requestHandlers/CheApiRequestHandler';
-import { Editor } from '../pageobjects/ide/Editor';
-import { QuickOpenContainer } from '../pageobjects/ide/QuickOpenContainer';
-import { TopMenu } from '../pageobjects/ide/TopMenu';
+import { Logger } from '../Logger';
+import { CLASSES } from '../../inversify.types';
+import { CheApiRequestHandler } from '../requestHandlers/CheApiRequestHandler';
+import { Editor } from '../../pageobjects/ide/theia/Editor';
+import { QuickOpenContainer } from '../../pageobjects/ide/theia/QuickOpenContainer';
+import { TopMenu } from '../../pageobjects/ide/theia/TopMenu';
 import { Key } from 'selenium-webdriver';
 
-export enum TerminalRendererType {
+export enum TerminalRendererTypeTheia {
     canvas = 'canvas',
     dom = 'dom'
 }
 
-export enum AskForConfirmationType {
+export enum AskForConfirmationTypeTheia {
     never = 'never',
     ifRquired = 'ifRequired',
     always = 'always'
 }
 
 @injectable()
-export class PreferencesHandler {
+export class PreferencesHandlerTheia {
 
     constructor(@inject(CLASSES.CheApiRequestHandler) private readonly requestHandler: CheApiRequestHandler,
         @inject(CLASSES.Editor) private readonly editor: Editor,
@@ -61,7 +61,7 @@ export class PreferencesHandler {
     /**
      * Works properly only if set before workspace startup.
      */
-    public async setTerminalType(type: TerminalRendererType) {
+    public async setTerminalType(type: TerminalRendererTypeTheia) {
         Logger.debug('PreferencesHandler.setTerminalToDom');
         await this.setPreference('terminal.integrated.rendererType', type);
     }
@@ -70,7 +70,7 @@ export class PreferencesHandler {
      *
      * @param askForConfirmation possible values are "never", "ifRequired" and "always"
      */
-    public async setConfirmExit(askForConfirmation: AskForConfirmationType) {
+    public async setConfirmExit(askForConfirmation: AskForConfirmationTypeTheia) {
         Logger.debug(`PreferencesHandler.setConfirmExit to ${askForConfirmation}`);
         await this.setPreference(`application.confirmExit`, askForConfirmation);
     }

package/dist/pageobjects/ide/ContextMenu.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ContextMenu.js","sourceRoot":"","sources":["../../../pageobjects/ide/ContextMenu.ts"],"names":[],"mappings":";AAAA;;;;;;;;wEAQwE;;;;;;;;;;;;;;;;AAExE,4BAA0B;AAC1B,yCAA+C;AAC/C,2DAAwD;AACxD,2DAAgD;AAChD,2DAAiE;AACjE,+CAA4C;AAC5C,6DAA0D;AAG1D,IAAa,WAAW,mBAAxB,MAAa,WAAW;IAGnB,YAA2D,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAI,CAAC;IAG1F,KAAK,CAAC,sCAAsC,CAAC,cAAkB;QAC1D,eAAM,CAAC,KAAK,CAAC,sDAAsD,cAAc,EAAE,CAAC,CAAC;QAErF,MAAM,UAAU,GAAe,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,cAAc,EAAE,mCAAgB,CAAC,uBAAuB,CAAC,CAAC;QAChI,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,2BAAM,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QAC9E,IAAI,CAAC,eAAe,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,wCAAwC;QACzC,eAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAErE,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,GAAG,wBAAG,CAAC,GAAG,CAAC,CAAC;QACvF,IAAI,CAAC,eAAe,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,UAAkB;QACjD,eAAM,CAAC,KAAK,CAAC,8CAA8C,UAAU,GAAG,CAAC,CAAC;QAE1E,MAAM,WAAW,GAAW,+CAA+C,UAAU,IAAI,CAAC;QAC1F,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC7B,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,uBAAE,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,mCAAgB,CAAC,uBAAuB,CAAC,CAAC;IAC3G,CAAC;IAED,KAAK,CAAC,eAAe;QAChB,eAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAE5C,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,uBAAE,CAAC,GAAG,CAAC,aAAW,CAAC,0BAA0B,CAAC,EAAE,mCAAgB,CAAC,uBAAuB,CAAC,CAAC;IACtI,CAAC;CAEL,CAAA;AAlC4B,sCAA0B,GAAW,mBAAmB,CAAC;AADzE,WAAW;IADvB,sBAAU,EAAE;IAIK,WAAA,kBAAM,CAAC,yBAAO,CAAC,YAAY,CAAC,CAAA;qCAAgC,2BAAY;GAH7E,WAAW,CAmCvB;AAnCY,kCAAW"}

package/dist/pageobjects/ide/DebugView.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DebugView.js","sourceRoot":"","sources":["../../../pageobjects/ide/DebugView.ts"],"names":[],"mappings":"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"}

package/dist/pageobjects/ide/DialogWindow.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DialogWindow.js","sourceRoot":"","sources":["../../../pageobjects/ide/DialogWindow.ts"],"names":[],"mappings":"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"}