Made simple relational conditions produce binary expressions.

Author: Torsten-Mumme

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

@@ -31,12 +31,14 @@ public <V extends MetricSpace<V>> T evaluateIn(Context context, ExtendGiving<V>
         return contextBiFunction.apply(left.evaluateIn(context, direction), right.evaluateIn(context, direction), context);
     }
 
-    @Override
-    public <V extends MetricSpace<V>>String getDescription(Context context, ExtendGiving<V> direction) {
-        String toleranceDescription = context.getTolerance().equals(scalar(0)) ? "" : String.format(" with tolerance %s", context.getTolerance());
-        return String.format(
-                descriptionFormat,
+    public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
+        String toleranceDescription = context.getTolerance().equals(scalar(0)) ? "" : String.format(" (With tolerance %s).", context.getTolerance());
+        L t = left.evaluateIn(context, direction);
+        return String.format(descriptionFormat,
                 left.getDescription(context, direction),
-                right.getDescription(context, direction)) + toleranceDescription;
+                right.getDescription(context, direction),
+                left.getRepeatedDescription(context, direction),
+                (t instanceof MetricSpace) ? ((MetricSpace) t).toStringWithUnits("px") : t) + toleranceDescription;
     }
+
 }

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

@@ -25,8 +25,10 @@ public BinaryScalarConditionWithFixedOperand(Expression<Scalar> fixedOperand, Co
     }
 
     @Override
-    public <V extends MetricSpace<V>> boolean isSatisfiedOn(Expression<Scalar> toBeConditioned, Context context, ExtendGiving<V> direction) {
-        return contextPredicate.apply(toBeConditioned.evaluateIn(context, direction), fixedOperand.evaluateIn(context, direction), context);
+    public Expression<Boolean> applyTo(Expression<Scalar> toBeConditioned) {
+        String toStringFormat = this.toStringFormat.replace("%s", "%2$s");
+        return new BinaryExpression<>(toBeConditioned, fixedOperand, contextPredicate,
+                "Expected %1$s to be " + toStringFormat + ". Actual %3$s is: %4$s");
     }
 
     @Override

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

@@ -41,15 +41,15 @@ static <V extends MetricSpace<V>> Expression<Boolean> equalTo(Expression<V> left
                 left,
                 right,
                 (scalar, other, context) -> scalar.minus(other).norm().isLessOrEqualTo(context.getTolerance()),
-                "%s to be equal to %s");
+                "Expected %1$s to be equal to %2$s.");
     }
 
     static <V extends MetricSpace<V>> Expression<V> signedDistance(Expression<V> left, Expression<V> right, ExtendGiving<V> extendGiving) {
         return new BinaryExpression<>(
                 left,
                 right,
                 (scalar, other, context) -> extendGiving.signedDistance(scalar, other),
-                "%s to be equal to %s");
+                "Expected %1$s to be equal to %2$s.");
     }
 
     <V extends MetricSpace<V>> T evaluateIn(Context context, ExtendGiving<V> direction);

src/test/java/net/itarray/automotion/tests/properties/BinaryExpressionTest.java

@@ -20,7 +20,7 @@ public void setUp() {
                 new PixelConstant(scalar(17)),
                 new PixelConstant(scalar(16)),
                 Scalar::isLessOrEqualTo,
-                "%s to be less or equal to %s");
+                "Expected %1$s to be less or equal to %2$s.");
     }
 
     @Test
@@ -32,6 +32,6 @@ public void evaluatesToTheValueOfTheOperationAppliedToTheEvaluatedLeftAndRightEx
     @Test
     public void shouldName() {
         String description = expression.getDescription(new TestContext(), Direction.RIGHT);
-        assertThat(description).isEqualTo("17px to be less or equal to 16px");
+        assertThat(description).isEqualTo("Expected 17px to be less or equal to 16px.");
     }
 }

src/test/java/net/itarray/automotion/tests/properties/EqualToTest.java

@@ -38,12 +38,12 @@ public void evaluatesToTheValueOfTheOperationAppliedToTheEvaluatedLeftAndRightEx
     @Test
     public void describesItself() {
         String description = expression.getDescription(new TestContext(), Direction.RIGHT);
-        assertThat(description).isEqualTo("17px to be equal to 16px");
+        assertThat(description).isEqualTo("Expected 17px to be equal to 16px.");
     }
 
     @Test
     public void describesItselfWithTolerance() {
         String description = expression.getDescription(new TestContext().withTolerance(scalar(1)), Direction.RIGHT);
-        assertThat(description).isEqualTo("17px to be equal to 16px with tolerance 1");
+        assertThat(description).isEqualTo("Expected 17px to be equal to 16px. (With tolerance 1).");
     }
 }