Merge pull request #84 from ITArray/SynchronousReports

Add tolerance to all but grid alignment

Author: dzaiats

pom.xml

@@ -97,6 +97,8 @@
                 <configuration>
                     <additionalparam>-Xdoclint:none</additionalparam>
                     <javadocDirectory>${project.basedir}/target/generated-sources/apidocs</javadocDirectory>
+                    <failOnError>false</failOnError>
+                    <excludePackageNames>net.itarray.automotion.internal:net.itarray.automotion.internal.*</excludePackageNames>
                 </configuration>
             </plugin>
             <plugin>

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

@@ -34,7 +34,7 @@ public AbstractValidator dontDrawMap() {
 
 
     protected void addError(String message) {
-        getBase().addError(message);
+        getBase().getContext().add(message);
     }
 
     @Override

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

@@ -1,7 +1,8 @@
 package net.itarray.automotion.internal;
 
+import net.itarray.automotion.internal.geometry.Scalar;
+import net.itarray.automotion.internal.geometry.Vector;
 import net.itarray.automotion.tools.helpers.Helper;
-import org.json.simple.JSONObject;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -14,21 +15,20 @@
 public class DrawableScreenshot {
 
     private final DrawingConfiguration drawingConfiguration;
-    private BufferedImage img;
     private TransformedGraphics graphics;
     private File screenshotName;
     private File drawingsOutput;
     private BufferedImage drawings;
+    private final Vector extend;
 
-    public DrawableScreenshot(SimpleTransform transform, DrawingConfiguration drawingConfiguration, String rootElementReadableName, File screenshotName) {
+    public DrawableScreenshot(Vector extend, SimpleTransform transform, DrawingConfiguration drawingConfiguration, String rootElementReadableName, File screenshotName) {
         this.drawingConfiguration = drawingConfiguration;
         this.screenshotName = screenshotName;
         drawingsOutput = new File(TARGET_AUTOMOTION_IMG + rootElementReadableName.replace(" ", "") + "-draw-" + System.currentTimeMillis() + Helper.getGeneratedStringWithLength(7) + ".png");
 
         try {
-            img = ImageIO.read(screenshotName);
-
-            drawings = new BufferedImage(img.getWidth(), img.getHeight(),
+            this.extend = extend;
+            drawings = new BufferedImage(extend.getX().intValue(), extend.getY().intValue(),
                     BufferedImage.TYPE_INT_ARGB);
 
             Graphics2D g2d = drawings.createGraphics();
@@ -54,44 +54,41 @@ public File getDrawingsOutput() {
         return drawingsOutput;
     }
 
-    public void drawOffsets(UIElement rootElement, OffsetLineCommands offsetLineCommands) {
-        offsetLineCommands.draw(graphics, img, rootElement, drawingConfiguration);
+    public void drawVerticalLine(Scalar x) {
+        drawingConfiguration.setLinesStyle(graphics);
+        graphics.drawVerticalLine(x.intValue(), extend.getY().intValue());
     }
 
-    public void drawScreenshot(String rootElementReadableName, Errors errors) {
-        for (Object obj : errors.getMessages()) {
-            JSONObject det = (JSONObject) obj;
-            JSONObject details = (JSONObject) det.get(REASON);
-            JSONObject numE = (JSONObject) details.get(ELEMENT);
-
-            if (numE != null) {
-                int x = (int) (float) numE.get(X);
-                int y = (int) (float) numE.get(Y);
-                int width = (int) (float) numE.get(WIDTH);
-                int height = (int) (float) numE.get(HEIGHT);
-
-                drawingConfiguration.setHighlightedElementStyle(graphics);
-                graphics.drawRectByExtend(x, y, width, height);
-            }
-        }
-
-
-
+    public void drawHorizontalLine(Scalar y) {
+        drawingConfiguration.setLinesStyle(graphics);
+        graphics.drawHorizontalLine(y.intValue(), extend.getX().intValue());
+    }
 
+    public void saveDrawing() {
         try {
             ImageIO.write(drawings, "png", drawingsOutput);
         } catch (IOException e) {
             throw new RuntimeException("Writing file failed for " + drawingsOutput , e);
         }
 
         drawings.getGraphics().dispose();
-
     }
 
-    public void drawRootElement(UIElement rootElement) {
+    public void drawRoot(UIElement rootElement) {
         drawingConfiguration.setRootElementStyle(graphics);
-        int x = rootElement.getX().intValue();
-        int y = rootElement.getY().intValue();
-        graphics.drawRectByExtend(x, y, rootElement.getWidth().intValue(), rootElement.getHeight().intValue());
+        basicDraw(rootElement);
+    }
+
+    public void draw(UIElement element) {
+        drawingConfiguration.setHighlightedElementStyle(graphics);
+        basicDraw(element);
+    }
+
+    private void basicDraw(UIElement element) {
+        int x = element.getOrigin().getX().intValue();
+        int y = element.getOrigin().getY().intValue();
+        int width = element.getWidth().intValue();
+        int height = element.getHeight().intValue();
+        graphics.drawRectByExtend(x, y, width, height);
     }
 }

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

@@ -3,12 +3,15 @@
 import io.appium.java_client.AppiumDriver;
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.ios.IOSDriver;
+import net.itarray.automotion.internal.geometry.Vector;
 import org.openqa.selenium.*;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.phantomjs.PhantomJSDriver;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -38,6 +41,19 @@ public void takeScreenshot(File file) {
         }
     }
 
+    public Vector getExtend(File screenshotName) {
+        try {
+            BufferedImage img = ImageIO.read(screenshotName);
+
+            int width = img.getWidth();
+            int height = img.getHeight();
+            return new Vector(width, height);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
     public WebDriver getDriver() {
         return driver;
     }

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

@@ -9,48 +9,20 @@ public class Errors {
 
     private final JSONArray messages = new JSONArray();
     private String lastMessage;
-    private UIElement lastElement;
 
     public String getLastMessage() {
         return lastMessage;
     }
 
-    public UIElement getLastElement() {
-        return lastElement;
-    }
-
     public void add(String message) {
         lastMessage = message;
-        lastElement = null;
         JSONObject details = new JSONObject();
         JSONObject messageObject = new JSONObject();
         messageObject.put(MESSAGE, message);
         details.put(REASON, messageObject);
         messages.add(details);
     }
 
-    public void add(String message, UIElement element) {
-        lastMessage = message;
-        lastElement = element;
-        float xContainer = element.getX().intValue();
-        float yContainer = element.getY().intValue();
-        float widthContainer = element.getWidth().intValue();
-        float heightContainer = element.getHeight().intValue();
-
-        JSONObject details = new JSONObject();
-        JSONObject elDetails = new JSONObject();
-        elDetails.put(X, xContainer);
-        elDetails.put(Y, yContainer);
-        elDetails.put(WIDTH, widthContainer);
-        elDetails.put(HEIGHT, heightContainer);
-        JSONObject mes = new JSONObject();
-        mes.put(MESSAGE, message);
-        mes.put(ELEMENT, elDetails);
-        details.put(REASON, mes);
-        messages.add(details);
-    }
-
-
     public boolean hasMessages() {
         return !messages.isEmpty();
     }