tolerance for contains validations

Author: Torsten-Mumme

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

@@ -475,7 +475,7 @@ private void validateCenteredOnPageHorizontally(List<UIElement> elements) {
 
     private void validateInsideOfContainer(UIElement containerElement, List<UIElement> elements) {
         for (UIElement element : elements) {
-            element.validateInsideOfContainer(containerElement, errors);
+            element.validateInsideOfContainer(containerElement, getContext(), errors);
         }
     }
 

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

@@ -146,7 +146,7 @@ public boolean hasSameHeightAs(UIElement other, Context context) {
     }
 
     public boolean hasSameSizeAs(UIElement other, Context context) {
-        return hasEqualExtendAs(other, Rectangle.ORIGIN_CORNER, context);
+        return hasEqualExtendAs(other, ORIGIN_CORNER, context);
     }
 
     public Scalar getLeft() {
@@ -221,8 +221,12 @@ private static String getShortenedText(String text) {
         return text.substring(0, maxLength-postfix.length()) + postfix;
     }
 
-    public boolean contains(UIElement other) {
-        return rectangle.contains(other.rectangle);
+    public boolean contains(UIElement other, Context context) {
+        return
+                Condition.lessOrEqualTo(other.getLeft()).isSatisfiedOn(getLeft(), context, RIGHT) &&
+                Condition.lessOrEqualTo(getRight()).isSatisfiedOn(other.getRight(), context, RIGHT) &&
+                Condition.lessOrEqualTo(other.getTop()).isSatisfiedOn(getTop(), context, DOWN) &&
+                Condition.lessOrEqualTo(getBottom()).isSatisfiedOn(other.getBottom(), context, DOWN);
     }
 
     public void validateLeftAlignedWith(UIElement element, Context context, Errors errors) {
@@ -454,16 +458,16 @@ public void validateHasCssValue(String cssProperty, String[] args, Errors errors
         }
     }
 
-    public void validateInsideOfContainer(UIElement containerElement, Errors errors) {
-        if (!containerElement.contains(this)) {
+    public void validateInsideOfContainer(UIElement containerElement, Context context, Errors errors) {
+        if (!containerElement.contains(this, context)) {
             errors.add(String.format("Element '%s' is not inside of '%s'",
                                 getName(),
                                 containerElement.getName()));
             errors.draw(containerElement);
         }
     }
 
-    public void validateInsideOfContainer(UIElement element, Errors errors, Scalar top, Scalar left, Scalar right, Scalar bottom) {
+    public void validateInsideOfContainer(UIElement element, Errors errors, Context context, Scalar top, Scalar left, Scalar right, Scalar bottom) {
         Vector originPadding = new Vector(left, top);
         Vector cornerPadding = new Vector(right, bottom);
 
@@ -475,7 +479,7 @@ public void validateInsideOfContainer(UIElement element, Errors errors, Scalar t
         Vector originOffset = getOrigin().minus(element.getOrigin());
         Vector cornerOffset = getCorner().minus(element.getCorner());
 
-        if (!element.contains(paddedRoot)) {
+        if (!element.contains(paddedRoot, context)) {
             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(),
                                 originPadding.getY(),

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

@@ -555,7 +555,7 @@ public UIValidatorBase isCenteredOnPageVertically() {
      */
     @Override
     public UIValidatorBase isInsideOf(WebElement containerElement, String readableContainerName) {
-        rootElement.validateInsideOfContainer(asElement(containerElement, readableContainerName), errors);
+        rootElement.validateInsideOfContainer(asElement(containerElement, readableContainerName), getContext(), errors);
         return this;
     }
 
@@ -566,7 +566,7 @@ public UIValidatorBase isInsideOf(WebElement containerElement, String readableCo
         Scalar right = percentOrPixels(padding.getRight()).evaluateIn(getContext(), Direction.RIGHT);
         Scalar bottom = percentOrPixels(padding.getBottom()).evaluateIn(getContext(), Direction.DOWN);
 
-        rootElement.validateInsideOfContainer(asElement(containerElement, readableContainerName), errors, top, left, right, bottom);
+        rootElement.validateInsideOfContainer(asElement(containerElement, readableContainerName), errors, getContext(), top, left, right, bottom);
         return this;
     }