tolerance for ends

Author: Torsten-Mumme

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

@@ -86,11 +86,11 @@ private static String defaultName(WebElement webElement) {
                 String.valueOf(size.getHeight()));
     }
 
-    public Scalar getBegin(Direction direction) {
+    public <V extends MetricSpace<V>> V  getBegin(ExtendGiving<V>  direction) {
         return direction.begin(rectangle);
     }
 
-    public Scalar getEnd(Direction direction) {
+    public <V extends MetricSpace<V>> V  getEnd(ExtendGiving<V>  direction) {
         return direction.end(rectangle);
     }
 
@@ -126,10 +126,6 @@ public Vector getCorner() {
         return rectangle.getCorner();
     }
 
-    private boolean hasEqualEnd(UIElement other, Direction direction) {
-        return getEnd(direction).equals(other.getEnd(direction));
-    }
-
     private <V extends MetricSpace<V>> boolean hasEqualExtendAs(UIElement other, ExtendGiving<V> direction, Context context) {
         Expression<Boolean> equal = Expression.equalTo(
                 ElementPropertyExpression.extend(direction, this),
@@ -244,7 +240,11 @@ public void validateBottomAlignedWith(UIElement element, Context context, Errors
     }
 
     private void validateEqualEnd(Direction direction, UIElement element, Context context, Errors errors) {
-        if (!hasEqualEnd(element, direction)) {
+        boolean valid = Expression.equalTo(
+                ElementPropertyExpression.end(direction, this),
+                ElementPropertyExpression.end(direction, element)
+        ).evaluateIn(context, direction);
+        if (!valid) {
             errors.add(String.format("Element %s has not the same %s offset as element %s",
                                 getQuotedName(),
                                 direction.endName(),

src/main/java/net/itarray/automotion/internal/geometry/ExtendGiving.java

@@ -1,7 +1,10 @@
 package net.itarray.automotion.internal.geometry;
 
 public interface ExtendGiving<V extends MetricSpace<V>> {
+    String beginName();
+    String endName();
     String extendName();
+
     V begin(Rectangle rectangle);
     V end(Rectangle rectangle);
     default V extend(Rectangle rectangle) {

src/main/java/net/itarray/automotion/internal/geometry/Rectangle.java

@@ -14,6 +14,16 @@ public String extendName() {
             return "size";
         }
 
+        @Override
+        public String beginName() {
+            return "top left";
+        }
+
+        @Override
+        public String endName() {
+            return "bottom right";
+        }
+
         @Override
         public Vector begin(Rectangle rectangle) {
             return rectangle.getOrigin();

src/main/java/net/itarray/automotion/internal/properties/ElementPropertyExpression.java

@@ -23,6 +23,11 @@ public static <V extends MetricSpace<V>> ElementPropertyExpression<V> extend(Ext
                     " of element %s", direction.extendName());
     }
 
+    public static <V extends MetricSpace<V>> ElementPropertyExpression<V> end(ExtendGiving<V> direction, UIElement element) {
+        return new ElementPropertyExpression<>(element, e -> e.getEnd(direction), direction.endName() +
+                    " of element %s", direction.extendName());
+    }
+
     @Override
     public <V extends MetricSpace<V>> T evaluateIn(Context context, ExtendGiving<V> direction) {
         return property.evaluateOn(element);