Add GitResetTest for covering git soft/mixed/hard reset feature #9471

musienko-maxim · 2018-04-17T15:58:40Z

What does this PR do?

Add test for covering soft/mixed/hard reset features
Add necessary methods into Git pageobject for using reset to commit widget (doResetToCommitMessage () method, switch to mixed reset radio button)
Remove unused and unnecessary methods from the Git pageobject for importing java project (this methods was implemented in the WizardProject page object and they are not related with Git)

Issue reference:

#9353
@artaleks9 @dmytro-ndp @vparfonov

…d project

…ry to GitReset page object

dmytro-ndp · 2018-04-17T16:16:30Z

selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/GitReset.java

    PageFactory.initElements(seleniumWebDriver, this);
  }

  /** Wait 'Reset to commit' window is open */
  public void waitOpen() {
-    new WebDriverWait(seleniumWebDriver, LOAD_PAGE_TIMEOUT_SEC)
-        .until(ExpectedConditions.visibilityOf(form));
+    webDriverWaitFactory.get().until(ExpectedConditions.visibilityOf(form));


We have ready to use method SeleniumWebDriverHelper#waitVisibility

dmytro-ndp · 2018-04-17T16:17:07Z

selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/GitReset.java

  }

  /** Wait 'Reset to commit' window is close */
  public void waitClose() {
-    new WebDriverWait(seleniumWebDriver, LOAD_PAGE_TIMEOUT_SEC)
+    webDriverWaitFactory


We have ready to use method SeleniumWebDriverHelper#waitVisibility

dmytro-ndp · 2018-04-17T16:18:52Z

selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/GitReset.java

    String COMMENT = "//div[text()='%s']";
-    String COMMIT_ITEM = "//div[@id='gwt-debug-git-reset-mainForm']//tbody[1]/tr[%s]";
+    String MAIN_FORM_XPATH = "//div[@id='gwt-debug-git-reset-mainForm']";
+    String COMMIT_ITEM = MAIN_FORM_XPATH + "//tbody[1]/tr[%s]";


Let's add prefix "_TEMPLATE" to the constant name to make it obvious that it requires additional handling before usage.

dmytro-ndp · 2018-04-17T16:19:45Z

selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/Git.java

+  public void doResetToCommitMessage(ResetModes mode, String textInResetToCommitWidget) {
+    menu.runCommand(GIT, RESET);
+    waitResetWindowOpen();
+    switch (mode) {


please, divide parts by empty rows to simplify reading of code

dmytro-ndp · 2018-04-17T16:20:15Z

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

+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class GitResetTest {


Please, add author section.

dmytro-ndp · 2018-04-17T16:22:58Z

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

+    workspace.setProjects(list);
+
+    testWorkspace =
+        new TestWorkspaceImpl(


it's better not to create test workspace pragmatically in the test

dmytro-ndp · 2018-04-17T16:24:23Z

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

+
+  @BeforeClass
+  public void prepare() throws Exception {
+    String phpRepoLocation = "https://github.com/che-samples/web-php-simple.git";


It's better to create our own repository from local source than depends on third-party one.

dmytro-ndp · 2018-04-17T16:26:17Z

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

+    editor.waitTextIntoEditor(expectedTextInEditorAfterHardResetting);
+  }
+
+  private ProjectConfigDto configureTestProject(String projectName, SourceStorageDto gitSource) {


This code is worth to be extracted into the specialize class.

dmytro-ndp · 2018-04-17T16:26:29Z

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

+            NAME_OF_PROJECT_FOR_CHECKING_GIT_SOFT_RESET,
+            NAME_OF_PROJECT_FOR_CHECKING_GIT_HARD_RESET,
+            NAME_OF_PROJECT_FOR_CHECKING_GIT_MIX_RESET);
+    SourceStorageDto sourceStorage =


This code is worth to be extracted into the specialize class.

dmytro-ndp · 2018-04-19T15:19:20Z

...e-selenium-core/src/main/java/org/eclipse/che/selenium/core/workspace/WorkspaceTemplate.java

@@ -23,6 +23,8 @@
  public static final String UBUNTU_JDK8 = "ubuntu_jdk8.json";
  public static final String UBUNTU = "ubuntu.json";
  public static final String DEFAULT = "default.json";
+  public static final String DEFAULT_WITH_PREDEFINED_PROJECTS =
+      "default_ws_with_predefined_projects.json";


default_ws_with_predefined_projects.json' > default_with_github_projects.json`

DEFAULT_WITH_PREDEFINED_PROJECTS > DEFAULT_WITH_GITHUB_PROJECTS

dmytro-ndp · 2018-04-19T15:20:26Z

selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/Git.java

-    loader.waitOnClosed();
-  }
+  /**
+   * Invoke the hard to reset widget from Git -> Reset menu. Set the mode of resetting and click on


hard to reset widget - are you sure it is a correct name of widget?

dmytro-ndp · 2018-04-19T15:24:10Z

selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/GitReset.java

-        .until(
-            ExpectedConditions.visibilityOfElementLocated(
-                By.xpath(String.format(Locators.COMMIT_ITEM, numberLine))))
+  public void selectCommitByNumber(int numberLine) {


numberLine > numberOfCommitLine

dmytro-ndp · 2018-04-19T15:25:19Z

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

+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+/** @author Musienko Maxim */


Missed empty line before java doc

dmytro-ndp · 2018-04-19T15:26:27Z

selenium/che-selenium-test/src/test/resources/templates/workspace/docker/default.json

-              "port" : "9876",
-              "protocol" : "http"
-            }
+            "memoryLimitBytes": "2147483648"


Why do decided to make it impossible to set desired_memory_value automatically through the injection?

dmytro-ndp · 2018-04-19T15:27:10Z

...-test/src/test/resources/templates/workspace/docker/default_ws_with_predefined_projects.json

+            "org.eclipse.che.ws-agent"
+          ],
+          "attributes": {
+            "memoryLimitBytes": "2147483648"


It's better to have an ability to set "desired_memory_value" automatically through injection.

…iguration files, add author

musienko-maxim · 2018-04-20T12:11:18Z

ci-build

codenvy-ci · 2018-04-20T12:51:12Z

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/4521/

dmytro-ndp · 2018-04-20T13:21:15Z

Don't forget to add GitResetTest to the CheSuite.xml test suite.

musienko-maxim · 2018-04-20T14:43:31Z

ci-build

codenvy-ci · 2018-04-20T15:14:22Z

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/4522/

musienko-maxim · 2018-04-22T18:21:24Z

ci-test

codenvy-ci · 2018-04-23T00:05:31Z

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

artaleks9 · 2018-04-23T08:39:37Z

selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/git/GitReset.java

+
+  public void selectCommitByText(String text) {
+    seleniumWebDriverHelper
+        .waitVisibility(By.xpath(String.format(Locators.ITEM_WITH_TEXT_XPATH_TEMPLATE, text)))


Might to replace on the exist waitAndClick(By elementLocator)

musienko-maxim · 2018-04-24T14:32:29Z

ci-build

codenvy-ci · 2018-04-24T15:13:33Z

Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/4523/

musienko-maxim · 2018-04-24T21:07:56Z

ci-test-docker-single

codenvy-ci · 2018-04-25T04:56:19Z

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

…pse-che#9471) * Add new test for covering git reset feature

Maxim Musienko added 8 commits April 10, 2018 10:41

Add new test class. Add possibility creating workspace with predefine…

4ff08ab

…d project

finish precodition steps for the test

bd61163

Merge branch 'master' into CHE-9353

fa0f65f

add new methods for the test, remove unused methods, apply wait facto…

a0b4f58

…ry to GitReset page object

Merge remote-tracking branch 'origin/master' into CHE-9353

be86d41

Add necessary test methods. Finish test logic

6e264b7

Merge branch 'master' into CHE-9353

8d8748a

rework and complete the test

8e65964

musienko-maxim requested a review from vparfonov as a code owner April 17, 2018 15:58

benoitf added kind/enhancement A feature request - must adhere to the feature request template. status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. labels Apr 17, 2018

musienko-maxim requested review from dmytro-ndp and artaleks9 April 17, 2018 16:09

dmytro-ndp reviewed Apr 17, 2018

View reviewed changes

Maxim Musienko added 6 commits April 19, 2018 17:48

replace of configuring projects to workspace tempate file

0eb8605

apply helper class to GitReset page object

61da7ee

rename field for better readability

75a3668

add empty rows for improve readability

9698fc2

add author info

d84bd56

revert default configuration to template

f74ff2d

dmytro-ndp reviewed Apr 19, 2018

View reviewed changes

Maxim Musienko added 3 commits April 20, 2018 10:15

Fix typo, rename fields for better readability, change workspace conf…

a9be18c

…iguration files, add author

rename project templates

37b02ef

rename templates, apply formatting

6eb5e09

dmytro-ndp approved these changes Apr 20, 2018

View reviewed changes

add the test to suite

4c425e2

artaleks9 reviewed Apr 23, 2018

View reviewed changes

artaleks9 approved these changes Apr 23, 2018

View reviewed changes

apply waitAndClick method

b809757

musienko-maxim closed this Apr 25, 2018

musienko-maxim reopened this Apr 25, 2018

musienko-maxim merged commit 6d33172 into master Apr 25, 2018

benoitf added this to the 6.5.0 milestone Apr 25, 2018

benoitf 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 25, 2018

musienko-maxim deleted the CHE-9353 branch May 1, 2018 14:25

hbhargav pushed a commit to hbhargav/che that referenced this pull request Dec 5, 2018

Add GitResetTest for covering git soft/mixed/hard reset feature (ecli…

95f8278

…pse-che#9471) * Add new test for covering git reset feature

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add GitResetTest for covering git soft/mixed/hard reset feature #9471

Add GitResetTest for covering git soft/mixed/hard reset feature #9471

musienko-maxim commented Apr 17, 2018 •

edited

Loading

dmytro-ndp Apr 17, 2018

dmytro-ndp Apr 17, 2018

dmytro-ndp Apr 17, 2018

dmytro-ndp Apr 17, 2018

dmytro-ndp Apr 17, 2018

dmytro-ndp Apr 17, 2018 •

edited

Loading

dmytro-ndp Apr 17, 2018

dmytro-ndp Apr 17, 2018

dmytro-ndp Apr 17, 2018

dmytro-ndp Apr 19, 2018 •

edited

Loading

dmytro-ndp Apr 19, 2018

dmytro-ndp Apr 19, 2018

dmytro-ndp Apr 19, 2018

dmytro-ndp Apr 19, 2018

dmytro-ndp Apr 19, 2018

musienko-maxim commented Apr 20, 2018

codenvy-ci commented Apr 20, 2018

dmytro-ndp commented Apr 20, 2018

musienko-maxim commented Apr 20, 2018

codenvy-ci commented Apr 20, 2018

musienko-maxim commented Apr 22, 2018

codenvy-ci commented Apr 23, 2018

artaleks9 Apr 23, 2018

musienko-maxim commented Apr 24, 2018

codenvy-ci commented Apr 24, 2018

musienko-maxim commented Apr 24, 2018

codenvy-ci commented Apr 25, 2018

Add GitResetTest for covering git soft/mixed/hard reset feature #9471

Add GitResetTest for covering git soft/mixed/hard reset feature #9471

Conversation

musienko-maxim commented Apr 17, 2018 • edited Loading

What does this PR do?

Issue reference:

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 17, 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

dmytro-ndp Apr 19, 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

musienko-maxim commented Apr 20, 2018

codenvy-ci commented Apr 20, 2018

dmytro-ndp commented Apr 20, 2018

musienko-maxim commented Apr 20, 2018

codenvy-ci commented Apr 20, 2018

musienko-maxim commented Apr 22, 2018

codenvy-ci commented Apr 23, 2018

Choose a reason for hiding this comment

musienko-maxim commented Apr 24, 2018

codenvy-ci commented Apr 24, 2018

musienko-maxim commented Apr 24, 2018

codenvy-ci commented Apr 25, 2018

musienko-maxim commented Apr 17, 2018 •

edited

Loading

dmytro-ndp Apr 17, 2018 •

edited

Loading

dmytro-ndp Apr 19, 2018 •

edited

Loading