[master] - fixes for mobile test run. Scale factor for Android device

Author: Denys Zaiats

src/main/java/net/itarray/automotion/internal/ResponsiveUIValidatorBase.java

@@ -1,6 +1,5 @@
 package net.itarray.automotion.internal;
 
-import net.itarray.automotion.internal.geometry.Direction;
 import net.itarray.automotion.tools.helpers.Helper;
 import net.itarray.automotion.validation.ResponsiveUIValidator;
 import net.itarray.automotion.validation.UISnapshot;
@@ -9,12 +8,7 @@
 import org.openqa.selenium.Dimension;
 
 import java.awt.*;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 
 import static net.itarray.automotion.tools.environment.EnvironmentFactory.*;
@@ -24,11 +18,11 @@
 public abstract class ResponsiveUIValidatorBase {
 
     protected final Errors errors;
+    protected final UIElement page;
     private final long startTime;
     private final UISnapshot snapshot;
     private final DriverFacade driver;
     private final double zoomFactor;
-    protected final UIElement page;
 
     protected ResponsiveUIValidatorBase(UISnapshot snapshot) {
         this.snapshot = snapshot;
@@ -52,15 +46,6 @@ public Units getUnits() {
         return getReport().getUnits();
     }
 
-    protected ResponsiveUIValidator getReport() {
-        return snapshot.getResponsiveUIValidator();
-    }
-
-
-    public boolean isWithReport() {
-        return getReport().isWithReport();
-    }
-
     /**
      * @deprecated As of release 2.0, replaced by{@link util.validator.ResponsiveUIValidator#changeMetricsUnitsTo(util.validator.ResponsiveUIValidator.Units)} ()}
      */
@@ -70,6 +55,14 @@ protected ResponsiveUIValidatorBase setUnits(Units units) {
         return this;
     }
 
+    protected ResponsiveUIValidator getReport() {
+        return snapshot.getResponsiveUIValidator();
+    }
+
+    public boolean isWithReport() {
+        return getReport().isWithReport();
+    }
+
     public ResponsiveUIValidatorBase drawMap() {
         getReport().drawMap();
         return this;
@@ -118,11 +111,9 @@ private SimpleTransform getTransform() {
     }
 
     private double getScaleFactor() {
-        double factor = 1;
+        double factor;
         if (isMobile()) {
-            if (isIOS() && isIOSDevice()) {
-                factor = 2;
-            }
+            factor = 2;
         } else {
             factor = zoomFactor;
             if (isRetinaDisplay() && isChrome()) {
@@ -135,7 +126,7 @@ private double getScaleFactor() {
     private int getYOffset() {
         if (isMobile() && getDriver().isAppiumWebContext() && getReport().isMobileTopBarOffset()) {
             if (isIOS() || isAndroid()) {
-                return 20;
+                return 20 * (int) getScaleFactor();
             }
         }
         return 0;
@@ -166,8 +157,7 @@ private void writeResults(DrawableScreenshot drawableScreenshot) {
         jsonFile.getParentFile().mkdirs();
         try (
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(new FileOutputStream(jsonFile), StandardCharsets.UTF_8);
-                Writer writer = new BufferedWriter(outputStreamWriter))
-        {
+                Writer writer = new BufferedWriter(outputStreamWriter)) {
             writer.write(jsonResults.toJSONString());
         } catch (IOException ex) {
             throw new RuntimeException("Cannot create json report: " + jsonFile, ex);