Merge pull request #19 from ITArray/1.4.2-issue-18

[1.4.2-issue-18] - adapted methods. Added fix for drawing screenshots

Author: dzaiats

src/main/java/util/validator/ChunkValidator.java

@@ -1,5 +1,7 @@
 package util.validator;
 
+import org.openqa.selenium.WebElement;
+
 public interface ChunkValidator {
 
     ResponsiveUIChunkValidator changeMetricsUnitsTo(ResponsiveUIValidator.Units units);
@@ -28,4 +30,6 @@ public interface ChunkValidator {
 
     ResponsiveUIChunkValidator equalTopBottomOffset();
 
+    ResponsiveUIChunkValidator insideOf(WebElement containerElement, String readableContainerName);
+
 }

src/main/java/util/validator/ResponsiveUIChunkValidator.java

@@ -162,4 +162,17 @@ public ResponsiveUIChunkValidator equalTopBottomOffset() {
         validateEqualTopBottomOffset(rootElements);
         return this;
     }
-}
+
+    /**
+     * Verify that element(s) is(are) located inside of specified element
+     *
+     * @param containerElement
+     * @param readableContainerName
+     * @return ResponsiveUIValidator
+     */
+    @Override
+    public ResponsiveUIChunkValidator insideOf(WebElement containerElement, String readableContainerName) {
+        validateInsideOfContainer(containerElement, readableContainerName);
+        return this;
+    }
+}

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

@@ -133,14 +133,13 @@ public ResponsiveUIChunkValidator findElements(java.util.List<WebElement> elemen
     }
 
     /**
-     * Verify that element(s) is(are) located inside of specified element
+     * Change units to Pixels or % (Units.PX, Units.PERCENT)
      *
-     * @param containerElement
-     * @param readableContainerName
-     * @return ResponsiveUIValidator
+     * @param units
+     * @return UIValidator
      */
-    public ResponsiveUIValidator insideOf(WebElement containerElement, String readableContainerName) {
-        validateInsideOfContainer(containerElement, readableContainerName);
+    public ResponsiveUIValidator changeMetricsUnitsTo(Units units) {
+        this.units = units;
         return this;
     }
 
@@ -699,7 +698,9 @@ String getFormattedMessage(WebElement element) {
     int getRetinaValue(int value) {
         if (!isMobile()) {
             int zoom = Integer.valueOf(currentZoom.replace("%", ""));
-            if (zoom != 100) {
+            if (zoom > 100) {
+                value = (int) (value + (value * Math.abs(zoom - 100f) / 100f));
+            } else if (zoom < 100) {
                 value = (int) (value - (value * Math.abs(zoom - 100f) / 100f));
             }
             if (isRetinaDisplay() && isChrome()) {
@@ -750,7 +751,7 @@ long getPageHeight() {
         }
     }
 
-    private void validateInsideOfContainer(WebElement element, String readableContainerName) {
+    void validateInsideOfContainer(WebElement element, String readableContainerName) {
         float xContainer = element.getLocation().x;
         float yContainer = element.getLocation().y;
         float widthContainer = element.getSize().width;

src/main/java/util/validator/UIValidator.java

@@ -557,4 +557,17 @@ public UIValidator equalTopBottomOffset() {
         validateEqualTopBottomOffset(rootElement, rootElementReadableName);
         return this;
     }
+
+    /**
+     * Verify that element(s) is(are) located inside of specified element
+     *
+     * @param containerElement
+     * @param readableContainerName
+     * @return ResponsiveUIValidator
+     */
+    @Override
+    public UIValidator insideOf(WebElement containerElement, String readableContainerName) {
+        validateInsideOfContainer(containerElement, readableContainerName);
+        return this;
+    }
 }

src/main/java/util/validator/Validator.java

@@ -82,4 +82,6 @@ interface Validator {
 
     UIValidator equalTopBottomOffset();
 
+    UIValidator insideOf(WebElement containerElement, String readableContainerName);
+
 }

src/test/java/ResponsiveValidatorTest.java

@@ -6,6 +6,7 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.phantomjs.PhantomJSDriverService;
 import util.driver.DriverHelper;
 import util.driver.WebDriverFactory;
 import util.validator.ResponsiveUIValidator;
@@ -22,18 +23,21 @@ public class ResponsiveValidatorTest {
     @Test
     public void testThatResponsiveValidatorWorks() {
         Map<String, String> sysProp = new HashMap<>();
-        sysProp.put("BROWSER", "Chrome");
+        //sysProp.put("BROWSER", "phantomjs");
+        //sysProp.put("IS_HEADLESS", "true");
         sysProp.put("IS_LOCAL", "true");
-        //sysProp.put(PhantomJSDriverService.PHANTOMJS_EXECUTABLE_PATH_PROPERTY, "/Users/ZayCo/Downloads/phantomjs-2.1.1-macosx/bin/phantomjs");
+        sysProp.put("BROWSER", "Firefox");
+        sysProp.put(PhantomJSDriverService.PHANTOMJS_EXECUTABLE_PATH_PROPERTY, "/Users/ZayCo/Downloads/phantomjs-2.1.1-macosx/bin/phantomjs");
         EnvironmentHelper.setEnv(sysProp);
         WebDriverFactory driverFactory = new WebDriverFactory();
         driver = driverFactory.getDriver();
-        driver.get("http:/visual.itarray.net");
+        driver.get("http://visual.itarray.net");
         driver.manage().window().maximize();
 
         TestPage page = new TestPage(driver);
 
         ResponsiveUIValidator uiValidator = new ResponsiveUIValidator(driver);
+
         uiValidator.setLinesColor(Color.BLACK);
         SoftAssertions softly = new SoftAssertions();
 
@@ -109,6 +113,7 @@ public void testThatResponsiveValidatorWorks() {
             boolean success = uiValidator.init("Validate on page zoom " + val + "%")
                     .findElement(page.mainContainer(), "Main container")
                     .equalLeftRightOffset()
+                    .sameWidthAs(page.gridContainer(), "Grid Container")
                     .drawMap()
                     .validate();
 
@@ -127,4 +132,4 @@ public void tearDown() {
         }
     }
 
-}
+}