[Feature/Add_Relative_Locators] Add interfaces IRelativeBy, IRelativeByAqualityElement, IRelativeByWebElement

Author: aPavar

src/main/java/aquality/selenium/locators/IRelativeBy.java

@@ -0,0 +1,12 @@
+package aquality.selenium.locators;
+
+import org.openqa.selenium.By;
+
+public interface IRelativeBy {
+    RelativeBy above(By by);
+    RelativeBy below(By by);
+    RelativeBy toLeftOf(By by);
+    RelativeBy toRightOf(By by);
+    RelativeBy near(By by);
+    RelativeBy near(By by, int atMostDistanceInPixels);
+}

src/main/java/aquality/selenium/locators/IRelativeByAqualityElement.java

@@ -0,0 +1,12 @@
+package aquality.selenium.locators;
+
+import aquality.selenium.elements.interfaces.IElement;
+
+public interface IRelativeByAqualityElement {
+    RelativeBy above(IElement element);
+    RelativeBy below(IElement element);
+    RelativeBy toLeftOf(IElement element);
+    RelativeBy toRightOf(IElement element);
+    RelativeBy near(IElement element);
+    RelativeBy near(IElement element, int atMostDistanceInPixels);
+}

src/main/java/aquality/selenium/locators/IRelativeByWebElement.java

@@ -0,0 +1,12 @@
+package aquality.selenium.locators;
+
+import org.openqa.selenium.WebElement;
+
+public interface IRelativeByWebElement {
+    RelativeBy above(WebElement element);
+    RelativeBy below(WebElement element);
+    RelativeBy toLeftOf(WebElement element);
+    RelativeBy toRightOf(WebElement element);
+    RelativeBy near(WebElement element);
+    RelativeBy near(WebElement element, int atMostDistanceInPixels);
+}

src/main/java/aquality/selenium/locators/RelativeBy.java

@@ -8,7 +8,7 @@
 
 import java.util.List;
 
-public class RelativeBy extends By {
+public class RelativeBy extends By implements IRelativeByAqualityElement, IRelativeByWebElement, IRelativeBy {
     private By by;
 
     public RelativeBy(By by) {
@@ -75,9 +75,35 @@ public RelativeBy toRightOf(By by) {
         return new RelativeBy(this.by);
     }
 
+    public RelativeBy near(IElement element) {
+        by = RelativeLocator.with(by).near(element.getElement());
+        return new RelativeBy(this.by);
+    }
+
+    public RelativeBy near(WebElement element) {
+        by = RelativeLocator.with(by).near(element);
+        return new RelativeBy(this.by);
+    }
+
+    public RelativeBy near(By by) {
+        this.by = RelativeLocator.with(this.by).near(by);
+        return new RelativeBy(this.by);
+    }
 
+    public RelativeBy near(IElement element, int atMostDistanceInPixels) {
+        by = RelativeLocator.with(by).near(element.getElement(), atMostDistanceInPixels);
+        return new RelativeBy(this.by);
+    }
 
+    public RelativeBy near(WebElement element, int atMostDistanceInPixels) {
+        by = RelativeLocator.with(by).near(element, atMostDistanceInPixels);
+        return new RelativeBy(this.by);
+    }
 
+    public RelativeBy near(By by, int atMostDistanceInPixels) {
+        this.by = RelativeLocator.with(this.by).near(by, atMostDistanceInPixels);
+        return new RelativeBy(this.by);
+    }
 
     @Override
     public List<WebElement> findElements(SearchContext context) {

src/test/java/tests/integration/LocatorTests.java

@@ -157,8 +157,6 @@ public void testAboveBelowLeftRight() {
         ILabel cellInRow5Column3 = elementFactory.getLabel(By.xpath(labelLocatorCellRow5Column3), "CellInRow5Column3");
         ILabel cellInRow7Column5 = elementFactory.getLabel(By.xpath(labelLocatorCellRow7Column5), "CellInRow7Column5");
 
-
-
         ILabel actualCellRaw5Column5GotWithAqualityElement =
                 elementFactory.getLabel(with(By.xpath(labelLocatorCell))
                         .above(cellInRow7Column5)
@@ -167,18 +165,41 @@ public void testAboveBelowLeftRight() {
                         .toLeftOf(cellInRow5Column7)
                         .above(cellInRow7Column5), nameElementRow5Column5);
 
+        ILabel actualCellRaw5Column5GotWithWebElement =
+                elementFactory.getLabel(with(By.xpath(labelLocatorCell))
+                        .above(cellInRow7Column5.getElement())
+                        .below(cellInRow3Column5.getElement())
+                        .toRightOf(cellInRow5Column3.getElement())
+                        .toLeftOf(cellInRow5Column7.getElement())
+                        .above(cellInRow7Column5.getElement())
+                        , nameElementRow5Column5);
+
+        ILabel actualCellRaw5Column5GotWithXpath =
+                elementFactory.getLabel(with(By.xpath(labelLocatorCell))
+                                .above(By.xpath(labelLocatorCellRow7Column5))
+                                .below(By.xpath(labelLocatorCellRow3Column5))
+                                .toRightOf(By.xpath(labelLocatorCellRow5Column3))
+                                .toLeftOf(By.xpath(labelLocatorCellRow5Column7))
+                                .above(By.xpath(labelLocatorCellRow7Column5))
+                        , nameElementRow5Column5);
+
+        WebElement actualWebElementCellRaw5Column5GotBySeleniumRelative =
+                getBrowser().getDriver().findElement(RelativeLocator.with(By.xpath(labelLocatorCell))
+                        .above(By.xpath(labelLocatorCellRow7Column5))
+                        .below(By.xpath(labelLocatorCellRow3Column5))
+                        .toRightOf(By.xpath(labelLocatorCellRow5Column3))
+                        .toLeftOf(By.xpath(labelLocatorCellRow5Column7))
+                        .above(By.xpath(labelLocatorCellRow7Column5))
+                        );
 
-        String a = actualCellRaw5Column5GotWithAqualityElement.getText();
-        int ss=2;
-
-
+        checkDifferentTypesWithSoftAssert(
+                actualCellRaw5Column5GotWithAqualityElement.getText(),
+                actualCellRaw5Column5GotWithXpath.getText(),
+                actualCellRaw5Column5GotWithWebElement.getText(),
+                actualWebElementCellRaw5Column5GotBySeleniumRelative.getText(),
+                cellInRow5Column5.getText());
     }
 
-
-
-
-
-
     public void checkDifferentTypesWithSoftAssert(String textAquality, String textWebElement, String textByXpath, String textSelenium, String expectedText) {
         SoftAssert softAssert = new SoftAssert();
         softAssert.assertEquals(textAquality, expectedText, friendlyMessage);