From 11a20f1f690cd4d92c9e4e71dffa4cd4fe25ec17 Mon Sep 17 00:00:00 2001 From: Dmytro Nochevnov Date: Fri, 2 Nov 2018 14:37:22 +0200 Subject: [PATCH] Do not execute selenium tests under repair by default (#11689) Signed-off-by: Dmytro Nochevnov --- selenium/che-selenium-core/bin/webdriver.sh | 18 ++++++++++++++++-- .../eclipse/che/selenium/core/TestGroup.java | 1 + .../che/selenium/core/inject/TestFilter.java | 1 + .../selenium/core/inject/TestFilterTest.java | 10 ++++++++-- selenium/che-selenium-test/README.md | 4 ++++ .../dashboard/ImportProjectFromGitHubTest.java | 2 -- .../workspaces/WorkspacesListTest.java | 5 +++-- .../WorkspaceDetailsMachineActionsTest.java | 2 +- .../ChangeVariableWithEvaluatingTest.java | 2 -- .../InnerClassAndLambdaDebuggingTest.java | 2 ++ .../AutocompleteWithInheritTest.java | 2 ++ .../QuickFixAndCodeAssistantFeaturesTest.java | 2 ++ .../autocomplete/ShowHintsCommandTest.java | 3 +++ .../DirectUrlFactoryWithRootFolderTest.java | 4 ++-- .../filewatcher/RemoveFilesWithActiveTabs.java | 6 +----- .../eclipse/che/selenium/git/GitPullTest.java | 4 ++-- .../che/selenium/git/ImportWizardFormTest.java | 8 ++++---- .../languageserver/TypeScriptEditingTest.java | 3 ++- .../csharp/CSharpClassRenamingTest.java | 2 ++ .../CSharpFileAdvancedOperationsTest.java | 6 ++++-- .../csharp/CSharpFileEditingTest.java | 2 ++ .../php/PhpAssistantFeaturesTest.java | 10 +++++++++- .../miscellaneous/WorkingWithTerminalTest.java | 6 ++---- .../plainjava/RunPlainJavaProjectTest.java | 2 ++ .../methods/RenameVirtualMethodsTest.java | 3 ++- .../move/CodeAssistAfterMoveItemTest.java | 2 ++ .../refactor/packages/RenamePackageTest.java | 7 ++++--- ...ImportAndValidateEclipseCheProjectTest.java | 2 ++ .../testrunner/JavaTestPluginTestNgTest.java | 2 +- 29 files changed, 86 insertions(+), 37 deletions(-) diff --git a/selenium/che-selenium-core/bin/webdriver.sh b/selenium/che-selenium-core/bin/webdriver.sh index 6d2f9ff088..be5d382855 100755 --- a/selenium/che-selenium-core/bin/webdriver.sh +++ b/selenium/che-selenium-core/bin/webdriver.sh @@ -78,6 +78,7 @@ initVariables() { PRODUCT_PROTOCOL="http" PRODUCT_HOST=$(detectDockerInterfaceIp) PRODUCT_PORT=8080 + INCLUDE_TESTS_UNDER_REPAIR=false unset DEBUG_OPTIONS unset MAVEN_OPTIONS @@ -149,6 +150,7 @@ checkParameters() { elif [[ "$var" == --skip-sources-validation ]]; then : elif [[ "$var" == --multiuser ]]; then : elif [[ "$var" =~ --exclude=.* ]]; then : + elif [[ "$var" =~ --include-tests-under-repair ]]; then : else printHelp @@ -209,6 +211,9 @@ applyCustomOptions() { elif [[ "$var" =~ --exclude=.* ]]; then EXCLUDE_PARAM=$(echo "$var" | sed -e "s/--exclude=//g") + elif [[ "$var" == --include-tests-under-repair ]]; then + INCLUDE_TESTS_UNDER_REPAIR=true + fi done } @@ -418,6 +423,7 @@ Other options: --skip-sources-validation Fast build. Skips source validation and enforce plugins --workspace-pool-size=[|auto] Size of test workspace pool. Default value is 0, that means that test workspaces are created on demand. + --include-tests-under-repair Include tests which belong to group 'UNDER REPAIR' HOW TO of usage: Test Eclipse Che single user assembly: @@ -435,6 +441,9 @@ HOW TO of usage: Run suite: ${CALLER} <...> --suite= + Include tests which belong to group 'UNDER REPAIR' + ./selenium-tests.sh --include-tests-under-repair + Rerun failed tests: ${CALLER} <...> --failed-tests ${CALLER} <...> --failed-tests --rerun [ATTEMPTS] @@ -725,6 +734,11 @@ getProductConfig() { # Prepare list of test groups to exclude. getExcludedGroups() { local excludeParamArray=(${EXCLUDE_PARAM//,/ }) + + if [[ ${INCLUDE_TESTS_UNDER_REPAIR} == false ]]; then + excludeParamArray+=( 'under_repair' ) + fi + echo $(IFS=$','; echo "${excludeParamArray[*]}") } @@ -780,8 +794,8 @@ generateTestNgFailedReport() { # generates and updates failsafe report generateFailSafeReport () { - mvn -q surefire-report:failsafe-report-only ${MAVEN_OPTIONS} - mvn -q site -DgenerateReports=false ${MAVEN_OPTIONS} + mvn -q surefire-report:failsafe-report-only + mvn -q site -DgenerateReports=false echo "[TEST]" echo -e "[TEST] ${YELLOW}REPORT:${NO_COLOUR}" diff --git a/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/TestGroup.java b/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/TestGroup.java index 35934e4cb2..a48fca9d61 100644 --- a/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/TestGroup.java +++ b/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/TestGroup.java @@ -20,4 +20,5 @@ public interface TestGroup { String GITHUB = "github"; String OSIO = "osio"; String K8S = "k8s"; + String UNDER_REPAIR = "under_repair"; } diff --git a/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/inject/TestFilter.java b/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/inject/TestFilter.java index 68d92ab6cb..c156f20ddb 100644 --- a/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/inject/TestFilter.java +++ b/selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/inject/TestFilter.java @@ -84,6 +84,7 @@ public class TestFilter { groups.remove(TestGroup.SINGLEUSER); groups.remove(TestGroup.MULTIUSER); groups.remove(TestGroup.GITHUB); + groups.remove(TestGroup.UNDER_REPAIR); if (!groups.isEmpty() && !groups.contains(infrastructure.toString().toLowerCase())) { annotation.setEnabled(false); } diff --git a/selenium/che-selenium-core/src/test/java/org/eclipse/che/selenium/core/inject/TestFilterTest.java b/selenium/che-selenium-core/src/test/java/org/eclipse/che/selenium/core/inject/TestFilterTest.java index 49db090218..98b2f82f17 100644 --- a/selenium/che-selenium-core/src/test/java/org/eclipse/che/selenium/core/inject/TestFilterTest.java +++ b/selenium/che-selenium-core/src/test/java/org/eclipse/che/selenium/core/inject/TestFilterTest.java @@ -18,6 +18,7 @@ import static org.eclipse.che.selenium.core.TestGroup.MULTIUSER; import static org.eclipse.che.selenium.core.TestGroup.OPENSHIFT; import static org.eclipse.che.selenium.core.TestGroup.OSIO; import static org.eclipse.che.selenium.core.TestGroup.SINGLEUSER; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -66,8 +67,13 @@ public class TestFilterTest { public Object[][] disableTestGroupManagementData() { return new Object[][] { {new String[] {GITHUB}, GITHUB, CHE_MULTIUSER, Infrastructure.OPENSHIFT}, - {new String[] {GITHUB}, SOME_GROUP + "," + GITHUB, CHE_SINGLEUSER, Infrastructure.OPENSHIFT}, - {new String[] {OPENSHIFT}, GITHUB, CHE_MULTIUSER, Infrastructure.DOCKER}, + { + new String[] {UNDER_REPAIR}, + SOME_GROUP + "," + UNDER_REPAIR, + CHE_SINGLEUSER, + Infrastructure.OPENSHIFT + }, + {new String[] {OPENSHIFT, UNDER_REPAIR}, GITHUB, CHE_MULTIUSER, Infrastructure.DOCKER}, {new String[] {MULTIUSER}, SOME_GROUP, CHE_SINGLEUSER, Infrastructure.DOCKER}, { new String[] {OPENSHIFT, OSIO}, EMPTY_EXCLUDED_GROUPS, CHE_SINGLEUSER, Infrastructure.DOCKER diff --git a/selenium/che-selenium-test/README.md b/selenium/che-selenium-test/README.md index 2e6a8cf810..873d83bc59 100644 --- a/selenium/che-selenium-test/README.md +++ b/selenium/che-selenium-test/README.md @@ -124,6 +124,7 @@ Other options: --skip-sources-validation Fast build. Skips source validation and enforce plugins --workspace-pool-size=[|auto] Size of test workspace pool. Default value is 0, that means that test workspaces are created on demand. + --include-tests-under-repair Include tests which belong to group 'UNDER REPAIR' HOW TO of usage: Test Eclipse Che single user assembly: @@ -141,6 +142,9 @@ HOW TO of usage: Run suite: ./selenium-tests.sh <...> --suite= + Include tests which belong to group 'UNDER REPAIR' + ./selenium-tests.sh --include-tests-under-repair + Rerun failed tests: ./selenium-tests.sh <...> --failed-tests ./selenium-tests.sh <...> --failed-tests --rerun [ATTEMPTS] diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/ImportProjectFromGitHubTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/ImportProjectFromGitHubTest.java index 16695e095e..fc7fc8d4bf 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/ImportProjectFromGitHubTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/ImportProjectFromGitHubTest.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import org.eclipse.che.selenium.core.SeleniumWebDriver; -import org.eclipse.che.selenium.core.TestGroup; import org.eclipse.che.selenium.core.client.TestGitHubRepository; import org.eclipse.che.selenium.core.client.TestWorkspaceServiceClient; import org.eclipse.che.selenium.core.user.DefaultTestUser; @@ -41,7 +40,6 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -@Test(groups = {TestGroup.GITHUB}) public class ImportProjectFromGitHubTest { private static final String WORKSPACE = generate(ImportProjectFromGitHubTest.class.getSimpleName(), 4); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/WorkspacesListTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/WorkspacesListTest.java index 5f236d8773..58439c728c 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/WorkspacesListTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/WorkspacesListTest.java @@ -12,6 +12,7 @@ package org.eclipse.che.selenium.dashboard.workspaces; import static java.util.Arrays.asList; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.core.project.ProjectTemplates.MAVEN_SPRING; import static org.eclipse.che.selenium.core.workspace.WorkspaceTemplate.UBUNTU_JDK8; import static org.eclipse.che.selenium.pageobject.dashboard.NewWorkspace.Stack.BLANK; @@ -205,7 +206,7 @@ public class WorkspacesListTest { workspaces.waitDeleteWorkspaceBtnDisappearance(); } - @Test + @Test(groups = UNDER_REPAIR) public void checkSorting() { workspaces.waitPageLoading(); workspaces.clickOnRamButton(); @@ -275,7 +276,7 @@ public class WorkspacesListTest { checkExpectedJavaWorkspaceDisplaying(); } - @Test() + @Test public void checkWorkspaceActions() throws Exception { workspaces.waitPageLoading(); String mainWindow = seleniumWebDriver.getWindowHandle(); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/details/WorkspaceDetailsMachineActionsTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/details/WorkspaceDetailsMachineActionsTest.java index 16bcae54df..c5f1c52064 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/details/WorkspaceDetailsMachineActionsTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/details/WorkspaceDetailsMachineActionsTest.java @@ -117,7 +117,7 @@ public class WorkspaceDetailsMachineActionsTest { checkRamSection(IMAGE_NAME); } - @Test(groups = DOCKER) + @Test(groups = {DOCKER}) public void checkRamSectionDocker() { checkRamSection("FROM " + IMAGE_NAME + "\n"); } diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/ChangeVariableWithEvaluatingTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/ChangeVariableWithEvaluatingTest.java index 555593c4b0..7d4e1f4008 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/ChangeVariableWithEvaluatingTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/ChangeVariableWithEvaluatingTest.java @@ -45,7 +45,6 @@ import org.eclipse.che.selenium.pageobject.intelligent.CommandsPalette; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; /** @author Musienko Maxim */ public class ChangeVariableWithEvaluatingTest { @@ -112,7 +111,6 @@ public class ChangeVariableWithEvaluatingTest { consoles.waitJDTLSProjectResolveFinishedMessage(PROJECT_NAME_CHANGE_VARIABLE); } - @Test public void changeVariableTest() throws Exception { buildProjectAndOpenMainClass(); commandsPalette.openCommandPalette(); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/InnerClassAndLambdaDebuggingTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/InnerClassAndLambdaDebuggingTest.java index 20070ffdc0..a41c62b65b 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/InnerClassAndLambdaDebuggingTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/debugger/InnerClassAndLambdaDebuggingTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.debugger; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.pageobject.debug.DebugPanel.DebuggerActionButtons.BTN_DISCONNECT; import static org.eclipse.che.selenium.pageobject.debug.DebugPanel.DebuggerActionButtons.RESUME_BTN_ID; import static org.testng.Assert.fail; @@ -41,6 +42,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; /** @author Dmytro Nochevnov */ +@Test(groups = UNDER_REPAIR) public class InnerClassAndLambdaDebuggingTest { private static final String PROJECT = "java-inner-lambda"; private static final String PATH_TO_CLASS = PROJECT + "/src/main/java/test/App.java"; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/AutocompleteWithInheritTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/AutocompleteWithInheritTest.java index 45329653a8..8a5f66b6f0 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/AutocompleteWithInheritTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/AutocompleteWithInheritTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.editor.autocomplete; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.pageobject.CodenvyEditor.MarkerLocator.ERROR; import static org.eclipse.che.selenium.pageobject.CodenvyEditor.MarkerLocator.TASK_OVERVIEW; import static org.testng.Assert.fail; @@ -37,6 +38,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @author Musienko Maxim */ +@Test(groups = UNDER_REPAIR) public class AutocompleteWithInheritTest { private static final String PROJECT_NAME = NameGenerator.generate(AutocompleteWithInheritTest.class.getSimpleName(), 4); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/QuickFixAndCodeAssistantFeaturesTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/QuickFixAndCodeAssistantFeaturesTest.java index 5309d0522e..46e7ea36c2 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/QuickFixAndCodeAssistantFeaturesTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/QuickFixAndCodeAssistantFeaturesTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.editor.autocomplete; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.pageobject.CodenvyEditor.MarkerLocator.ERROR; import static org.eclipse.che.selenium.pageobject.CodenvyEditor.MarkerLocator.WARNING; import static org.testng.Assert.fail; @@ -34,6 +35,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @author Andrienko Alexander on 08.01.15. */ +@Test(groups = UNDER_REPAIR) public class QuickFixAndCodeAssistantFeaturesTest { private static final String PROJECT_NAME = NameGenerator.generate(QuickFixAndCodeAssistantFeaturesTest.class.getSimpleName(), 4); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/ShowHintsCommandTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/ShowHintsCommandTest.java index e9ddf9202e..d995554fd9 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/ShowHintsCommandTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/editor/autocomplete/ShowHintsCommandTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.editor.autocomplete; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.testng.Assert.fail; import com.google.inject.Inject; @@ -34,6 +35,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @author Aleksandr Shmaraev */ +@Test(groups = UNDER_REPAIR) public class ShowHintsCommandTest { private final Logger LOG = LoggerFactory.getLogger(ShowHintsCommandTest.class); private static final String PROJECT_NAME = @@ -96,6 +98,7 @@ public class ShowHintsCommandTest { editor.waitMarkerInPosition(MarkerLocator.ERROR, 34); editor.goToCursorPositionVisible(33, 16); editor.callShowHintsPopUp(); + try { editor.waitShowHintsPopUpOpened(); } catch (TimeoutException ex) { diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/factory/DirectUrlFactoryWithRootFolderTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/factory/DirectUrlFactoryWithRootFolderTest.java index 21699f0097..9d8d9616e5 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/factory/DirectUrlFactoryWithRootFolderTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/factory/DirectUrlFactoryWithRootFolderTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.factory; +import static org.eclipse.che.selenium.core.TestGroup.GITHUB; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; @@ -20,7 +21,6 @@ import java.nio.file.Paths; import java.util.Arrays; import java.util.List; import org.eclipse.che.selenium.core.SeleniumWebDriver; -import org.eclipse.che.selenium.core.TestGroup; import org.eclipse.che.selenium.core.client.TestGitHubRepository; import org.eclipse.che.selenium.core.client.TestProjectServiceClient; import org.eclipse.che.selenium.core.client.TestWorkspaceServiceClient; @@ -36,7 +36,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @author Musienko Maxim */ -@Test(groups = TestGroup.GITHUB) +@Test(groups = {GITHUB}) public class DirectUrlFactoryWithRootFolderTest { @Inject private ProjectExplorer projectExplorer; @Inject private DefaultTestUser testUser; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/filewatcher/RemoveFilesWithActiveTabs.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/filewatcher/RemoveFilesWithActiveTabs.java index cda98820af..8938a6a72c 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/filewatcher/RemoveFilesWithActiveTabs.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/filewatcher/RemoveFilesWithActiveTabs.java @@ -38,11 +38,7 @@ import org.openqa.selenium.TimeoutException; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -/** - * // - * - * @author Musienko Maxim - */ +/** @author Musienko Maxim */ public class RemoveFilesWithActiveTabs { private static final String PROJECT_NAME = NameGenerator.generate("project", 6); @Inject private TestWorkspace ws; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitPullTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitPullTest.java index 3184dbb528..befcda3bd8 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitPullTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitPullTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.git; +import static org.eclipse.che.selenium.core.TestGroup.GITHUB; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Git.GIT; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Git.Remotes.PULL; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Git.Remotes.REMOTES_TOP; @@ -22,7 +23,6 @@ import com.google.inject.name.Named; import java.nio.file.Path; import java.nio.file.Paths; import org.eclipse.che.commons.lang.NameGenerator; -import org.eclipse.che.selenium.core.TestGroup; import org.eclipse.che.selenium.core.client.TestGitHubRepository; import org.eclipse.che.selenium.core.client.TestUserPreferencesServiceClient; import org.eclipse.che.selenium.core.user.DefaultTestUser; @@ -37,7 +37,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @author Aleksandr Shmaraev */ -@Test(groups = TestGroup.GITHUB) +@Test(groups = {GITHUB}) public class GitPullTest { private static final String PROJECT_NAME = NameGenerator.generate("FirstProject-", 4); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java index eccfb30762..72f1da39fc 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.git; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Git.BRANCHES; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Git.GIT; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Workspace.IMPORT_PROJECT; @@ -59,7 +60,6 @@ import org.testng.annotations.Test; * @author Aleksandr Shmaraev * @author Ihor Okhrimenko */ -@Test(groups = TestGroup.GITHUB) public class ImportWizardFormTest { private static final Logger LOG = LoggerFactory.getLogger(ImportWizardFormTest.class); private static final String GITHUB_COM = "github.com"; @@ -408,7 +408,7 @@ public class ImportWizardFormTest { editor.waitActive(); } - @Test(priority = 1) + @Test(priority = 1, groups = UNDER_REPAIR) public void checkImportProjectSubmoduleByHttpsUrl() { projectExplorer.waitProjectExplorer(); currentProjectName = multimoduleRepo.getName() + "Https"; @@ -418,7 +418,7 @@ public class ImportWizardFormTest { openAndCheckRegularSubmodule(currentProjectName); } - @Test(priority = 1) + @Test(priority = 1, groups = UNDER_REPAIR) public void checkImportProjectSubmoduleBySshUrl() { projectExplorer.waitProjectExplorer(); currentProjectName = multimoduleRepo.getName() + "Ssh"; @@ -428,7 +428,7 @@ public class ImportWizardFormTest { openAndCheckRegularSubmodule(currentProjectName); } - @Test(priority = 1) + @Test(priority = 1, groups = UNDER_REPAIR) public void checkImportProjectSubmoduleFromGithub() throws Exception { projectExplorer.waitProjectExplorer(); currentProjectName = multimoduleRepo.getName(); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/TypeScriptEditingTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/TypeScriptEditingTest.java index 9b45529b9e..4b3e408069 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/TypeScriptEditingTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/TypeScriptEditingTest.java @@ -12,6 +12,7 @@ package org.eclipse.che.selenium.languageserver; import static java.lang.String.format; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Assistant.ASSISTANT; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Assistant.FIND_DEFINITION; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Assistant.FIND_PROJECT_SYMBOL; @@ -141,7 +142,7 @@ public class TypeScriptEditingTest { editor.waitTextElementsActiveLine("print"); } - @Test(priority = 4, alwaysRun = true) + @Test(priority = 4, alwaysRun = true, groups = UNDER_REPAIR) public void checkHoveringFeature() { editor.moveCursorToText("Greeter"); try { diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpClassRenamingTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpClassRenamingTest.java index 924ae7a411..398309147e 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpClassRenamingTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpClassRenamingTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.languageserver.csharp; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Assistant.ASSISTANT; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Assistant.Refactoring.LS_RENAME; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Assistant.Refactoring.REFACTORING; @@ -40,6 +41,7 @@ import org.openqa.selenium.TimeoutException; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +@Test(groups = UNDER_REPAIR) public class CSharpClassRenamingTest { private static final String PROJECT_NAME = NameGenerator.generate(CSharpClassRenamingTest.class.getSimpleName(), 4); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpFileAdvancedOperationsTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpFileAdvancedOperationsTest.java index 41e933c96b..6c1f514a0c 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpFileAdvancedOperationsTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpFileAdvancedOperationsTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.languageserver.csharp; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Assistant.ASSISTANT; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Assistant.FIND_DEFINITION; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Assistant.GO_TO_SYMBOL; @@ -41,6 +42,7 @@ import org.openqa.selenium.TimeoutException; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +@Test(groups = UNDER_REPAIR) public class CSharpFileAdvancedOperationsTest { private static final String PROJECT_NAME = NameGenerator.generate(CSharpClassRenamingTest.class.getSimpleName(), 4); @@ -83,7 +85,7 @@ public class CSharpFileAdvancedOperationsTest { projectExplorer.waitItem(PROJECT_NAME + "/bin"); } - @Test(alwaysRun = true) + @Test public void checkHoveringFeature() { String expectedTextInHoverPopUp = "System.Console\nRepresents the standard input, output, and error streams for console applications. This class cannot be inherited."; @@ -109,7 +111,7 @@ public class CSharpFileAdvancedOperationsTest { editor.typeTextIntoEditor(Keys.END.toString()); } - @Test(priority = 3, alwaysRun = true) + @Test(priority = 3, alwaysRun = true, groups = UNDER_REPAIR) public void checkGoToSymbolFeature() { menu.runCommand(ASSISTANT, GO_TO_SYMBOL); try { diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpFileEditingTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpFileEditingTest.java index 51dbccc891..f64337ceba 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpFileEditingTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/csharp/CSharpFileEditingTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.languageserver.csharp; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Workspace.CREATE_PROJECT; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Workspace.WORKSPACE; import static org.eclipse.che.selenium.pageobject.CodenvyEditor.MarkerLocator.ERROR; @@ -41,6 +42,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @author Musienko Maxim */ +@Test(groups = UNDER_REPAIR) public class CSharpFileEditingTest { private final String PROJECT_NAME = NameGenerator.generate("AspProject", 4); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/php/PhpAssistantFeaturesTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/php/PhpAssistantFeaturesTest.java index 7cf6fe69f3..55c20c1e77 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/php/PhpAssistantFeaturesTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/languageserver/php/PhpAssistantFeaturesTest.java @@ -18,6 +18,7 @@ import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.A import static org.openqa.selenium.Keys.ARROW_LEFT; import static org.openqa.selenium.Keys.CONTROL; import static org.openqa.selenium.Keys.ENTER; +import static org.testng.Assert.fail; import com.google.inject.Inject; import java.net.URL; @@ -37,6 +38,7 @@ import org.eclipse.che.selenium.pageobject.Menu; import org.eclipse.che.selenium.pageobject.NotificationsPopupPanel; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.openqa.selenium.Keys; +import org.openqa.selenium.TimeoutException; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -113,7 +115,13 @@ public class PhpAssistantFeaturesTest { editor.waitActive(); editor.moveCursorToText(TEXT_FOR_HOVERING); - editor.waitTextInHoverPopUpEqualsTo(EXPECTED_HOVER_POPUP_TEXT); + + try { + editor.waitTextInHoverPopUpEqualsTo(EXPECTED_HOVER_POPUP_TEXT); + } catch (TimeoutException ex) { + // remove try-catch block after issue has been resolved + fail("Known random failure https://github.com/eclipse/che/issues/10674", ex); + } } @Test diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithTerminalTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithTerminalTest.java index e4a686d447..ec0c911b34 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithTerminalTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/miscellaneous/WorkingWithTerminalTest.java @@ -12,6 +12,7 @@ package org.eclipse.che.selenium.miscellaneous; import static java.lang.String.valueOf; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.pageobject.PanelSelector.PanelTypes.LEFT_BOTTOM_ID; import static org.testng.Assert.fail; @@ -34,8 +35,6 @@ import org.eclipse.che.selenium.pageobject.PanelSelector; import org.eclipse.che.selenium.pageobject.ProjectExplorer; import org.openqa.selenium.Keys; import org.openqa.selenium.TimeoutException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -46,7 +45,6 @@ import org.testng.annotations.Test; */ public class WorkingWithTerminalTest { private static final String PROJECT_NAME = NameGenerator.generate("project", 4); - private static final Logger LOG = LoggerFactory.getLogger(WorkingWithTerminalTest.class); private static final String[] CHECK_MC_OPENING = { "Left", "File", "Command", "Options", "Right", "Name", "bin", "dev", "etc", "home", @@ -250,7 +248,7 @@ public class WorkingWithTerminalTest { terminal.waitTextInFirstTerminal("tomcat8"); } - @Test + @Test(groups = UNDER_REPAIR) public void shouldCancelProcessByCtrlC() { terminal.typeIntoActiveTerminal("cd /" + Keys.ENTER); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/plainjava/RunPlainJavaProjectTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/plainjava/RunPlainJavaProjectTest.java index dd2a00c3bb..2608f525c4 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/plainjava/RunPlainJavaProjectTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/plainjava/RunPlainJavaProjectTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.plainjava; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.core.constant.TestIntelligentCommandsConstants.CommandsDefaultNames.JAVA_NAME; import static org.eclipse.che.selenium.core.constant.TestIntelligentCommandsConstants.CommandsGoals.RUN_GOAL; import static org.eclipse.che.selenium.core.constant.TestIntelligentCommandsConstants.CommandsTypes.JAVA_TYPE; @@ -53,6 +54,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @author Aleksandr Shmaraev */ +@Test(groups = UNDER_REPAIR) public class RunPlainJavaProjectTest { private static final String PROJECT_NAME = "run-plain-java-project"; private static final String NEW_PACKAGE = "base.test"; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/methods/RenameVirtualMethodsTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/methods/RenameVirtualMethodsTest.java index c95be9525e..3d1f14a815 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/methods/RenameVirtualMethodsTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/methods/RenameVirtualMethodsTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.refactor.methods; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.testng.Assert.fail; import com.google.inject.Inject; @@ -132,7 +133,7 @@ public class RenameVirtualMethodsTest { doRefactorByWizardWithClosingWarnMess(14, 10, "k"); } - @Test + @Test(groups = UNDER_REPAIR) public void testGeneric2() { try { doRefactorByWizard(20, 20, "addIfPositive"); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/move/CodeAssistAfterMoveItemTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/move/CodeAssistAfterMoveItemTest.java index f3d9a40028..4c22bfc8c1 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/move/CodeAssistAfterMoveItemTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/move/CodeAssistAfterMoveItemTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.refactor.move; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.core.constant.TestTimeoutsConstants.DEFAULT_TIMEOUT; import static org.eclipse.che.selenium.pageobject.CodenvyEditor.MarkerLocator.ERROR; import static org.eclipse.che.selenium.pageobject.CodenvyEditor.MarkerLocator.WARNING; @@ -36,6 +37,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @author Aleksandr Shmaraev */ +@Test(groups = UNDER_REPAIR) public class CodeAssistAfterMoveItemTest { private static final String APPLY_WORKSPACE_CHANGES = "Apply Workspace Changes\nDone"; diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/packages/RenamePackageTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/packages/RenamePackageTest.java index 92175e8a72..6b4c28001b 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/packages/RenamePackageTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/packages/RenamePackageTest.java @@ -11,6 +11,7 @@ */ package org.eclipse.che.selenium.refactor.packages; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.testng.Assert.fail; import com.google.inject.Inject; @@ -352,7 +353,7 @@ public class RenamePackageTest { editor.closeFileByNameWithSaving("A"); } - @Test + @Test(groups = UNDER_REPAIR) public void checkTest3() { projectExplorer.openItemByPath(PROJECT_NAME + "/src/main/java/mine/pack"); projectExplorer.openItemByPath(PROJECT_NAME + "/src/main/java/mine/pack/Textfile.txt"); @@ -589,7 +590,7 @@ public class RenamePackageTest { editor.closeFileByNameWithSaving("MyA"); } - @Test + @Test(groups = UNDER_REPAIR) public void checkTestHierarchical10() { projectExplorer.openItemByPath(PROJECT_NAME + "/src/main/java/m_y/pack"); projectExplorer.openItemByPath(PROJECT_NAME + "/src/main/java/m_y/pack/C.java"); @@ -623,7 +624,7 @@ public class RenamePackageTest { editor.closeFileByNameWithSaving("C"); } - @Test + @Test(groups = UNDER_REPAIR) public void checkTestDisableImport11() { projectExplorer.openItemByPath(PROJECT_NAME + "/src/main/java/my_/pack"); projectExplorer.openItemByPath(PROJECT_NAME + "/src/main/java/my_/pack/C.java"); diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/stack/ImportAndValidateEclipseCheProjectTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/stack/ImportAndValidateEclipseCheProjectTest.java index e9878cb5de..e2929b013f 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/stack/ImportAndValidateEclipseCheProjectTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/stack/ImportAndValidateEclipseCheProjectTest.java @@ -12,6 +12,7 @@ package org.eclipse.che.selenium.stack; import static org.eclipse.che.commons.lang.NameGenerator.generate; +import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Workspace.IMPORT_PROJECT; import static org.eclipse.che.selenium.core.constant.TestMenuCommandsConstants.Workspace.WORKSPACE; import static org.eclipse.che.selenium.pageobject.CodenvyEditor.MarkerLocator.ERROR; @@ -45,6 +46,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; /** @author Aleksandr Shmaraev */ +@Test(groups = UNDER_REPAIR) public class ImportAndValidateEclipseCheProjectTest { private static final Logger LOG = diff --git a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/testrunner/JavaTestPluginTestNgTest.java b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/testrunner/JavaTestPluginTestNgTest.java index 9399ceb6ef..d97815e788 100644 --- a/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/testrunner/JavaTestPluginTestNgTest.java +++ b/selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/testrunner/JavaTestPluginTestNgTest.java @@ -169,7 +169,7 @@ public class JavaTestPluginTestNgTest { } @Test(priority = 2) - public void shouldExecuteAlltests() { + public void shouldExecuteAllTests() { // given projectExplorer.openItemByPath(PATH_TO_ANOTHER_TEST_CLASS);