tolerance for doNotOverlap

Author: Torsten-Mumme

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

@@ -278,7 +278,7 @@ private void validateElementsAreNotOverlapped(List<UIElement> elements) {
             UIElement first = elements.get(firstIndex);
             for (int secondIndex = firstIndex+1; secondIndex < elements.size(); secondIndex++) {
                 UIElement second = elements.get(secondIndex);
-                if (first.overlaps(second)) {
+                if (first.overlaps(second, getContext())) {
                     errors.add("Elements are overlapped");
                     errors.draw(first);
                     break;

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

@@ -148,8 +148,27 @@ public boolean hasSameSizeAs(UIElement other, Context context) {
         return hasEqualExtendAs(other, Rectangle.ORIGIN_CORNER, context);
     }
 
-    public boolean overlaps(UIElement other) {
-        return rectangle.intersects(other.rectangle);
+    public Scalar getLeft() {
+        return getOrigin().getX();
+    }
+
+    public Scalar getRight() {
+        return getCorner().getX();
+    }
+
+    public Scalar getTop() {
+        return getOrigin().getY();
+    }
+
+    public Scalar getBottom() {
+        return getCorner().getY();
+    }
+
+    public boolean overlaps(UIElement other, Context context) {
+        return Condition.lessThan(other.getRight()).isSatisfiedOn(getLeft(), context, RIGHT)  &&
+                Condition.lessThan(getRight()).isSatisfiedOn(other.getLeft(), context, RIGHT) &&
+                Condition.lessThan(other.getBottom()).isSatisfiedOn(getTop(), context, DOWN) &&
+                Condition.lessThan(getBottom()).isSatisfiedOn(other.getTop(), context, DOWN);
     }
 
     public Scalar getOffset(Direction direction, UIElement page) {
@@ -305,17 +324,17 @@ public void validateSuccessor(Direction direction, UIElement toBeValidatedSucces
         }
     }
 
-    public void validateOverlappingWithElement(UIElement element, Errors errors) {
-        if (!overlaps(element)) {
+    public void validateOverlappingWithElement(UIElement element, Context context, Errors errors) {
+        if (!overlaps(element, context)) {
             errors.add(String.format("Element %s is not overlapped with element %s but should be",
                                 getQuotedName(),
                                 element.getQuotedName()));
             errors.draw(element);
         }
     }
 
-    public void validateNotOverlappingWithElement(UIElement element, Errors errors) {
-        if (overlaps(element)) {
+    public void validateNotOverlappingWithElement(UIElement element, Context context, Errors errors) {
+        if (overlaps(element, context)) {
             errors.add(String.format("Element %s is overlapped with element %s but should not",
                                 getQuotedName(),
                                 element.getQuotedName()));

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

@@ -154,7 +154,7 @@ public UIValidatorBase isAbove(WebElement element, Condition<Scalar> distanceCon
      */
     @Override
     public UIValidatorBase isNotOverlapping(WebElement element, String readableName) {
-        rootElement.validateNotOverlappingWithElement(asElement(element, readableName), errors);
+        rootElement.validateNotOverlappingWithElement(asElement(element, readableName), getContext(), errors);
         return this;
     }
 
@@ -167,7 +167,7 @@ public UIValidatorBase isNotOverlapping(WebElement element, String readableName)
      */
     @Override
     public UIValidatorBase isOverlapping(WebElement element, String readableName) {
-        rootElement.validateOverlappingWithElement(asElement(element, readableName), errors);
+        rootElement.validateOverlappingWithElement(asElement(element, readableName), getContext(), errors);
         return this;
     }
 
@@ -180,7 +180,7 @@ public UIValidatorBase isOverlapping(WebElement element, String readableName) {
     @Override
     public UIValidatorBase isNotOverlapping(List<WebElement> elements) {
         for (WebElement element : elements) {
-            rootElement.validateNotOverlappingWithElement(asElement(element), errors);
+            rootElement.validateNotOverlappingWithElement(asElement(element), getContext(), errors);
         }
         return this;
     }

src/main/java/net/itarray/automotion/validation/ChunkUIElementValidator.java

@@ -105,7 +105,7 @@ public interface ChunkUIElementValidator {
     })
     ChunkUIElementValidator alignedAsGrid(int horizontalGridSize, int verticalGridSize);
 
-    ChunkUIElementValidator doNotOverlap(); // tolerance
+    ChunkUIElementValidator doNotOverlap();
 
     ChunkUIElementValidator areInsideOf(WebElement containerElement, String readableContainerName);