[master] - show results on hover

dzaiats · dzaiats · commit 8200c9a345d8 · 2017-12-01T20:38:14.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.itarray</groupId>
     <artifactId>automotion</artifactId>
-    <version>2.0.5</version>
+    <version>2.0.6</version>
     <name>Automotion</name>
     <description>Library for smart visual automation testing</description>
     <url>https://automotion.itarray.net</url>
diff --git a/src/main/java/net/itarray/automotion/internal/HtmlReportBuilder.java b/src/main/java/net/itarray/automotion/internal/HtmlReportBuilder.java
@@ -3,6 +3,10 @@
 import com.webfirmframework.wffweb.tag.html.*;
 import com.webfirmframework.wffweb.tag.html.attribute.Alt;
 import com.webfirmframework.wffweb.tag.html.attribute.Src;
+import com.webfirmframework.wffweb.tag.html.attribute.event.mouse.OnMouseOut;
+import com.webfirmframework.wffweb.tag.html.attribute.event.mouse.OnMouseOver;
+import com.webfirmframework.wffweb.tag.html.attribute.global.ClassAttribute;
+import com.webfirmframework.wffweb.tag.html.attribute.global.Id;
 import com.webfirmframework.wffweb.tag.html.attribute.global.Style;
 import com.webfirmframework.wffweb.tag.html.images.Img;
 import com.webfirmframework.wffweb.tag.html.lists.Li;
@@ -110,15 +114,18 @@ private Html buildHtml() throws IOException, ParseException {
                             }};
                             new P(this) {{
                                         new Div(this,
+                                                new OnMouseOver("document.getElementById('" + jsonObject.get(DRAWINGS).toString()+ "').style.display = 'block'"),
+                                                new OnMouseOut("document.getElementById('" + jsonObject.get(DRAWINGS).toString()+ "').style.display = 'none'"),
                                                 new Style("position:relative; left: 0; top:0; width: 96%; margin-left:2%")) {{
                                             new Img(this,
                                                     new Style("position:relative; left: 0; top:0"),
                                                 new Src(String.format("img/%s", jsonObject.get(SCREENSHOT))),
                                                 new Alt("screenshot"));
                                             new Img(this,
-                                                new Style("position:absolute; left: 0; top:0"),
+                                                new Id(jsonObject.get(DRAWINGS).toString()),
+                                                new Style("position:absolute; left: 0; top:0; display:none;"),
                                                 new Src(String.format("img/%s", jsonObject.get(DRAWINGS))),
-                                                new Alt("screenshot"));
+                                                new Alt("screenshot-overlay"));
                                         }};
 
                             }};
diff --git a/src/main/java/net/itarray/automotion/internal/ResponsiveUIChunkValidatorBase.java b/src/main/java/net/itarray/automotion/internal/ResponsiveUIChunkValidatorBase.java
@@ -31,6 +31,7 @@ public ResponsiveUIChunkValidatorBase(UISnapshot snapshot, List<WebElement> webE
                 try {
                     ((JavascriptExecutor) getDriver().getDriver()).executeScript("arguments[0].scrollIntoView();", webElements.get(0));
                     ((JavascriptExecutor) getDriver().getDriver()).executeScript("javascript:window.scrollBy(0,250);");
+                    ((JavascriptExecutor) getDriver().getDriver()).executeScript("document.documentElement.style.overflow = 'hidden'");
                 } catch (Exception e) {}
             }
         }
diff --git a/src/main/java/net/itarray/automotion/internal/UIValidatorBase.java b/src/main/java/net/itarray/automotion/internal/UIValidatorBase.java
@@ -40,6 +40,7 @@ public UIValidatorBase(UISnapshot snapshot, WebElement webElement, String readab
             try {
                 ((JavascriptExecutor) getDriver().getDriver()).executeScript("arguments[0].scrollIntoView();", webElement);
                 ((JavascriptExecutor) getDriver().getDriver()).executeScript("javascript:window.scrollBy(0,250);");
+                ((JavascriptExecutor) getDriver().getDriver()).executeScript("document.documentElement.style.overflow = 'hidden'");
             } catch (Exception e) {}
         }
     }
diff --git a/src/main/java/net/itarray/automotion/tools/general/SystemHelper.java b/src/main/java/net/itarray/automotion/tools/general/SystemHelper.java
@@ -1,5 +1,7 @@
 package net.itarray.automotion.tools.general;
 
+import javafx.stage.Screen;
+
 import java.awt.*;
 import java.io.File;
 import java.lang.reflect.Field;
@@ -28,14 +30,22 @@ public static boolean isRetinaDisplay() {
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                isRetina = getDisplayScaleFactor() > 140;
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            isRetina = getDisplayScaleFactor() > 140;
         }
         return isRetina;
     }
 
+    private static double getDisplayScaleFactor() {
+        double screenHeight = Toolkit.getDefaultToolkit().getScreenSize().getHeight();
+        double screenWidth = Toolkit.getDefaultToolkit().getScreenSize().getWidth();
+        int screenResolution = Toolkit.getDefaultToolkit().getScreenResolution();
+
+        return screenResolution;
+    }
+
     /**
      * Convert hex color to rgb or rgba
      *
diff --git a/src/test/java/ResponsiveValidatorCompatibleTest.java b/src/test/java/ResponsiveValidatorCompatibleTest.java
@@ -1,4 +1,6 @@
-import http.helpers.EnvironmentHelper;
+import net.itarray.automotion.tools.driver.DriverHelper;
+import net.itarray.automotion.tools.driver.WebDriverFactory;
+import net.itarray.automotion.tools.helpers.EnvironmentHelper;
 import net.itarray.automotion.validation.ResponsiveUIValidator;
 import net.itarray.automotion.validation.properties.Padding;
 import org.assertj.core.api.SoftAssertions;
@@ -9,8 +11,6 @@
 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 java.awt.*;
 import java.util.HashMap;
diff --git a/src/test/java/ResponsiveValidatorTest.java b/src/test/java/ResponsiveValidatorTest.java
@@ -1,4 +1,7 @@
-import http.helpers.EnvironmentHelper;
+import net.itarray.automotion.tools.driver.DriverHelper;
+import net.itarray.automotion.tools.driver.WebDriverFactory;
+import net.itarray.automotion.tools.helpers.EnvironmentHelper;
+import net.itarray.automotion.validation.ResponsiveUIValidator;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.After;
 import org.junit.Ignore;
@@ -7,18 +10,13 @@
 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;
 import util.validator.properties.Padding;
 
 import java.awt.*;
 import java.util.HashMap;
 import java.util.Map;
 
-import static net.itarray.automotion.validation.properties.Expression.percentOrPixels;
 import static net.itarray.automotion.validation.properties.Condition.between;
-import static net.itarray.automotion.validation.properties.Expression.percent;
 
 @Ignore
 public class ResponsiveValidatorTest {

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public ResponsiveUIChunkValidatorBase(UISnapshot snapshot, List<WebElement> webE`
`31`	`31`	`try {`
`32`	`32`	`((JavascriptExecutor) getDriver().getDriver()).executeScript("arguments[0].scrollIntoView();", webElements.get(0));`
`33`	`33`	`((JavascriptExecutor) getDriver().getDriver()).executeScript("javascript:window.scrollBy(0,250);");`
	`34`	`+ ((JavascriptExecutor) getDriver().getDriver()).executeScript("document.documentElement.style.overflow = 'hidden'");`
`34`	`35`	`} catch (Exception e) {}`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ public UIValidatorBase(UISnapshot snapshot, WebElement webElement, String readab`
`40`	`40`	`try {`
`41`	`41`	`((JavascriptExecutor) getDriver().getDriver()).executeScript("arguments[0].scrollIntoView();", webElement);`
`42`	`42`	`((JavascriptExecutor) getDriver().getDriver()).executeScript("javascript:window.scrollBy(0,250);");`
	`43`	`+ ((JavascriptExecutor) getDriver().getDriver()).executeScript("document.documentElement.style.overflow = 'hidden'");`
`43`	`44`	`} catch (Exception e) {}`
`44`	`45`	`}`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package net.itarray.automotion.tools.general;`
`2`	`2`
	`3`	`+import javafx.stage.Screen;`
	`4`	`+`
`3`	`5`	`import java.awt.*;`
`4`	`6`	`import java.io.File;`
`5`	`7`	`import java.lang.reflect.Field;`
`@@ -28,14 +30,22 @@ public static boolean isRetinaDisplay() {`
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`	`} catch (Exception e) {`
`31`		`- e.printStackTrace();`
	`33`	`+ isRetina = getDisplayScaleFactor() > 140;`
`32`	`34`	`}`
`33`	`35`	`} catch (Exception e) {`
`34`		`- e.printStackTrace();`
	`36`	`+ isRetina = getDisplayScaleFactor() > 140;`
`35`	`37`	`}`
`36`	`38`	`return isRetina;`
`37`	`39`	`}`
`38`	`40`
	`41`	`+ private static double getDisplayScaleFactor() {`
	`42`	`+ double screenHeight = Toolkit.getDefaultToolkit().getScreenSize().getHeight();`
	`43`	`+ double screenWidth = Toolkit.getDefaultToolkit().getScreenSize().getWidth();`
	`44`	`+ int screenResolution = Toolkit.getDefaultToolkit().getScreenResolution();`
	`45`	`+`
	`46`	`+ return screenResolution;`
	`47`	`+ }`
	`48`	`+`
`39`	`49`	`/**`
`40`	`50`	`* Convert hex color to rgb or rgba`
`41`	`51`	`*`