removed rectangles from JSON, drawing them immediately

Author: Torsten-Mumme

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

@@ -8,44 +8,37 @@
 public class Errors {
 
     private final JSONArray messages = new JSONArray();
+    private final ResponsiveUIValidatorBase responsiveUIValidatorBase;
     private String lastMessage;
 
+    public Errors(ResponsiveUIValidatorBase responsiveUIValidatorBase) {
+        this.responsiveUIValidatorBase = responsiveUIValidatorBase;
+    }
+
     public String getLastMessage() {
         return lastMessage;
     }
 
     public void add(String message) {
-        internalAdd(message, null, null);
-    }
-
-    public void add(String message, UIElement element) {
-        internalAdd(message, element, encode(element));
-    }
-
-    private void internalAdd(String message, UIElement element, JSONObject encodedElement) {
         lastMessage = message;
         JSONObject details = new JSONObject();
         JSONObject messageObject = new JSONObject();
         messageObject.put(MESSAGE, message);
-        if (encodedElement != null) {
-            messageObject.put(ELEMENT, encodedElement);
-        }
         details.put(REASON, messageObject);
         messages.add(details);
     }
 
-    private JSONObject encode(UIElement element) {
-        float xContainer = element.getX().intValue();
-        float yContainer = element.getY().intValue();
-        float widthContainer = element.getWidth().intValue();
-        float heightContainer = element.getHeight().intValue();
+    public void add(String message, UIElement element) {
+        add(message);
+        draw(element);
+    }
 
-        JSONObject elDetails = new JSONObject();
-        elDetails.put(X, xContainer);
-        elDetails.put(Y, yContainer);
-        elDetails.put(WIDTH, widthContainer);
-        elDetails.put(HEIGHT, heightContainer);
-        return elDetails;
+    public void draw(UIElement element) {
+        int x = element.getOrigin().getX().intValue();
+        int y = element.getOrigin().getY().intValue();
+        int width = element.getWidth().intValue();
+        int height = element.getHeight().intValue();
+        responsiveUIValidatorBase.getDrawableScreenshot().drawRectangle(x, y, width, height);
     }
 
 

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

@@ -28,11 +28,12 @@ public abstract class ResponsiveUIValidatorBase {
     private final double zoomFactor;
     private DrawableScreenshot drawableScreenshot;
     private Scalar tolerance;
+    private boolean rootElementDrawn;
 
     protected ResponsiveUIValidatorBase(UISnapshot snapshot) {
         this.snapshot = snapshot;
         this.driver = snapshot.getResponsiveUIValidator().getDriver();
-        this.errors = new Errors();
+        this.errors = new Errors(this);
         this.zoomFactor = snapshot.getZoomFactor();
         Dimension dimension = this.driver.retrievePageSize();
         this.page = UIElement.asElement(new net.itarray.automotion.internal.geometry.Rectangle(0, 0, dimension.getWidth(), dimension.getHeight()), "page");
@@ -41,19 +42,20 @@ protected ResponsiveUIValidatorBase(UISnapshot snapshot) {
     }
 
 
-    private DrawableScreenshot getDrawableScreenshot() {
+    public DrawableScreenshot getDrawableScreenshot() {
         if (drawableScreenshot == null) {
             File screenshotName = snapshot.takeScreenshot();
             Vector extend = driver.getExtend(screenshotName);
             this.drawableScreenshot = new DrawableScreenshot(extend, getTransform(), getDrawingConfiguration(), getNameOfToBeValidated(), screenshotName);
         }
+        if (isWithReport() && !rootElementDrawn) {
+            rootElementDrawn = true;
+            drawRootElement();
+        }
         return drawableScreenshot;
     }
 
     protected void doSnapshot() {
-        if (isWithReport()) {
-            drawRootElement();
-        }
     }
 
     public Errors getErrors() {
@@ -133,23 +135,6 @@ public boolean isPixels() {
     protected abstract String getNameOfToBeValidated();
 
     private void compileValidationReport() {
-        if (isWithReport()) {
-            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);
-
-                    getDrawableScreenshot().drawRectangle(x, y, width, height);
-                }
-            }
-        }
-
         if (isWithReport()) {
             getDrawableScreenshot().saveDrawing();
         }