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

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

@@ -8,23 +8,23 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES, TYPES } from '../../inversify.types';
-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 { TimeoutConstants } from '../../TimeoutConstants';
-import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
-import CheReporter from '../../driver/CheReporter';
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES, TYPES } from '../../../inversify.types';
+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 { TimeoutConstants } from '../../../TimeoutConstants';
+import { Dashboard } from '../../../pageobjects/dashboard/Dashboard';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { ITestWorkspaceUtil } from '../../../utils/workspace/ITestWorkspaceUtil';
+import CheReporter from '../../../driver/CheReporter';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);

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

@@ -9,26 +9,26 @@
  **********************************************************************/
 
 import { assert } from 'chai';
-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 { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
-import { CheGitApi } from '../../utils/VCS/CheGitApi';
-import { GitHubUtil } from '../../utils/VCS/github/GitHubUtil';
-import { TopMenu } from '../../pageobjects/ide/TopMenu';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { Dashboard } from '../..';
-import { ITestWorkspaceUtil } from '../../utils/workspace/ITestWorkspaceUtil';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+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 { WorkspaceNameHandler } from '../../../utils/WorkspaceNameHandler';
+import { CheGitApi } from '../../../utils/VCS/CheGitApi';
+import { GitHubUtil } from '../../../utils/VCS/github/GitHubUtil';
+import { TopMenu } from '../../../pageobjects/ide/theia/TopMenu';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { Dashboard } from '../../../pageobjects/dashboard/Dashboard';
+import { ITestWorkspaceUtil } from '../../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);

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

@@ -8,26 +8,26 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
+import { e2eContainer } from '../../../inversify.config';
+import { CLASSES, TYPES } from '../../../inversify.types';
+import { Dashboard } from '../../../pageobjects/dashboard/Dashboard';
+import { Ide } from '../../../pageobjects/ide/theia/Ide';
+import { Buttons, Locations, OpenDialogWidget } from '../../../pageobjects/ide/theia/OpenDialogWidget';
+import { OpenshiftAppExplorerToolbar, OpenshiftContextMenuItems, OpenshiftPlugin } from '../../../pageobjects/ide/theia/plugins/OpenshiftPlugin';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { QuickOpenContainer } from '../../../pageobjects/ide/theia/QuickOpenContainer';
+import { Terminal } from '../../../pageobjects/ide/theia/Terminal';
+import { TopMenu } from '../../../pageobjects/ide/theia/TopMenu';
+import { ICheLoginPage } from '../../../pageobjects/login/ICheLoginPage';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { TestConstants } from '../../../TestConstants';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { PreferencesHandlerTheia, TerminalRendererTypeTheia } from '../../../utils/theia/PreferencesHandlerTheia';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { ITestWorkspaceUtil } from '../../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 import { Key } from 'selenium-webdriver';
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES, TYPES } from '../../inversify.types';
-import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
-import { Ide } from '../../pageobjects/ide/Ide';
-import { Buttons, Locations, OpenDialogWidget } from '../../pageobjects/ide/OpenDialogWidget';
-import { OpenshiftAppExplorerToolbar, OpenshiftContextMenuItems, OpenshiftPlugin } from '../../pageobjects/ide/plugins/OpenshiftPlugin';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
-import { Terminal } from '../../pageobjects/ide/Terminal';
-import { TopMenu } from '../../pageobjects/ide/TopMenu';
-import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
-import { TestConstants } from '../../TestConstants';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { PreferencesHandler, TerminalRendererType } from '../../utils/PreferencesHandler';
-import { TimeoutConstants } from '../../TimeoutConstants';
-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 ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -37,7 +37,7 @@ const openshiftPlugin: OpenshiftPlugin = e2eContainer.get(CLASSES.OpenshiftPlugi
 const dashboard: Dashboard = e2eContainer.get(CLASSES.Dashboard);
 const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
 const openDialogWidget: OpenDialogWidget = e2eContainer.get(CLASSES.OpenDialogWidget);
-const preferencesHalder: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+const preferencesHalder: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 const terminal: Terminal = e2eContainer.get(CLASSES.Terminal);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
@@ -50,7 +50,7 @@ suite('Openshift connector user story', async () => {
   let wsName: string;
 
   suiteSetup(async function () {
-    preferencesHalder.setTerminalType(TerminalRendererType.dom);
+    preferencesHalder.setTerminalType(TerminalRendererTypeTheia.dom);
     const wsConfig = await testWorkspaceUtils.getBaseDevfile();
     wsName = wsConfig.metadata!.name!;
     wsConfig.projects = [

package/tests/e2e/{factories → theia/factories}/DirectUrlFactoryWithKeepDirectoryTest.spec.ts

@@ -8,17 +8,17 @@
 //  * SPDX-License-Identifier: EPL-2.0
 //  **********************************************************************/
 
-import { e2eContainer } from '../../../inversify.config';
-import { CLASSES } from '../../../inversify.types';
-import { TestConstants } from '../../../TestConstants';
-import { ProjectAndFileTests } from '../../../testsLibrary/ProjectAndFileTests';
-import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
-import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
-import { PreferencesHandler } from '../../../utils/PreferencesHandler';
-
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+import { e2eContainer } from '../../../../inversify.config';
+import { CLASSES } from '../../../../inversify.types';
+import { TestConstants } from '../../../../TestConstants';
+import { ProjectAndFileTestsTheia } from '../../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { BrowserTabsUtil } from '../../../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../../../testsLibrary/WorkspaceHandlingTests';
+import { PreferencesHandlerTheia } from '../../../../utils/theia/PreferencesHandlerTheia';
+
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
 const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/master/src`;

package/tests/e2e/{factories → theia/factories}/DirectUrlFactoryWithRootFolderTest.spec.ts

@@ -8,17 +8,17 @@
 //  * SPDX-License-Identifier: EPL-2.0
 //  **********************************************************************/
 
-import { e2eContainer } from '../../../inversify.config';
-import { CLASSES } from '../../../inversify.types';
-import { TestConstants } from '../../../TestConstants';
-import { ProjectAndFileTests } from '../../../testsLibrary/ProjectAndFileTests';
-import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
-import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
-import { PreferencesHandler } from '../../../utils/PreferencesHandler';
-
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+import { e2eContainer } from '../../../../inversify.config';
+import { CLASSES } from '../../../../inversify.types';
+import { TestConstants } from '../../../../TestConstants';
+import { ProjectAndFileTestsTheia } from '../../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { BrowserTabsUtil } from '../../../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../../../testsLibrary/WorkspaceHandlingTests';
+import { PreferencesHandlerTheia } from '../../../../utils/theia/PreferencesHandlerTheia';
+
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
 const factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple`;

package/tests/e2e/{factories → theia/factories}/DirectUrlFactoryWithSpecificBranchTest.spec.ts

@@ -8,17 +8,17 @@
 //  * SPDX-License-Identifier: EPL-2.0
 //  **********************************************************************/
 
-import { e2eContainer } from '../../../inversify.config';
-import { CLASSES } from '../../../inversify.types';
-import { TestConstants } from '../../../TestConstants';
-import { ProjectAndFileTests } from '../../../testsLibrary/ProjectAndFileTests';
-import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
-import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
-import { PreferencesHandler } from '../../../utils/PreferencesHandler';
-
-const preferencesHandler: PreferencesHandler = e2eContainer.get(CLASSES.PreferencesHandler);
+import { e2eContainer } from '../../../../inversify.config';
+import { CLASSES } from '../../../../inversify.types';
+import { TestConstants } from '../../../../TestConstants';
+import { ProjectAndFileTestsTheia } from '../../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { BrowserTabsUtil } from '../../../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../../../testsLibrary/WorkspaceHandlingTests';
+import { PreferencesHandlerTheia } from '../../../../utils/theia/PreferencesHandlerTheia';
+
+const preferencesHandler: PreferencesHandlerTheia = e2eContainer.get(CLASSES.PreferencesHandlerTheia);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 
 let factoryUrl : string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=https://github.com/che-samples/console-java-simple/tree/java1.11`;

package/tests/e2e_happy_path/{DevWorkspaceHappyPath.spec.ts → theia/DevWorkspaceHappyPath.spec.ts}

@@ -7,25 +7,25 @@
 //  *
 //  * SPDX-License-Identifier: EPL-2.0
 //  **********************************************************************/
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { CLASSES } from '../../inversify.types';
-import { DebugView } from '../../pageobjects/ide/DebugView';
-import { DialogWindow } from '../../pageobjects/ide/DialogWindow';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { e2eContainer } from '../../inversify.config';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { Ide, LeftToolbarButton } from '../../pageobjects/ide/Ide';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { CLASSES } from '../../../inversify.types';
+import { DebugView } from '../../../pageobjects/ide/theia/DebugView';
+import { DialogWindow } from '../../../pageobjects/ide/theia/DialogWindow';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { e2eContainer } from '../../../inversify.config';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { Ide, LeftToolbarButton } from '../../../pageobjects/ide/theia/Ide';
 import { Key, error, By } from 'selenium-webdriver';
-import { Logger } from '../../utils/Logger';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { Terminal } from '../../pageobjects/ide/Terminal';
-import { TestConstants } from '../../TestConstants';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { TopMenu } from '../../pageobjects/ide/TopMenu';
+import { Logger } from '../../../utils/Logger';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { Terminal } from '../../../pageobjects/ide/theia/Terminal';
+import { TestConstants } from '../../../TestConstants';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { TopMenu } from '../../../pageobjects/ide/theia/TopMenu';
 import * as fs from 'fs';
 import axios from 'axios';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
@@ -57,8 +57,6 @@ const SpringAppLocators = {
 suite('Workspace creation via factory url', async () => {
     let factoryUrl : string = `${TestConstants.TS_SELENIUM_DEVWORKSPACE_URL}`;
 
-    const workspaceRootFolderName: string = 'src';
-
     suite('Open factory URL', async () => {
         // this is DevWorkspace test specific - we create the test ws. using factory instead of chectl
         test(`Navigating to factory URL`, async () => {
@@ -272,7 +270,7 @@ async function sendRequestToDebugApp(urlToApp: string) {
     const httpClient = axios.create();
     httpClient.defaults.timeout = 1000;
     try {
-      await httpClient.get(urlToApp);
+        await httpClient.get(urlToApp);
     } catch (error) {
         if (error instanceof Error) {
             if (error.message === 'timeout of 1000ms exceeded') {

package/tests/e2e_happy_path/{HappyPath.spec.ts → theia/HappyPath.spec.ts}

@@ -8,28 +8,28 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-import { e2eContainer } from '../../inversify.config';
-import { DriverHelper } from '../../utils/DriverHelper';
-import { CLASSES } from '../../inversify.types';
-import { Ide, LeftToolbarButton } from '../../pageobjects/ide/Ide';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { TopMenu } from '../../pageobjects/ide/TopMenu';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { PreviewWidget } from '../../pageobjects/ide/PreviewWidget';
-import { TestConstants } from '../../TestConstants';
+import { e2eContainer } from '../../../inversify.config';
+import { DriverHelper } from '../../../utils/DriverHelper';
+import { CLASSES } from '../../../inversify.types';
+import { Ide, LeftToolbarButton } from '../../../pageobjects/ide/theia/Ide';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { TopMenu } from '../../../pageobjects/ide/theia/TopMenu';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { PreviewWidget } from '../../../pageobjects/ide/theia/PreviewWidget';
+import { TestConstants } from '../../../TestConstants';
 import { By, Key, error } from 'selenium-webdriver';
-import { DebugView } from '../../pageobjects/ide/DebugView';
-import { DialogWindow } from '../../pageobjects/ide/DialogWindow';
-import { Terminal } from '../../pageobjects/ide/Terminal';
+import { DebugView } from '../../../pageobjects/ide/theia/DebugView';
+import { DialogWindow } from '../../../pageobjects/ide/theia/DialogWindow';
+import { Terminal } from '../../../pageobjects/ide/theia/Terminal';
 import * as fs from 'fs';
-import { Workspaces } from '../../pageobjects/dashboard/Workspaces';
-import { Dashboard } from '../../pageobjects/dashboard/Dashboard';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { Logger } from '../../utils/Logger';
-import { RightToolBar } from '../../pageobjects/ide/RightToolBar';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import CheReporter from '../../driver/CheReporter';
+import { Workspaces } from '../../../pageobjects/dashboard/Workspaces';
+import { Dashboard } from '../../../pageobjects/dashboard/Dashboard';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { Logger } from '../../../utils/Logger';
+import { RightToolBar } from '../../../pageobjects/ide/theia/RightToolBar';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import CheReporter from '../../../driver/CheReporter';
 
 const driverHelper: DriverHelper = e2eContainer.get(CLASSES.DriverHelper);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
@@ -46,6 +46,7 @@ const warningDialog: DialogWindow = e2eContainer.get(CLASSES.DialogWindow);
 const projectName: string = 'petclinic';
 const workspaceRootFolderName: string = 'src';
 const workspaceName: string = TestConstants.TS_SELENIUM_HAPPY_PATH_WORKSPACE_NAME;
+
 const pathToJavaFolder: string = `${projectName}/${workspaceRootFolderName}/main/java/org/springframework/samples/petclinic`;
 const pathToChangedJavaFileFolder: string = `${projectName}/${workspaceRootFolderName}/main/java/org/springframework/samples/petclinic/system`;
 const classPathFilename: string = '.classpath';

package/tests/intelij/IntelijOpenWorkspace.spec.ts

@@ -11,7 +11,7 @@
 import { By } from 'selenium-webdriver';
 import { e2eContainer } from '../../inversify.config';
 import { CLASSES } from '../../inversify.types';
-import { Ide } from '../../pageobjects/ide/Ide';
+import { Ide } from '../../pageobjects/ide/theia/Ide';
 import { DriverHelper } from '../../utils/DriverHelper';
 import { TestConstants } from '../../TestConstants';
 import { Dashboard } from '../../pageobjects/dashboard/Dashboard';

package/tests/load_test/{LoadTest.spec.ts → theia/LoadTest.spec.ts}

@@ -8,15 +8,16 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-import { e2eContainer } from '../../inversify.config';
-import { CLASSES, TYPES } from '../../inversify.types';
-import { Ide } from '../../pageobjects/ide/Ide';
-import { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { ICheLoginPage } from '../../pageobjects/login/ICheLoginPage';
-import { TestConstants, WorkspaceNameHandler } from '../..';
-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 { Ide } from '../../../pageobjects/ide/theia/Ide';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { ICheLoginPage } from '../../../pageobjects/login/ICheLoginPage';
+import { TestConstants } from '../../../TestConstants';
+import { WorkspaceNameHandler } from '../../../utils/WorkspaceNameHandler';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { ITestWorkspaceUtil } from '../../../utils/workspace/ITestWorkspaceUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
 
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);

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

@@ -8,28 +8,28 @@
  * 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 { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { Logger } from '../../utils/Logger';
-import { GitHubPullRequestPlugin } from '../../pageobjects/ide/plugins/GitHubPullRequestPlugin';
-import { GitLoginPage } from '../../pageobjects/third-parties/GitLoginPage';
-import { GitOauthAppsSettings } from '../../pageobjects/third-parties/GitOauthAppsSettings';
-import { WorkspaceNameHandler } from '../../utils/WorkspaceNameHandler';
-import { GitPlugin } from '../../pageobjects/ide/plugins/GitPlugin';
-import { TopMenu } from '../../pageobjects/ide/TopMenu';
-import { QuickOpenContainer } from '../../pageobjects/ide/QuickOpenContainer';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
+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 { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { Logger } from '../../../utils/Logger';
+import { GitHubPullRequestPlugin } from '../../../pageobjects/ide/theia/plugins/GitHubPullRequestPlugin';
+import { GitLoginPage } from '../../../pageobjects/third-parties/GitLoginPage';
+import { GitOauthAppsSettings } from '../../../pageobjects/third-parties/GitOauthAppsSettings';
+import { WorkspaceNameHandler } from '../../../utils/WorkspaceNameHandler';
+import { GitPlugin } from '../../../pageobjects/ide/theia/plugins/GitPlugin';
+import { TopMenu } from '../../../pageobjects/ide/theia/TopMenu';
+import { QuickOpenContainer } from '../../../pageobjects/ide/theia/QuickOpenContainer';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
 import { Key } from 'selenium-webdriver';
 
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
-const workspaceHandling: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
+const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const gitHubPullRequestPlugin: GitHubPullRequestPlugin = e2eContainer.get(CLASSES.GitHubPullRequestPlugin);
 const githubLoginPage: GitLoginPage = e2eContainer.get(CLASSES.GitLoginPage);
@@ -39,7 +39,6 @@ const topMenu: TopMenu = e2eContainer.get(CLASSES.TopMenu);
 const quickOpenContainer: QuickOpenContainer = e2eContainer.get(CLASSES.QuickOpenContainer);
 const editor: Editor = e2eContainer.get(CLASSES.Editor);
 const workspaceNameHandler: WorkspaceNameHandler = e2eContainer.get(CLASSES.WorkspaceNameHandler);
-const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 
 const devfileUrl: string = `https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/GitHubPullRequestPlugin.yaml`;
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devfileUrl}`;
@@ -137,7 +136,7 @@ suite(`The 'GitHubPullRequestPlugin' test`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test(`Stop and remove workspace`, async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandling.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

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

@@ -8,23 +8,22 @@
  * 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 { ProjectTree } from '../../pageobjects/ide/ProjectTree';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { PluginsView } from '../../pageobjects/ide/plugins/PluginsView';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { Logger } from '../../utils/Logger';
+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 { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { PluginsView } from '../../../pageobjects/ide/theia/plugins/PluginsView';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { Logger } from '../../../utils/Logger';
 
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 const projectTree: ProjectTree = e2eContainer.get(CLASSES.ProjectTree);
 const pluginsView: PluginsView = e2eContainer.get(CLASSES.PluginsView);
 
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
-const workspaceHandling: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 
 const devfileUrl: string = 'https://raw.githubusercontent.com/eclipse/che/main/tests/e2e/files/devfiles/plugins/InstallPluginUsingUI.yaml';
@@ -67,7 +66,7 @@ suite(`The 'InstallPluginUsingUI' test`, async () => {
     suite('Stopping and deleting the workspace', async () => {
         test(`Stop and remove workspace`, async () => {
             if (TestConstants.TS_DELETE_PLUGINS_TEST_WORKSPACE === 'true') {
-                await workspaceHandling.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
+                await workspaceHandlingTests.stopAndRemoveWorkspace(WorkspaceHandlingTests.getWorkspaceName());
                 return;
             }
 

package/tests/plugins/{JavaPlugin.spec.ts → theia/JavaPlugin.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 { Ide } from '../../pageobjects/ide/Ide';
-import { TimeoutConstants } from '../../TimeoutConstants';
-import { TestConstants } from '../../TestConstants';
+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 { Key } from 'selenium-webdriver';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { ProjectAndFileTests } from '../../testsLibrary/ProjectAndFileTests';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { Logger } from '../../utils/Logger';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { PreferencesHandler } from '../../utils/PreferencesHandler';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { ProjectAndFileTestsTheia } from '../../../testsLibrary/theia/ProjectAndFileTestsTheia';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { Logger } from '../../../utils/Logger';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { PreferencesHandlerTheia } from '../../../utils/theia/PreferencesHandlerTheia';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
-const projectAndFileTests: ProjectAndFileTests = e2eContainer.get(CLASSES.ProjectAndFileTests);
+const projectAndFileTests: ProjectAndFileTestsTheia = e2eContainer.get(CLASSES.ProjectAndFileTestsTheia);
 const browserTabsUtil: BrowserTabsUtil = e2eContainer.get(CLASSES.BrowserTabsUtil);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);
 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/java-guestbook/tree/devfilev2';
 const factoryUrl: string = `${TestConstants.TS_SELENIUM_BASE_URL}/f?url=${devFileUrl}`;

package/tests/plugins/{PhpPlugin.spec.ts → theia/PhpPlugin.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, LeftToolbarButton } from '../../pageobjects/ide/Ide';
-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 { Ide, LeftToolbarButton } from '../../../pageobjects/ide/theia/Ide';
+import { TimeoutConstants } from '../../../TimeoutConstants';
+import { TestConstants } from '../../../TestConstants';
+import { ProjectTree } from '../../../pageobjects/ide/theia/ProjectTree';
 import { Key } from 'selenium-webdriver';
-import { Editor } from '../../pageobjects/ide/Editor';
-import { TopMenu } from '../../pageobjects/ide/TopMenu';
-import { DebugView } from '../../pageobjects/ide/DebugView';
-import { BrowserTabsUtil } from '../../utils/BrowserTabsUtil';
-import { WorkspaceHandlingTests } from '../../testsLibrary/WorkspaceHandlingTests';
-import { Logger } from '../../utils/Logger';
+import { Editor } from '../../../pageobjects/ide/theia/Editor';
+import { TopMenu } from '../../../pageobjects/ide/theia/TopMenu';
+import { DebugView } from '../../../pageobjects/ide/theia/DebugView';
+import { BrowserTabsUtil } from '../../../utils/BrowserTabsUtil';
+import { WorkspaceHandlingTests } from '../../../testsLibrary/WorkspaceHandlingTests';
+import { Logger } from '../../../utils/Logger';
 
 const workspaceHandlingTests: WorkspaceHandlingTests = e2eContainer.get(CLASSES.WorkspaceHandlingTests);
 const ide: Ide = e2eContainer.get(CLASSES.Ide);