OrExpression (without description) to make every assertion expression based

Author: Torsten-Mumme

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

@@ -0,0 +1,25 @@
+package net.itarray.automotion.internal.properties;
+
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
+import net.itarray.automotion.validation.properties.Expression;
+
+public class OrExpression implements Expression<Boolean> {
+    private final Expression<Boolean> left;
+    private final Expression<Boolean> right;
+
+    public OrExpression(Expression<Boolean> left, Expression<Boolean> right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    @Override
+    public <V extends MetricSpace<V>> Boolean evaluateIn(Context context, ExtendGiving<V> direction) {
+        return left.evaluateIn(context, direction) || right.evaluateIn(context, direction);
+    }
+
+    @Override
+    public <V extends MetricSpace<V>> String getDescription(Context context, ExtendGiving<V> direction) {
+        return null;
+    }
+}

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

@@ -8,6 +8,7 @@
 import net.itarray.automotion.internal.properties.BinaryExpression;
 import net.itarray.automotion.internal.properties.ConstantExpression;
 import net.itarray.automotion.internal.properties.Context;
+import net.itarray.automotion.internal.properties.OrExpression;
 import net.itarray.automotion.internal.properties.PagePercentage;
 import net.itarray.automotion.internal.properties.PagePercentageOrPixels;
 import net.itarray.automotion.internal.properties.PercentReference;
@@ -65,4 +66,8 @@ default <V extends MetricSpace<V>> String getRepeatedDescription(Context context
     static Expression<Boolean> and(Expression<Boolean> left, Expression<Boolean> right) {
         return new AndExpression(left, right);
     }
+
+    static Expression<Boolean> or(Expression<Boolean> left, Expression<Boolean> right) {
+        return new OrExpression(left, right);
+    }
 }

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

@@ -0,0 +1,28 @@
+package net.itarray.automotion.tests.properties;
+
+import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.properties.ConstantExpression;
+import net.itarray.automotion.validation.properties.Expression;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FalseOrFalseExpressionTest {
+
+    private Expression<Boolean> leftOrRight;
+
+    @Before
+    public void setUp() {
+        Expression<Boolean> left = new ConstantExpression<>(false);
+        Expression<Boolean> right = new ConstantExpression<Boolean>(false);
+        leftOrRight = Expression.or(left, right);
+    }
+
+    @Test
+    public void evaluatesToFalse() {
+        TestContext testContext = new TestContext();
+        Boolean result = leftOrRight.evaluateIn(testContext, Direction.RIGHT);
+        assertThat(result).isFalse();
+    }
+}

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

@@ -0,0 +1,28 @@
+package net.itarray.automotion.tests.properties;
+
+import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.properties.ConstantExpression;
+import net.itarray.automotion.validation.properties.Expression;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FalseOrTrueExpressionTest {
+
+    private Expression<Boolean> leftOrRight;
+
+    @Before
+    public void setUp() {
+        Expression<Boolean> left = new ConstantExpression<>(false);
+        Expression<Boolean> right = new ConstantExpression<Boolean>(true);
+        leftOrRight = Expression.or(left, right);
+    }
+
+    @Test
+    public void evaluatesToTrue() {
+        TestContext testContext = new TestContext();
+        Boolean result = leftOrRight.evaluateIn(testContext, Direction.RIGHT);
+        assertThat(result).isTrue();
+    }
+}

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

@@ -0,0 +1,44 @@
+package net.itarray.automotion.tests.properties;
+
+import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
+import net.itarray.automotion.internal.properties.ConstantExpression;
+import net.itarray.automotion.internal.properties.Context;
+import net.itarray.automotion.validation.properties.Expression;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TrueOrFalseExpressionTest {
+
+    private Expression<Boolean> leftOrRight;
+    private Boolean rightEvaluated;
+
+    @Before
+    public void setUp() {
+        rightEvaluated = false;
+        Expression<Boolean> left = new ConstantExpression<>(true);
+        Expression<Boolean> right = new ConstantExpression<Boolean>(false) {
+            @Override
+            public <V extends MetricSpace<V>> Boolean evaluateIn(Context context, ExtendGiving<V> direction) {
+                rightEvaluated = true;
+                return super.evaluateIn(context, direction);
+            }
+        };
+        leftOrRight = Expression.or(left, right);
+    }
+
+    @Test
+    public void evaluatesToTrue() {
+        TestContext testContext = new TestContext();
+        Boolean result = leftOrRight.evaluateIn(testContext, Direction.RIGHT);
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    public void doesNotEvaluateTheRightExpression() {
+        assertThat(rightEvaluated).isFalse();
+    }
+}

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

@@ -0,0 +1,44 @@
+package net.itarray.automotion.tests.properties;
+
+import net.itarray.automotion.internal.geometry.Direction;
+import net.itarray.automotion.internal.geometry.ExtendGiving;
+import net.itarray.automotion.internal.geometry.MetricSpace;
+import net.itarray.automotion.internal.properties.ConstantExpression;
+import net.itarray.automotion.internal.properties.Context;
+import net.itarray.automotion.validation.properties.Expression;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TrueOrTrueExpressionTest {
+
+    private Expression<Boolean> leftOrRight;
+    private Boolean rightEvaluated;
+
+    @Before
+    public void setUp() {
+        rightEvaluated = false;
+        Expression<Boolean> left = new ConstantExpression<>(true);
+        Expression<Boolean> right = new ConstantExpression<Boolean>(true) {
+            @Override
+            public <V extends MetricSpace<V>> Boolean evaluateIn(Context context, ExtendGiving<V> direction) {
+                rightEvaluated = true;
+                return super.evaluateIn(context, direction);
+            }
+        };
+        leftOrRight = Expression.or(left, right);
+    }
+
+    @Test
+    public void evaluatesToTrue() {
+        TestContext testContext = new TestContext();
+        Boolean result = leftOrRight.evaluateIn(testContext, Direction.RIGHT);
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    public void doesNotEvaluateTheRightExpression() {
+        assertThat(rightEvaluated).isFalse();
+    }
+}