From 434e3f033d57e1123f5476b7befc8a8568f54d82 Mon Sep 17 00:00:00 2001
From: Igor Ohrimenko <iokhrime@redhat.com>
Date: Tue, 19 Dec 2017 17:18:03 +0200
Subject: [PATCH] rework selectItemInFileStructure and
 selectItemInFileStructureByDoubleClick methods in the FileStructure
 page-object (#7961)

---
 .../selenium/pageobject/FileStructure.java    | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/FileStructure.java b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/FileStructure.java
index a7ff044fff..baf17ad661 100644
--- a/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/FileStructure.java
+++ b/selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/FileStructure.java
@@ -112,12 +112,8 @@ public class FileStructure {
     loader.waitOnClosed();
     new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC)
         .until(
-            new ExpectedCondition<Boolean>() {
-              @Override
-              public Boolean apply(WebDriver driver) {
-                return getTextFromFileStructurePanel().contains(expText);
-              }
-            });
+            (ExpectedCondition<Boolean>)
+                driver -> getTextFromFileStructurePanel().contains(expText));
   }
 
   /**
@@ -165,12 +161,12 @@ public class FileStructure {
    * @param item is the name of the item
    */
   public void selectItemInFileStructureByDoubleClick(String item) {
-    WebElement fileStructureItem =
-        new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC)
-            .until(
-                visibilityOfElementLocated(By.xpath(format(Locators.FILE_STRUCTURE_ITEM, item))));
-    fileStructureItem.click();
-    actionsFactory.createAction(seleniumWebDriver).doubleClick(fileStructureItem).perform();
+    selectItemInFileStructure(item);
+    actionsFactory
+        .createAction(seleniumWebDriver)
+        .moveToElement(getFileStructureItem(item))
+        .doubleClick()
+        .perform();
   }
 
   /**
@@ -189,9 +185,16 @@ public class FileStructure {
    * @param item is the name of the item
    */
   public void selectItemInFileStructure(String item) {
-    new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC)
-        .until(visibilityOfElementLocated(By.xpath(format(Locators.FILE_STRUCTURE_ITEM, item))))
-        .click();
+    actionsFactory
+        .createAction(seleniumWebDriver)
+        .moveToElement(getFileStructureItem(item))
+        .click()
+        .perform();
+  }
+
+  private WebElement getFileStructureItem(String item) {
+    return new WebDriverWait(seleniumWebDriver, REDRAW_UI_ELEMENTS_TIMEOUT_SEC)
+        .until(visibilityOfElementLocated(By.xpath(format(Locators.FILE_STRUCTURE_ITEM, item))));
   }
 
   /**