Selenium: Create one test from "ImportRecursiveSubmoduleTest", "ImportProjectIntoSpecifiedBranchTest", and "KeepDirectoryGitImportTest" selenium tests #9372

Ohrimenko1988 · 2018-04-11T07:22:16Z

What does this PR do?

Create one test from "ImportRecursiveSubmoduleTest", "ImportProjectIntoSpecifiedBranchTest", and "KeepDirectoryGitImportTest" selenium tests. And rework them with "kohsuke" library, for moving to the "multi-thread" suite.

What issues does this PR fix or reference?

Issues: #9150 ; #9149 ; #9151

Release Notes

Docs PR

…work-git

…ality'

…work-git

…dy existed methods

dmytro-ndp · 2018-04-11T12:18:59Z

...e-selenium-core/src/main/java/org/eclipse/che/selenium/core/client/TestGitHubRepository.java

@@ -239,4 +307,81 @@ private void createFile(Path pathToRootContentDirectory, Path pathToFile) throws
  public String getFileContent(String pathToFile) throws IOException {
    return IOUtils.toString(ghRepo.getFileContent(pathToFile).read(), "UTF-8");
  }
+
+  public String getRepoSha() throws IOException {


I would rather name it getDefaultBranchSha().
Alsod Repo term is redundant at all so as it is the method of TestGitHubRepository class.

dmytro-ndp · 2018-04-11T12:39:04Z

...e-selenium-core/src/main/java/org/eclipse/che/selenium/core/client/TestGitHubRepository.java

+    return String.format(modulePattern, repoName, pathToSubmodule, repoUrl);
+  }
+
+  private void createGitModulesFile(TestGitHubRepository targetRepository, String pathForSubmodule)


Please, add link to the doc with explanation what .gitmodules file is about. I would also recommend to use more general name of method like "setupSubmoduleConfig()".

Also targetRepository parameter name is a little bit misleading. It is rather submodule, IMHO.
Also pathToSubmodule is rather pathToSubmoduleContent

dmytro-ndp · 2018-04-11T12:42:26Z

...e-selenium-core/src/main/java/org/eclipse/che/selenium/core/client/TestGitHubRepository.java

+        .getSha();
+  }
+
+  private String getSubmoduleConfig(TestGitHubRepository targetRepository, String pathToSubmodule) {


targetRepository parameter name is a little bit misleading. It is rather submodule, IMHO.
Also pathToSubmodule is rather pathToSubmoduleContent

dmytro-ndp · 2018-04-11T13:00:22Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java

+    currentProjectName = importBranchRepo.getName();
+    projectExplorer.waitProjectExplorer();
+
+    importIntoBranchFromGitHub();


It's hard to understand test scenario when we have just list of 27 commands.
Please divide separate steps with empty rows and comments.

dmytro-ndp · 2018-04-11T13:03:40Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java

+    menu.runCommand(
+        TestMenuCommandsConstants.Workspace.WORKSPACE,
+        TestMenuCommandsConstants.Workspace.IMPORT_PROJECT);
+    importProject.waitMainForm();


It's hard to understand test scenario when we have just list of tens of commands.
Please divide separate steps with empty rows and comments.

dmytro-ndp · 2018-04-11T13:05:06Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java

+      importProject.closeWithIcon();
+      events.clickEventLogBtn();
+      events.waitExpectedMessage("Failed to authorize application on GitHub");
+      fail("Known issue https://github.com/eclipse/che/issues/8288", ex);


It seems outdated verification because #8288 had been closed.

dmytro-ndp · 2018-04-11T13:07:06Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java

+    projectExplorer.waitItem(projectName);
+  }
+
+  private void openSubmoduleOne(String projectName) throws Exception {


It's better not to enclose submodule number into the method name because it makes it hard to reorder the modules in future.

dmytro-ndp · 2018-04-11T13:07:17Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java

+    editor.closeFileByNameWithSaving("GreetingController");
+  }
+
+  private void openSubmoduleTwo(String projectName) throws Exception {


It's better not to enclose submodule number into the method name because it makes it hard to reorder the modules in future.

dmytro-ndp · 2018-04-11T13:09:38Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java

+public class ImportWizardFormTest {
+  private static final Logger LOG = LoggerFactory.getLogger(ImportWizardFormTest.class);
+  private static final String GITHUB_COM = "github.com";
+  private static final String FIRST_BRANCH = "firstBranch";


It's better not to enclose number into the constant name because it makes it hard to reorder the branches in the future.

dmytro-ndp · 2018-04-11T13:10:13Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java

+  private static final String FIRST_BRANCH = "firstBranch";
+  private static final String SECOND_BRANCH = "secondBranch";
+  private static final String THIRD_BRANCH = "thirdBranch";
+  private static final String FIRST_SUBMODULE_NAME = "Repo_For_Test";


It's better not to enclose number into the constant name because it makes it hard to reorder the modules in future.

dmytro-ndp · 2018-04-11T13:12:12Z

selenium/che-selenium-test/src/test/resources/suites/CheOneThreadTestsSuite.xml

@@ -58,12 +58,9 @@
            <class name="org.eclipse.che.selenium.dashboard.organization.AddWorkspaceToOrganizationTest"/>
            <class name="org.eclipse.che.selenium.dashboard.organization.ShareWorkspaceTest"/>
            <class name="org.eclipse.che.selenium.git.AuthorizeOnGithubFromDashboardTest"/>
-            <class name="org.eclipse.che.selenium.git.AuthorizeOnGithubFromImportTest"/>
+            <class name="org.eclipse.che.selenium.git.ImportWizardFormTest"/>


ImportWizardFormTest can be moved into the CheSuite.xml so as it's expected to be ready for multi-thread execution.

artaleks9 · 2018-04-11T14:48:24Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java

+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/** @author Aleksandr Shmaraev */


I think, need to add @author - Igor Ohrimenko

artaleks9 · 2018-04-11T14:55:10Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/git/ImportWizardFormTest.java

+
+    menu.runCommand(
+        TestMenuCommandsConstants.Workspace.WORKSPACE,
+        TestMenuCommandsConstants.Workspace.IMPORT_PROJECT);


I think, it would be nice to use static import and replace in menu.runCommand -
e.g.
menu.runCommand(WORKSPACE, IMPORT_PROJECT);
The code will be more small and readable in this case

Ohrimenko1988 · 2018-04-11T15:02:24Z

ci-test

codenvy-ci · 2018-04-11T20:29:00Z

ci-test build report:
Build details
Test report
selenium tests report data
docker image: eclipseche/che-server:9372
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

…work-git

Ohrimenko1988 · 2018-04-12T14:57:42Z

ci-test

codenvy-ci · 2018-04-12T21:29:23Z

ci-test build report:
Build details
Test report
selenium tests report data
docker image: eclipseche/che-server:9372
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

…work-git

Ohrimenko1988 added 18 commits April 4, 2018 15:50

Temporary changes

7449b64

Temporary changes

cb58026

Merge master and resolve conflict

a87529b

Temporary commit

fd89947

Temporary commit

041ce97

Merge branch 'master' of https://github.com/eclipse/che into selen-re…

9793ae8

…work-git

Add create submodule method

a678a5b

Incapsulate creating submodules in TestGithubRepository class

5071463

Merge branch 'master' of https://github.com/eclipse/che into selen-re…

def215d

…work-git

Update AuthorizeOnGithubFromImportTest selenium test

ef55a65

Rename 'AuthorizeOnGithubFromImportTest' to 'CheckBasicGitHubFunction…

9b2618c

…ality'

Update 'TestGitHubRepository' page object

c3231d8

Create one common test

2c494c3

Add sources

9c979ae

Merge and resolve conflict

22810ca

Merge branch 'master' of https://github.com/eclipse/che into selen-re…

d971256

…work-git

Update 'TestGitHubRepository#createGitModulesFile' method

7f0795b

Rename 'CheckBasicGitHubFunctionality' to 'ImportWizardFormTest'

b81050d

Ohrimenko1988 added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. kind/task Internal things, technical debt, and to-do tasks to be performed. labels Apr 11, 2018

Ohrimenko1988 requested review from dmytro-ndp and artaleks9 April 11, 2018 07:22

Ohrimenko1988 requested a review from vparfonov as a code owner April 11, 2018 07:22

Ohrimenko1988 added 4 commits April 11, 2018 11:00

Add licence headers and remove redundant files

aa10fa3

Remove redundant steps from 'ImportWizardFormTest' selenium test

13d8e76

Merge master and resolve conflict

270d7bd

Simplify created methods in the 'TestGitHubRepository' by using alrea…

6c63ec1

…dy existed methods

dmytro-ndp reviewed Apr 11, 2018

View reviewed changes

Ohrimenko1988 added 3 commits April 11, 2018 17:29

Do changes according to review

62b4821

Merge master and resolve conflicts

4e8cc3a

Do changes according to review

44cc9d5

artaleks9 approved these changes Apr 11, 2018

View reviewed changes

Do changes according to review

9a46bdc

Ohrimenko1988 added 4 commits April 12, 2018 09:02

Merge branch 'master' of https://github.com/eclipse/che into selen-re…

15b0b83

…work-git

Fix steps in the 'shouldLoginToGitHubAndImportProject' test method

7b1aada

Add temporary suite for testing changes

98ca2c1

Delete 'TemporarySuite.xml'

233f2fd

Merge branch 'master' of https://github.com/eclipse/che into selen-re…

ec71350

…work-git

dmytro-ndp approved these changes Apr 13, 2018

View reviewed changes

Merge branch 'master' of https://github.com/eclipse/che into selen-re…

da2449e

…work-git

Ohrimenko1988 merged commit 53ef953 into master Apr 13, 2018

Ohrimenko1988 deleted the selen-rework-git branch April 13, 2018 09:44

This was referenced Apr 13, 2018

Improve and rework the 'ImportRecursiveSubmoduleTest' for ability to launching in multi-threaded mod #9150

Closed

Improve and rework the 'ImportProjectIntoSpecifiedBranchTest' for ability to launching in multi-threaded mode #9149

Closed

Ohrimenko1988 removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Apr 13, 2018

benoitf added this to the 6.4.0 milestone Apr 13, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Selenium: Create one test from "ImportRecursiveSubmoduleTest", "ImportProjectIntoSpecifiedBranchTest", and "KeepDirectoryGitImportTest" selenium tests #9372

Selenium: Create one test from "ImportRecursiveSubmoduleTest", "ImportProjectIntoSpecifiedBranchTest", and "KeepDirectoryGitImportTest" selenium tests #9372

Ohrimenko1988 commented Apr 11, 2018

dmytro-ndp Apr 11, 2018

dmytro-ndp Apr 11, 2018 •

edited

Loading

dmytro-ndp Apr 11, 2018 •

edited

Loading

dmytro-ndp Apr 11, 2018

dmytro-ndp Apr 11, 2018

dmytro-ndp Apr 11, 2018

dmytro-ndp Apr 11, 2018

dmytro-ndp Apr 11, 2018

dmytro-ndp Apr 11, 2018 •

edited

Loading

dmytro-ndp Apr 11, 2018

dmytro-ndp Apr 11, 2018 •

edited

Loading

artaleks9 Apr 11, 2018

artaleks9 Apr 11, 2018

Ohrimenko1988 commented Apr 11, 2018

codenvy-ci commented Apr 11, 2018

Ohrimenko1988 commented Apr 12, 2018

codenvy-ci commented Apr 12, 2018

Selenium: Create one test from "ImportRecursiveSubmoduleTest", "ImportProjectIntoSpecifiedBranchTest", and "KeepDirectoryGitImportTest" selenium tests #9372

Selenium: Create one test from "ImportRecursiveSubmoduleTest", "ImportProjectIntoSpecifiedBranchTest", and "KeepDirectoryGitImportTest" selenium tests #9372

Conversation

Ohrimenko1988 commented Apr 11, 2018

What does this PR do?

What issues does this PR fix or reference?

Release Notes

Docs PR

Choose a reason for hiding this comment

dmytro-ndp Apr 11, 2018 • edited Loading

Choose a reason for hiding this comment

dmytro-ndp Apr 11, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dmytro-ndp Apr 11, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dmytro-ndp Apr 11, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ohrimenko1988 commented Apr 11, 2018

codenvy-ci commented Apr 11, 2018

Ohrimenko1988 commented Apr 12, 2018

codenvy-ci commented Apr 12, 2018

dmytro-ndp Apr 11, 2018 •

edited

Loading

dmytro-ndp Apr 11, 2018 •

edited

Loading

dmytro-ndp Apr 11, 2018 •

edited

Loading

dmytro-ndp Apr 11, 2018 •

edited

Loading