[1.4.2-minor fixes] - common fixes

Author: dzaiats

src/main/java/util/validator/ResponsiveUIValidator.java

@@ -373,31 +373,31 @@ void validateBottomOffsetForChunk(List<WebElement> elements) {
 
     void validateRightOffsetForElements(WebElement element, String readableName) {
         if (!element.equals(rootElement)) {
-            if (!elementsHaveEqualLeftRightOffset(false, element)) {
+            if (!elementsHaveEqualLeftRightOffset(false, rootElement, element)) {
                 putJsonDetailsWithElement(String.format("Element '%s' has not the same right offset as element '%s'", rootElementReadableName, readableName), element);
             }
         }
     }
 
     void validateLeftOffsetForElements(WebElement element, String readableName) {
         if (!element.equals(rootElement)) {
-            if (!elementsHaveEqualLeftRightOffset(true, element)) {
+            if (!elementsHaveEqualLeftRightOffset(true, rootElement, element)) {
                 putJsonDetailsWithElement(String.format("Element '%s' has not the same left offset as element '%s'", rootElementReadableName, readableName), element);
             }
         }
     }
 
     void validateTopOffsetForElements(WebElement element, String readableName) {
         if (!element.equals(rootElement)) {
-            if (!elementsHaveEqualTopBottomOffset(true, element)) {
+            if (!elementsHaveEqualTopBottomOffset(true, rootElement, element)) {
                 putJsonDetailsWithElement(String.format("Element '%s' has not the same top offset as element '%s'", rootElementReadableName, readableName), element);
             }
         }
     }
 
     void validateBottomOffsetForElements(WebElement element, String readableName) {
         if (!element.equals(rootElement)) {
-            if (!elementsHaveEqualTopBottomOffset(false, element)) {
+            if (!elementsHaveEqualTopBottomOffset(false, rootElement, element)) {
                 putJsonDetailsWithElement(String.format("Element '%s' has not the same bottom offset as element '%s'", rootElementReadableName, readableName), element);
             }
         }
@@ -893,17 +893,6 @@ private boolean elementsAreOverlapped(WebElement rootElement, WebElement element
                 || elementsAreOverlappedOnBorder(rootElement, elementOverlapWith);
     }
 
-    private boolean elementsHaveEqualLeftRightOffset(boolean isLeft, WebElement elementToCompare) {
-        Point elLoc = elementToCompare.getLocation();
-        Dimension elSize = elementToCompare.getSize();
-
-        if (isLeft) {
-            return xRoot == elLoc.getX();
-        } else {
-            return (pageWidth - xRoot + widthRoot) == (pageWidth - elLoc.getX() + elSize.getWidth());
-        }
-    }
-
     private boolean elementsHaveEqualLeftRightOffset(boolean isLeft, WebElement element, WebElement elementToCompare) {
         Point elLoc = elementToCompare.getLocation();
         Dimension elSize = elementToCompare.getSize();
@@ -917,18 +906,6 @@ private boolean elementsHaveEqualLeftRightOffset(boolean isLeft, WebElement elem
         }
     }
 
-
-    private boolean elementsHaveEqualTopBottomOffset(boolean isTop, WebElement elementToCompare) {
-        Point elLoc = elementToCompare.getLocation();
-        Dimension elSize = elementToCompare.getSize();
-
-        if (isTop) {
-            return yRoot == elLoc.getY();
-        } else {
-            return (pageHeight - yRoot + heightRoot) == (pageHeight - elLoc.getY() + elSize.getHeight());
-        }
-    }
-
     private boolean elementsHaveEqualTopBottomOffset(boolean isTop, WebElement element, WebElement elementToCompare) {
         Point elLoc = elementToCompare.getLocation();
         Dimension elSize = elementToCompare.getSize();