[1.4.2-updated-unique-json-names] - fix for collecting results

Author: Denys Zaiats

src/main/java/util/general/SystemHelper.java

@@ -3,35 +3,55 @@
 import java.awt.*;
 import java.io.File;
 import java.lang.reflect.Field;
+import java.util.Arrays;
 
+import static environment.EnvironmentFactory.*;
 import static util.validator.Constants.TARGET_AUTOMOTION_JSON;
 
 public class SystemHelper {
 
+    public final static String[] iOS_RETINA_DEVICES = {
+            "iPhone 4", "iPhone 4s",
+            "iPhone 5", "iPhone 5s",
+            "iPhone 6", "iPhone 6s",
+            "iPad Mini 2",
+            "iPad Mini 4",
+            "iPad Air 2",
+            "iPad Pro"
+    };
+
     /**
      * Verify is display is retina
      *
      * @return
      */
     public static boolean isRetinaDisplay() {
         boolean isRetina = false;
-        try {
-            GraphicsDevice graphicsDevice = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
-
+        if (isMobile()) {
+            if (isIOS()) {
+                if (Arrays.asList(iOS_RETINA_DEVICES).contains(getDevice())) {
+                    isRetina = true;
+                }
+            }
+        } else {
             try {
-                Field field = graphicsDevice.getClass().getDeclaredField("scale");
-                if (field != null) {
-                    field.setAccessible(true);
-                    Object scale = field.get(graphicsDevice);
-                    if (scale instanceof Integer && (Integer) scale == 2) {
-                        isRetina = true;
+                GraphicsDevice graphicsDevice = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+
+                try {
+                    Field field = graphicsDevice.getClass().getDeclaredField("scale");
+                    if (field != null) {
+                        field.setAccessible(true);
+                        Object scale = field.get(graphicsDevice);
+                        if (scale instanceof Integer && (Integer) scale == 2) {
+                            isRetina = true;
+                        }
                     }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
         }
         return isRetina;
     }

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

@@ -29,7 +29,6 @@
 import static util.validator.ResponsiveUIValidator.Units.PX;
 
 public class ResponsiveUIValidator {
-
     static final int MIN_OFFSET = -10000;
     private final static Logger LOG = Logger.getLogger(ResponsiveUIValidator.class);
     protected static WebDriver driver;