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

package/tests/devfiles/code/JavaSpringBoot.spec.ts

@@ -0,0 +1,77 @@
+/*********************************************************************
+ * Copyright (c) 2020 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import 'reflect-metadata';
+import { CLASSES } from '../../../inversify.types';
+import { e2eContainer } from '../../../inversify.config';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
+import { CreateWorkspace } from '../../../pageobjects/dashboard/CreateWorkspace';
+import { Logger } from '../../../utils/Logger';
+import { ApiUrlResolver } from '../../../utils/workspace/ApiUrlResolver';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { Dashboard } from '../../../pageobjects/dashboard/Dashboard';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { By, until } from 'selenium-webdriver';
+import { Workbench } from 'monaco-page-objects';
+
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
+const createWorkspace: CreateWorkspace = e2eContainer.get(CLASSES.CreateWorkspace);
+const apiUrlResolver: ApiUrlResolver = e2eContainer.get(CLASSES.ApiUrlResolver);
+const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
+const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
+
+const stack: string = 'Java Spring Boot';
+
+suite(`${stack} test`, async () => {
+    suite(`Create ${stack} workspace`, async () => {
+        // workspaceHandlingTests.createAndOpenWorkspace(stack);
+        test('Start Maven workspace using factory URL and vscode editor', async() => {
+            await dashboard.waitPage();
+            Logger.debug(`Fetching user kubernetes namespace, storing auth token by getting workspaces API URL.`);
+            await apiUrlResolver.getWorkspacesApiUrl();
+            await dashboard.clickCreateWorkspaceButton();
+            await createWorkspace.waitPage();
+            workspaceHandlingTests.setWindowHandle(await browserTabsUtil.getCurrentWindowHandle());
+            await createWorkspace.startWorkspaceUsingFactory(`https://github.com/che-samples/web-java-spring-boot/tree/master?che-editor=che-incubator/che-code/insiders&storageType=persistent`);
+            await browserTabsUtil.waitAndSwitchToAnotherWindow(workspaceHandlingTests.getWindowHandle(), TimeoutConstants.TS_IDE_LOAD_TIMEOUT);
+        });
+        workspaceHandlingTests.obtainWorkspaceNameFromStartingPage();
+        test('Register running workspace', async () => {
+            CheReporter.registerRunningWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        });
+        test('Wait workspace readiness', async() => {
+            try {
+                await driverHelper.getDriver().wait(until.elementLocated(By.className('monaco-workbench')));
+            } catch (err) {
+                if ((err as Error).name === 'WebDriverError') {
+                    await new Promise(res => setTimeout(res, 3000));
+                } else {
+                    throw err;
+                }
+            }
+            let workbench = new Workbench();
+            let activityBar = workbench.getActivityBar();
+            let activityBarControls = await activityBar.getViewControls();
+            Logger.debug(`Editor sections:`);
+            activityBarControls.forEach(async control => {
+                Logger.debug(`${await control.getTitle()}`);
+            });
+        });
+        // projectAndFileTests.waitWorkspaceReadiness(workspaceSampleName, workspaceRootFolderName, false);
+    });
+
+    suite('Stopping and deleting the workspace', async () => {
+        test(`Stop and remowe workspace`, async () => {
+            await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+        });
+    });
+});

package/tests/devfiles/{CSlashCPlusPlus.spec.ts → theia/CSlashCPlusPlus.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 { Editor } from '../../pageobjects/ide/Editor';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 
 const workspaceSampleName: string = 'cpp-hello-world';

package/tests/devfiles/{DevfileSmoke.spec.ts → theia/DevfileSmoke.spec.ts}

@@ -8,18 +8,18 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { CLASSES } from '../../inversify.types';
-import { e2eContainer } from '../../inversify.config';
-import { PreferencesHandler } from '../../utils/PreferencesHandler';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { NavigationBar } from '../../pageobjects/ide/NavigationBar';
-import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
-import CheReporter from '../../driver/CheReporter';
+import { CLASSES } from '../../../inversify.types';
+import { e2eContainer } from '../../../inversify.config';
+import { PreferencesHandlerTheia } from '../../../utils/theia/PreferencesHandlerTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { NavigationBar } from '../../../pageobjects/ide/theia/NavigationBar';
+import { Dashboard } from '../../../pageobjects/dashboard/Dashboard';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const navigationBar: NavigationBar = e2eContainer.get(CLASSES.NavigationBar);
 const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 

package/tests/devfiles/{DotNetCore.spec.ts → theia/DotNetCore.spec.ts}

@@ -8,19 +8,19 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { CLASSES } from '../../inversify.types';
-import { e2eContainer } from '../../inversify.config';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { CLASSES } from '../../../inversify.types';
+import { e2eContainer } from '../../../inversify.config';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 
 const workspaceSampleName: string = 'dotnet-web-simple';

package/tests/devfiles/{Go.spec.ts → theia/Go.spec.ts}

@@ -7,22 +7,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { CLASSES } from '../../inversify.types';
-import { e2eContainer } from  '../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { e2eContainer } from  '../../../inversify.config';
 import 'reflect-metadata';
-import { Logger } from '../../utils/Logger';
-import { PreferencesHandler } from '../../utils/PreferencesHandler';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { Logger } from '../../../utils/Logger';
+import { PreferencesHandlerTheia } from '../../../utils/theia/PreferencesHandlerTheia';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 
 const workspaceStack: string = 'Go';
 const workspaceSampleName: string = 'golang-example';

package/tests/devfiles/{JavaMaven.spec.ts → theia/JavaMaven.spec.ts}

@@ -8,18 +8,18 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { CLASSES } from '../../inversify.types';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { e2eContainer } from '../../inversify.config';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { CLASSES } from '../../../inversify.types';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { e2eContainer } from '../../../inversify.config';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 
 const workspaceSampleName: string = 'console-java-simple';
 const workspaceRootFolderName: string = 'src';

package/tests/devfiles/{JavaSpringBoot.spec.ts → theia/JavaSpringBoot.spec.ts}

@@ -8,18 +8,18 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { CLASSES } from '../../inversify.types';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { e2eContainer } from '../../inversify.config';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { CLASSES } from '../../../inversify.types';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { e2eContainer } from '../../../inversify.config';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 
 const stack: string = 'Java Spring Boot';
 const workspaceSampleName: string = 'java-web-spring';

package/tests/devfiles/{JavaVertx.spec.ts → theia/JavaVertx.spec.ts}

@@ -8,18 +8,18 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { CLASSES } from '../../inversify.types';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { e2eContainer } from '../../inversify.config';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { CLASSES } from '../../../inversify.types';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { e2eContainer } from '../../../inversify.config';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 
 const workspaceSampleName: string = 'vertx-http-example';
 const workspaceRootFolderName: string = 'src';

package/tests/devfiles/{NodeJS.spec.ts → theia/NodeJS.spec.ts}

@@ -7,19 +7,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { CLASSES } from '../../inversify.types';
+import { CLASSES } from '../../../inversify.types';
 import 'reflect-metadata';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { e2eContainer } from '../../inversify.config';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { e2eContainer } from '../../../inversify.config';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 
 const workspaceStack: string = 'NodeJS Express Web Application';
 const workspaceSampleName: string = 'nodejs-web-app';

package/tests/devfiles/{PHPSimple.spec.ts → theia/PHPSimple.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 { Editor } from '../../pageobjects/ide/Editor';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES } from '../../../inversify.types';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 
 const workspaceSampleName: string = 'php-web-simple';

package/tests/devfiles/{Python.spec.ts → theia/Python.spec.ts}

@@ -7,19 +7,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { CLASSES } from '../../inversify.types';
+import { CLASSES } from '../../../inversify.types';
 import 'reflect-metadata';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { e2eContainer } from '../../inversify.config';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { e2eContainer } from '../../../inversify.config';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 
 const workspaceStack: string = 'Python';
 const workspaceSampleName: string = 'python-hello-world';

package/tests/devfiles/{PythonDjango.spec.ts → theia/PythonDjango.spec.ts}

@@ -7,17 +7,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { CLASSES } from '../../inversify.types';
+import { CLASSES } from '../../../inversify.types';
 import 'reflect-metadata';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { e2eContainer } from '../../inversify.config';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { e2eContainer } from '../../../inversify.config';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 
 const workspaceStack: string = 'Python Django';
 const workspaceSampleName: string = 'django-realworld-example-app';

package/tests/devfiles/{Quarkus.spec.ts → theia/Quarkus.spec.ts}

@@ -7,19 +7,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-import { CLASSES } from '../../inversify.types';
+import { CLASSES } from '../../../inversify.types';
 import 'reflect-metadata';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { e2eContainer } from '../../inversify.config';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { e2eContainer } from '../../../inversify.config';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 
 const workspaceStack: string = 'Quarkus CLI';
 const workspaceSampleName: string = 'quarkus-quickstarts';

package/tests/devfiles/{Scala.spec.ts → theia/Scala.spec.ts}

@@ -8,18 +8,18 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 import 'reflect-metadata';
-import { CLASSES } from '../../inversify.types';
-import { LanguageServerTests } from '../../testsLibrary/LanguageServerTests';
-import { e2eContainer } from '../../inversify.config';
-import { CodeExecutionTests } from '../../testsLibrary/CodeExecutionTests';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { CLASSES } from '../../../inversify.types';
+import { LanguageServerTestsTheia } from '../../../testsLibrary/theia/LanguageServerTestsTheia';
+import { e2eContainer } from '../../../inversify.config';
+import { CodeExecutionTestsTheia } from '../../../testsLibrary/theia/CodeExecutionTestsTheia';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
-const commonLanguageServerTests: LanguageServerTests = e2eContainer.get(CLASSES.LanguageServerTests);
-const codeExecutionTests: CodeExecutionTests = e2eContainer.get(CLASSES.CodeExecutionTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
+const commonLanguageServerTests: LanguageServerTestsTheia = e2eContainer.get(CLASSES.LanguageServerTestsTheia);
+const codeExecutionTests: CodeExecutionTestsTheia = e2eContainer.get(CLASSES.CodeExecutionTestsTheia);
 
 const workspaceSampleName: string = 'console-scala-simple';
 const workspaceRootFolderName: string = 'example';

package/tests/e2e/{FactoryUrl.spec.ts → theia/FactoryUrl.spec.ts}

@@ -8,18 +8,18 @@
 //  * SPDX-License-Identifier: EPL-2.0
 //  **********************************************************************/
 
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES, TYPES } from '../../inversify.types';
-import { TestConstants } from '../../TestConstants';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES, TYPES } from '../../../inversify.types';
+import { TestConstants } from '../../../TestConstants';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { ITestWorkspaceUtil } from '../../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
 
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const testWorkspaceUtils: ITestWorkspaceUtil = e2eContainer.get<ITestWorkspaceUtil>(TYPES.WorkspaceUtil);
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get<WorkspaceHandlingTests>(CLASSES.WorkspaceHandlingTests);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 
 const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://raw.githubusercontent.com/eclipse/che-devfile-registry/master/devfiles/java-maven/devfile.yaml`;
 const workspaceSampleName: string = 'console-java-simple';

package/tests/e2e/{GitPublishBranch.spec.ts → theia/GitPublishBranch.spec.ts}

@@ -8,23 +8,23 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES, TYPES } from '../../inversify.types';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { GitPlugin } from '../../pageobjects/ide/plugins/GitPlugin';
-import { Ide } from '../../pageobjects/ide/Ide';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
-import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
-import { TestConstants } from '../../TestConstants';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { TopMenu } from '../../pageobjects/ide/TopMenu';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES, TYPES } from '../../../inversify.types';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { GitPlugin } from '../../../pageobjects/ide/theia/plugins/GitPlugin';
+import { Ide } from '../../../pageobjects/ide/theia/Ide';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { QuickOpenContainer } from '../../../pageobjects/ide/theia/QuickOpenContainer';
+import { ICheLoginPage } from '../../../pageobjects/login/ICheLoginPage';
+import { TestConstants } from '../../../TestConstants';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { TopMenu } from '../../../pageobjects/ide/theia/TopMenu';
+import { WorkspaceNameHandler } from '../../../utils/WorkspaceNameHandler';
 import { By } from 'selenium-webdriver';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { ITestWorkspaceUtil } from '../../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);