Merge remote-tracking branch 'origin/master'

Author: Denys Zaiats

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

@@ -58,6 +58,7 @@ private void writeReport(String reportName) throws IOException, ParseException {
 
     private Html buildHtml() throws IOException, ParseException {
         return new Html(null, new Style("background-color: rgb(255,250,250)")) {{
+            super.setPrependDocType(true);
             new Head(this) {{
                 new TitleTag(this) {{
                     new NoTag(this, "Automotion report");

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

@@ -11,6 +11,7 @@
 import net.itarray.automotion.tools.helpers.TextFinder;
 import net.itarray.automotion.validation.properties.Condition;
 import net.itarray.automotion.internal.properties.ElementPropertyExpression;
+import net.itarray.automotion.validation.properties.Expression;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
@@ -452,16 +453,12 @@ public void validateWidth(Condition<Scalar> condition, Context context, Errors e
         validateExtend(RIGHT, condition, context, errors);
     }
 
-    public void validateExtend(Direction direction, Condition condition, Context context, Errors errors) {
+    public void validateExtend(Direction direction, Condition<Scalar> condition, Context context, Errors errors) {
         ElementPropertyExpression<Scalar> property = ElementPropertyExpression.extend(direction, this);
-        Scalar value = property.evaluateIn(context, direction);
-        if (!value.satisfies(condition, context, direction)) {
+        Expression<Boolean> assertion = condition.applyTo(property);
+        if (!assertion.evaluateIn(context, direction)) {
             errors.add(
-                    String.format("Expected %s to be %s. Actual %s is: %s",
-                            property.getDescription(context, direction),
-                            condition.getDescription(context, direction),
-                            property.getName(),
-                            value.toStringWithUnits(PIXELS)));
+                    assertion.getDescription(context, direction));
         }
     }
 

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

@@ -1,5 +1,6 @@
 package net.itarray.automotion.internal.properties;
 
+import com.webfirmframework.wffweb.tag.html.formatting.S;
 import net.itarray.automotion.internal.geometry.Direction;
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.validation.properties.Condition;

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

@@ -0,0 +1,33 @@
+package net.itarray.automotion.internal.properties;
+
+import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.Group;
+import net.itarray.automotion.internal.geometry.Scalar;
+import net.itarray.automotion.validation.properties.Condition;
+import net.itarray.automotion.validation.properties.Expression;
+
+public class ConditionedExpression<T> implements Expression<Boolean> {
+
+    private final Expression<T> toBeConditioned;
+    private final Condition<T> toBeApplied;
+
+    public ConditionedExpression(Expression<T> toBeConditioned, Condition<T> toBeApplied) {
+        this.toBeConditioned = toBeConditioned;
+        this.toBeApplied = toBeApplied;
+    }
+
+    @Override
+    public Boolean evaluateIn(Context context, Direction direction) {
+        return toBeApplied.isSatisfiedOn(toBeConditioned.evaluateIn(context, direction), context, direction);
+    }
+
+    @Override
+    public String getDescription(Context context, Direction direction) {
+        T t = toBeConditioned.evaluateIn(context, direction);
+        return String.format("Expected %s to be %s. Actual %s is: %s",
+                toBeConditioned.getDescription(context, direction),
+                toBeApplied.getDescription(context, direction),
+                toBeConditioned.getRepeatedDescription(context, direction),
+                (t instanceof Group) ? ((Group) t).toStringWithUnits("px") : t);
+    }
+}

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

@@ -0,0 +1,43 @@
+package net.itarray.automotion.internal.properties;
+
+import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.Scalar;
+import net.itarray.automotion.validation.properties.Expression;
+
+public class ConstantExpression<T> implements Expression<T> {
+
+    private final T value;
+
+    public ConstantExpression(T value) {
+        this.value = value;
+    }
+
+    @Override
+    public T evaluateIn(Context context, Direction direction) {
+        return value;
+    }
+
+    @Override
+    public String getDescription(Context context, Direction direction) {
+        return value.toString() + "px";
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (!(object instanceof ConstantExpression)) {
+            return false;
+        }
+        ConstantExpression other = (ConstantExpression) object;
+        return value.equals(other.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+}

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

@@ -33,7 +33,9 @@ public String getDescription(Context context, Direction direction) {
         return property.getDescriptionFor(element);
     }
 
-    public String getName() {
+    @Override
+    public String getRepeatedDescription(Context context, Direction direction) {
         return property.getName();
     }
+
 }

src/main/java/net/itarray/automotion/validation/properties/Condition.java

@@ -4,6 +4,8 @@
 import net.itarray.automotion.internal.geometry.Scalar;
 import net.itarray.automotion.internal.properties.Between;
 import net.itarray.automotion.internal.properties.BinaryScalarConditionWithFixedOperand;
+import net.itarray.automotion.internal.properties.ConditionedExpression;
+import net.itarray.automotion.internal.properties.ConstantExpression;
 import net.itarray.automotion.internal.properties.Context;
 import net.itarray.automotion.internal.properties.PixelConstant;
 
@@ -110,7 +112,13 @@ public Condition<Scalar> and(Expression<Scalar> upperLimit) {
         }
     }
 
-    boolean isSatisfiedOn(T value, Context context, Direction direction);
+    default boolean isSatisfiedOn(T value, Context context, Direction direction) {
+        return applyTo(new ConstantExpression<T>(value)).evaluateIn(context, direction);
+    }
+
+    default Expression<Boolean> applyTo(Expression<T> toBeConditioned) {
+        return new ConditionedExpression<>(toBeConditioned, this);
+    }
 
     String getDescription(Context context, Direction direction);
 }

src/main/java/net/itarray/automotion/validation/properties/Expression.java

@@ -35,4 +35,9 @@ static Expression<Scalar> percent(Scalar percentage, PercentReference reference)
     T evaluateIn(Context context, Direction direction);
 
     String getDescription(Context context, Direction direction);
+
+    default String getRepeatedDescription(Context context, Direction direction) {
+        return getDescription(context, direction);
+    }
+
 }