[1.4.2-fix-overlapping] - fix for validation overlapping

Author: dzaiats

src/main/java/environment/EnvironmentConstants.java

@@ -11,6 +11,7 @@ public class EnvironmentConstants {
     public static final String EXECUTOR = "EXECUTOR";
     public static final String PLATFORM_VERSION = "PLATFORM_VERSION";
     public static final String PHANTOM_JS_PATH = "PHANTOM_JS_PATH";
+    public static final String USER_AGENT = "USER_AGENT";
     public static final String DEVICE = "DEVICE";
     public static final String MOBILE_DEVICE_EMULATION = "MOBILE_DEVICE_EMULATION";
     public static final String NAME = "NAME";

src/main/java/environment/EnvironmentFactory.java

@@ -81,6 +81,10 @@ public static String getPhantomJsPath() {
         return System.getenv(EnvironmentConstants.PHANTOM_JS_PATH) != null ? System.getenv(EnvironmentConstants.PHANTOM_JS_PATH) : System.getProperty(EnvironmentConstants.PHANTOM_JS_PATH);
     }
 
+    public static String getUserAgent() {
+        return System.getenv(EnvironmentConstants.USER_AGENT) != null ? System.getenv(EnvironmentConstants.USER_AGENT) : System.getProperty(EnvironmentConstants.USER_AGENT);
+    }
+
     public static String getDevice() {
         return System.getenv(EnvironmentConstants.DEVICE) != null ? System.getenv(EnvironmentConstants.DEVICE) : System.getProperty(EnvironmentConstants.DEVICE);
     }

src/main/java/util/driver/CapabilitiesFactory.java

@@ -83,7 +83,8 @@ private static DesiredCapabilities getPhantomJSCapabilities() {
         capabilities.setJavascriptEnabled(true);
         capabilities.setCapability("takesScreenshot", true);
         capabilities.setCapability("browserName", "PhantomJS");
-        capabilities.setCapability("browser", getBrowserName().toLowerCase());
+        capabilities.setCapability("browser", "phantomjs");
+        capabilities.setCapability("phantomjs.page.settings.userAgent", getUserAgent());
         capabilities.setCapability(PhantomJSDriverService.PHANTOMJS_EXECUTABLE_PATH_PROPERTY,
                 getPhantomJsPath()
         );

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

@@ -797,17 +797,23 @@ private boolean elementsAreOverlappedOnBorder(WebElement rootElement, WebElement
         int widthRoot = rootElement.getSize().width;
         int heightRoot = rootElement.getSize().height;
 
-        int sqRootElement = (xRoot + widthRoot) * (yRoot + heightRoot);
-        int sqElement = (elLoc.x + elSize.width) * (elLoc.y + elSize.height);
+        int sqRootElement = widthRoot * heightRoot;
+        int sqElement = elSize.width * elSize.height;
 
         int sqCommon = 0;
-        if ((xRoot < elLoc.x && yRoot == elLoc.y) || (yRoot < elLoc.y && xRoot == elLoc.x)) {
-            sqCommon = (xRoot + widthRoot + elSize.width) * (yRoot + heightRoot + elSize.height);
-        } else if ((elLoc.x < xRoot && yRoot == elLoc.y) || (elLoc.y < yRoot && xRoot == elLoc.x)) {
-            sqCommon = (elLoc.x + elSize.width + widthRoot) * (elLoc.y + elSize.height + heightRoot);
+        if (xRoot < elLoc.x && yRoot == elLoc.y) {
+            sqCommon = (widthRoot + (elLoc.x - (xRoot + widthRoot) + elSize.width)) * (heightRoot);
+        } else if (yRoot < elLoc.y && xRoot == elLoc.x) {
+            sqCommon = (heightRoot + (elLoc.y - (yRoot + heightRoot) + elSize.height)) * (widthRoot);
+        } else if ((elLoc.x < xRoot && yRoot == elLoc.y)) {
+            sqCommon = ((elSize.width) + (xRoot - (elLoc.x + elSize.width) + widthRoot)) * (elSize.height);
+        } else if (elLoc.y < yRoot && xRoot == elLoc.x) {
+            sqCommon = ((elSize.height) + (yRoot - (elLoc.y + elSize.height) + heightRoot)) * (elSize.width);
+        } else {
+            return false;
         }
 
-        return sqCommon - sqElement >= sqRootElement;
+        return sqCommon < sqRootElement + sqElement;
     }
 
     private boolean elementsAreOverlapped(WebElement elementOverlapWith) {

src/test/java/ResponsiveValidatorTest.java

@@ -25,8 +25,8 @@ public void testThatResponsiveValidatorWorks() {
         Map<String, String> sysProp = new HashMap<>();
         //sysProp.put("BROWSER", "phantomjs");
         //sysProp.put("IS_HEADLESS", "true");
-        sysProp.put("IS_LOCAL", "true");
-        sysProp.put("BROWSER", "Firefox");
+        sysProp.put("IS_HEADLESS", "true");
+        sysProp.put("BROWSER", "phantomjs");
         sysProp.put(PhantomJSDriverService.PHANTOMJS_EXECUTABLE_PATH_PROPERTY, "/Users/ZayCo/Downloads/phantomjs-2.1.1-macosx/bin/phantomjs");
         EnvironmentHelper.setEnv(sysProp);
         WebDriverFactory driverFactory = new WebDriverFactory();