got rid of intValue on validateInsideOf

Author: Torsten-Mumme

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

@@ -511,10 +511,13 @@ public void validateInsideOfContainer(UIElement containerElement, Errors errors)
         }
     }
 
-    public void validateInsideOfContainer(UIElement element, int top, int right, int bottom, int left, Errors errors) {
+    public void validateInsideOfContainer(UIElement element, Errors errors, Scalar top, Scalar left, Scalar right, Scalar bottom) {
+        Vector originPadding = new Vector(left, top);
+        Vector cornerPadding = new Vector(right, bottom);
+
         Rectangle paddedRoot = new Rectangle(
-                getOrigin().minus(new Vector(left, top)),
-                getCorner().plus(new Vector(right, bottom)));
+                getOrigin().minus(originPadding),
+                getCorner().plus(cornerPadding));
 
         Vector originOffset = getOrigin().minus(element.getOrigin());
         Vector cornerOffset = getCorner().minus(element.getCorner());
@@ -523,10 +526,10 @@ public void validateInsideOfContainer(UIElement element, int top, int right, int
             errors.add(
                     String.format("Padding of element %s is incorrect. Expected padding: top[%s], right[%s], bottom[%s], left[%s]. Actual padding: top[%s], right[%s], bottom[%s], left[%s]",
                             getQuotedName(),
-                            top,
-                            right,
-                            bottom,
-                            left,
+                            originPadding.getY(),
+                            cornerPadding.getX(),
+                            cornerPadding.getY(),
+                            originPadding.getX(),
                             originOffset.getY(),
                             cornerOffset.getX(),
                             cornerOffset.getY(),

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

@@ -569,12 +569,12 @@ public UIValidatorBase isInsideOf(WebElement containerElement, String readableCo
 
     @Override
     public UIValidatorBase isInsideOf(WebElement containerElement, String readableContainerName, Padding padding) {
-        int top = percentOrPixels(padding.getTop()).evaluateIn(getContext(), Direction.UP).intValue();
-        int right = percentOrPixels(padding.getRight()).evaluateIn(getContext(), Direction.RIGHT).intValue();
-        int bottom = percentOrPixels(padding.getBottom()).evaluateIn(getContext(), Direction.DOWN).intValue();
-        int left = percentOrPixels(padding.getLeft()).evaluateIn(getContext(), Direction.LEFT).intValue();
+        Scalar top = percentOrPixels(padding.getTop()).evaluateIn(getContext(), Direction.UP);
+        Scalar left = percentOrPixels(padding.getLeft()).evaluateIn(getContext(), Direction.LEFT);
+        Scalar right = percentOrPixels(padding.getRight()).evaluateIn(getContext(), Direction.RIGHT);
+        Scalar bottom = percentOrPixels(padding.getBottom()).evaluateIn(getContext(), Direction.DOWN);
 
-        rootElement.validateInsideOfContainer(asElement(containerElement, readableContainerName), top, right, bottom, left, errors);
+        rootElement.validateInsideOfContainer(asElement(containerElement, readableContainerName), errors, top, left, right, bottom);
         return this;
     }