seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Selenium: Correct the selenium tests to make more reliability (#12812)

7.20.x
Aleksandr Shmaraiev 2019-03-04 16:24:26 +02:00 committed by GitHub
parent f76cc4dae7
commit 4aefd192ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/AddFilesToIndexTest.java
View File

@ -41,9 +41,10 @@ import org.testng.annotations.Test;
@Test(groups = TestGroup.GITHUB)
public class AddFilesToIndexTest {
private static final String PROJECT_NAME = NameGenerator.generate("AddFilesToIndex_", 4);
private static final String PATH_TO_JSP_FILE = "/src/main/webapp/index.jsp";
private static final String PATH_TO_JSP_FILE = PROJECT_NAME + "/src/main/webapp/index.jsp";
private static final String PATH_TO_JAVA_FILE =
PROJECT_NAME + "/src/main/java/org/eclipse/qa/examples/AppController.java";
private static final String JAVA_TAB_FILE_NAME = "AppController";
private static final String JSP_FILE_NAME = "index.jsp";
private static final String STATUS_MESSAGE_ONE_FILE =
" On branch master\n"
@ -103,17 +104,14 @@ public class AddFilesToIndexTest {
testProjectServiceClient.importProject(
ws.getId(), Paths.get(resource.toURI()), PROJECT_NAME, ProjectTemplates.MAVEN_SPRING);
ide.open(ws);
ide.waitOpenedWorkspaceIsReadyToUse();
}
@Test
public void addFilesTest() {
// preparation
String pathToJavaFileItem = PROJECT_NAME + "/src/main/java/org.eclipse.qa.examples";
String pathToJspFile = PROJECT_NAME + "/src/main/webapp";
String javaFileName = JAVA_TAB_FILE_NAME + ".java";
projectExplorer.waitProjectExplorer();
projectExplorer.waitAndSelectItem(PROJECT_NAME);
projectExplorer.waitItemIsSelected(PROJECT_NAME);
menu.runCommand(
TestMenuCommandsConstants.Git.GIT, TestMenuCommandsConstants.Git.INITIALIZE_REPOSITORY);
askDialog.waitFormToOpen();
@ -137,8 +135,10 @@ public class AddFilesToIndexTest {
events.waitExpectedMessage(TestGitConstants.GIT_NOTHING_TO_ADD);
// expand the tree and open files
projectExplorer.expandPathInProjectExplorerAndOpenFile(pathToJavaFileItem, javaFileName);
projectExplorer.expandPathInProjectExplorerAndOpenFile(pathToJspFile, JSP_FILE_NAME);
projectExplorer.clickOnRefreshTreeButton();
projectExplorer.quickRevealToItemWithJavaScript(PATH_TO_JSP_FILE);
projectExplorer.openItemByPath(PATH_TO_JSP_FILE);
editor.waitActive();
// Edit index.jsp
editor.setCursorToLine(17);
@ -146,7 +146,8 @@ public class AddFilesToIndexTest {
loader.waitOnClosed();
// Add this file to index
projectExplorer.waitAndSelectItem(PROJECT_NAME + PATH_TO_JSP_FILE);
projectExplorer.waitAndSelectItem(PATH_TO_JSP_FILE);
projectExplorer.waitItemIsSelected(PATH_TO_JSP_FILE);
menu.runCommand(TestMenuCommandsConstants.Git.GIT, TestMenuCommandsConstants.Git.ADD_TO_INDEX);
git.waitGitStatusBarWithMess(TestGitConstants.GIT_ADD_TO_INDEX_SUCCESS);
events.clickEventLogBtn();
@ -158,14 +159,15 @@ public class AddFilesToIndexTest {
git.waitGitStatusBarWithMess(STATUS_MESSAGE_ONE_FILE);
// Edit AppController.java
editor.selectTabByName(JAVA_TAB_FILE_NAME);
projectExplorer.quickRevealToItemWithJavaScript(PATH_TO_JAVA_FILE);
projectExplorer.openItemByPath(PATH_TO_JAVA_FILE);
editor.waitActive();
editor.setCursorToLine(15);
editor.typeTextIntoEditor("//Testing add to index");
loader.waitOnClosed();
// Create new.css file
projectExplorer.waitAndSelectItem(pathToJspFile);
projectExplorer.waitAndSelectItem(PATH_TO_JSP_FILE);
menu.runCommand(
TestMenuCommandsConstants.Project.PROJECT,
TestMenuCommandsConstants.Project.New.NEW,

1
selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/AmendCommitTest.java
View File

@ -99,6 +99,7 @@ public class AmendCommitTest {
git.waitGitStatusBarWithMess(GIT_INITIALIZED_SUCCESS);
events.clickEventLogBtn();
events.waitExpectedMessage(GIT_INITIALIZED_SUCCESS);
projectExplorer.quickRevealToItemWithJavaScript(pathToFileItem);
loader.waitOnClosed();
// perform init commit

1
selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/CommitFilesByMultiSelectTest.java
View File

@ -161,6 +161,7 @@ public class CommitFilesByMultiSelectTest {
editor.waitTextIntoEditor("//" + CHANGE_CONTENT);
// Edit several files in the first module
projectExplorer.clickOnRefreshTreeButton();
projectExplorer.waitAndSelectItem(PROJECT_NAME + "/my-lib/src/test/java/hello/file.css");
projectExplorer.openItemByPath(PROJECT_NAME + "/my-lib/src/test/java/hello/file.css");
editor.waitActive();

3
selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/GitChangeMarkersTest.java
View File

@ -94,9 +94,10 @@ public class GitChangeMarkersTest {
projectExplorer.waitAndSelectItem(PROJECT_NAME);
menu.runCommand(GIT, TestMenuCommandsConstants.Git.COMMIT);
git.waitAndRunCommit("init");
loader.waitOnClosed();
projectExplorer.clickOnRefreshTreeButton();
loader.waitOnClosed();
projectExplorer.waitAndSelectItem(PROJECT_NAME + PATH_TO_JAVA_FILE);
projectExplorer.openItemByPath(PROJECT_NAME + PATH_TO_JAVA_FILE);
editor.waitActive();
editor.waitNoGitChangeMarkers();

2
selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/mavenplugin/CheckMavenPluginTest.java
View File

@ -103,7 +103,7 @@ public class CheckMavenPluginTest {
@Test(priority = 2)
public void shouldAccessClassCreatedInAnotherModuleAfterIncludingModule() {
includeModulesInTheParentPom();
projectExplorer.clickOnRefreshTreeButton();
projectExplorer.openItemByPath(
PROJECT_NAME + "/my-webapp/src/main/java/che/eclipse/sample/Aclass.java");
editor.waitActive();

2
selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/refactor/types/RenameTypeTest.java
View File

@ -193,6 +193,8 @@ public class RenameTypeTest {
askDialog.clickOkBtn();
askDialog.waitFormToClose();
refactorPanel.waitRefactorPreviewFormIsClosed();
loader.waitOnClosed();
projectExplorer.waitAndSelectItem(pathToCurrentPackage + "/B.java");
projectExplorer.clickOnRefreshTreeButton();
projectExplorer.waitItem(pathToCurrentPackage + "/B.java", ELEMENT_TIMEOUT_SEC);
projectExplorer.openItemByPath(pathToCurrentPackage + "/B.java");