Implement condition assert on values (#57, #24)

Author: VanRoy

src/main/java/org/assertj/db/api/AbstractAssertWithValues.java

@@ -12,6 +12,7 @@
  */
 package org.assertj.db.api;
 
+import org.assertj.core.api.Condition;
 import org.assertj.db.api.assertions.*;
 import org.assertj.db.api.assertions.impl.*;
 import org.assertj.db.navigation.element.ValueElement;
@@ -29,18 +30,20 @@
  * @param <O> The type of the assertion class of {@link org.assertj.db.navigation.origin.Origin}.
  * @author Régis Pouiller
  * @author Otoniel Isidoro
+ * @author Julien Roy
  */
-public abstract class AbstractAssertWithValues <E extends AbstractAssertWithValues<E, O>, O extends OriginWithColumnsAndRowsFromChange<ChangesAssert, ChangeAssert, ChangeColumnAssert, ChangeRowAssert>>
-        extends AbstractAssertWithOriginWithColumnsAndRowsFromChange<E, O>
-        implements ValueElement,
-                   AssertOnValueClass<E>,
-                   AssertOnValueType<E>,
-                   AssertOnValueNullity<E>,
-                   AssertOnValueEquality<E>,
-                   AssertOnValueInequality<E>,
-                   AssertOnValueComparison<E>,
-                   AssertOnValueChronology<E>,
-                   AssertOnValueCloseness<E> {
+public abstract class AbstractAssertWithValues<E extends AbstractAssertWithValues<E, O>, O extends OriginWithColumnsAndRowsFromChange<ChangesAssert, ChangeAssert, ChangeColumnAssert, ChangeRowAssert>>
+    extends AbstractAssertWithOriginWithColumnsAndRowsFromChange<E, O>
+    implements ValueElement,
+    AssertOnValueClass<E>,
+    AssertOnValueType<E>,
+    AssertOnValueNullity<E>,
+    AssertOnValueEquality<E>,
+    AssertOnValueInequality<E>,
+    AssertOnValueComparison<E>,
+    AssertOnValueChronology<E>,
+    AssertOnValueCloseness<E>,
+    AssertOnValueCondition<E> {
 
   /**
    * The actual value on which the assertion is.
@@ -448,4 +451,34 @@ public E isCloseTo(DateTimeValue expected, TimeValue tolerance) {
   public E isCloseTo(DateTimeValue expected, DateTimeValue tolerance) {
     return AssertionsOnValueCloseness.isCloseTo(myself, info, value, expected, tolerance);
   }
+
+  /** {@inheritDoc} */
+  @Override
+  public E is(Condition<?> condition) {
+    return AssertionsOnValueCondition.is(myself, info, value, condition);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public E isNot(Condition<?> condition) {
+    return AssertionsOnValueCondition.isNot(myself, info, value, condition);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public E has(Condition<?> condition) {
+    return AssertionsOnValueCondition.is(myself, info, value, condition);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public E doesNotHave(Condition<?> condition) {
+    return AssertionsOnValueCondition.isNot(myself, info, value, condition);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public E satisfies(Condition<?> condition) {
+    return AssertionsOnValueCondition.is(myself, info, value, condition);
+  }
 }

src/main/java/org/assertj/db/api/AbstractValueAssert.java

@@ -12,6 +12,7 @@
  */
 package org.assertj.db.api;
 
+import org.assertj.core.api.Condition;
 import org.assertj.db.api.assertions.*;
 import org.assertj.db.api.assertions.impl.*;
 import org.assertj.db.navigation.ToValue;
@@ -25,6 +26,7 @@
  *
  * @author Régis Pouiller
  * @author Otoniel Isidoro
+ * @author Julien Roy
  *
  * @param <D> The class of the actual value (an sub-class of {@link AbstractDbData}).
  * @param <A> The class of the original assertion (an sub-class of {@link AbstractDbAssert}).
@@ -37,17 +39,18 @@
  * @param <RV> The class of the equivalent row assertion on the value (an sub-class of {@link AbstractRowValueAssert}).
  */
 public abstract class AbstractValueAssert<D extends AbstractDbData<D>, A extends AbstractDbAssert<D, A, C, CV, R, RV>, S extends AbstractSubAssert<D, A, S, V, C, CV, R, RV>, V extends AbstractValueAssert<D, A, S, V, C, CV, R, RV>, C extends AbstractColumnAssert<D, A, C, CV, R, RV>, CV extends AbstractColumnValueAssert<D, A, C, CV, R, RV>, R extends AbstractRowAssert<D, A, C, CV, R, RV>, RV extends AbstractRowValueAssert<D, A, C, CV, R, RV>>
-        extends AbstractAssertWithOriginWithColumnsAndRows<V, S, D, A, C, CV, R, RV>
-        implements ValueElement,
-                   ToValue<V>,
-                   AssertOnValueClass<V>,
-                   AssertOnValueType<V>,
-                   AssertOnValueNullity<V>,
-                   AssertOnValueEquality<V>,
-                   AssertOnValueInequality<V>,
-                   AssertOnValueChronology<V>,
-                   AssertOnValueComparison<V>,
-                   AssertOnValueCloseness<V> {
+    extends AbstractAssertWithOriginWithColumnsAndRows<V, S, D, A, C, CV, R, RV>
+    implements ValueElement,
+    ToValue<V>,
+    AssertOnValueClass<V>,
+    AssertOnValueType<V>,
+    AssertOnValueNullity<V>,
+    AssertOnValueEquality<V>,
+    AssertOnValueInequality<V>,
+    AssertOnValueChronology<V>,
+    AssertOnValueComparison<V>,
+    AssertOnValueCloseness<V>,
+    AssertOnValueCondition<V> {
 
   /**
    * The actual value on which this assertion is.
@@ -466,4 +469,34 @@ public V isCloseTo(DateTimeValue expected, TimeValue tolerance) {
   public V isCloseTo(DateTimeValue expected, DateTimeValue tolerance) {
     return AssertionsOnValueCloseness.isCloseTo(myself, info, value, expected, tolerance);
   }
+
+  /** {@inheritDoc} */
+  @Override
+  public V is(Condition<?> condition) {
+    return AssertionsOnValueCondition.is(myself, info, value, condition);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public V isNot(Condition<?> condition) {
+    return AssertionsOnValueCondition.isNot(myself, info, value, condition);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public V has(Condition<?> condition) {
+    return AssertionsOnValueCondition.is(myself, info, value, condition);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public V doesNotHave(Condition<?> condition) {
+    return AssertionsOnValueCondition.isNot(myself, info, value, condition);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public V satisfies(Condition<?> condition) {
+    return AssertionsOnValueCondition.is(myself, info, value, condition);
+  }
 }

src/main/java/org/assertj/db/api/assertions/AssertOnValueCondition.java

@@ -0,0 +1,87 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * Copyright 2012-2016 the original author or authors.
+ */
+package org.assertj.db.api.assertions;
+
+import org.assertj.core.api.Condition;
+
+/**
+ * Defines the assertion methods on the matching with condition.
+ *
+ * @param <T> The "self" type of this assertion class. Please read &quot;<a href="http://bit.ly/1IZIRcY"
+ *            target="_blank">Emulating 'self types' using Java Generics to simplify fluent API implementation</a>&quot;
+ *            for more details.
+ * @author Julien Roy
+ */
+public interface AssertOnValueCondition<T extends AssertOnValueCondition<T>> {
+
+  /**
+   * Verifies that the actual value satisfies the given condition.
+   *
+   * @param condition the given condition.
+   * @return {@code this} assertion object.
+   * @throws NullPointerException if the given condition is {@code null}.
+   * @throws AssertionError if the actual value does not satisfy the given condition.
+   * @see org.assertj.db.api.AbstractValueAssert#is(Condition)
+   * @see org.assertj.db.api.AbstractAssertWithValues#is(Condition)
+   */
+  T is(Condition<?> condition);
+
+  /**
+   * Verifies that the actual value does not satisfy the given condition.
+   *
+   * @param condition the given condition.
+   * @return {@code this} assertion object.
+   * @throws NullPointerException if the given condition is {@code null}.
+   * @throws AssertionError if the actual value satisfies the given condition.
+   * @see org.assertj.db.api.AbstractValueAssert#isNot(Condition)
+   * @see org.assertj.db.api.AbstractAssertWithValues#isNot(Condition)
+   */
+  T isNot(Condition<?> condition);
+
+  /**
+   * Verifies that the actual value satisfies the given condition. This method is an alias for <code>{@link #is(Condition)}</code>.
+   *
+   * @param condition the given condition.
+   * @return {@code this} assertion object.
+   * @throws NullPointerException if the given condition is {@code null}.
+   * @throws AssertionError if the actual value does not satisfy the given condition.
+   * @see org.assertj.db.api.AbstractValueAssert#has(Condition)
+   * @see org.assertj.db.api.AbstractAssertWithValues#has(Condition)
+   */
+  T has(Condition<?> condition);
+
+  /**
+   * Verifies that the actual value does not satisfy the given condition. This method is an alias for <code>{@link #isNot(Condition)}</code>.
+   *
+   * @param condition the given condition.
+   * @return {@code this} assertion object.
+   * @throws NullPointerException if the given condition is {@code null}.
+   * @throws AssertionError if the actual value satisfies the given condition.
+   * @see org.assertj.db.api.AbstractValueAssert#doesNotHave(Condition)
+   * @see org.assertj.db.api.AbstractAssertWithValues#doesNotHave(Condition)
+   */
+  T doesNotHave(Condition<?> condition);
+
+  /**
+   * Verifies that the actual value satisfies the given condition. This method is an alias for <code>{@link #is(Condition)}</code>.
+   *
+   * @param condition the given condition.
+   * @return {@code this} assertion object.
+   * @throws NullPointerException if the given condition is {@code null}.
+   * @throws AssertionError if the actual value does not satisfy the given condition.
+   * @see org.assertj.db.api.AbstractValueAssert#satisfies(Condition)
+   * @see org.assertj.db.api.AbstractAssertWithValues#satisfies(Condition)
+   */
+  T satisfies(Condition<?> condition);
+
+}

src/main/java/org/assertj/db/api/assertions/impl/AssertionsOnValueCondition.java

@@ -0,0 +1,72 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * Copyright 2012-2016 the original author or authors.
+ */
+package org.assertj.db.api.assertions.impl;
+
+import org.assertj.core.api.Condition;
+import org.assertj.core.api.WritableAssertionInfo;
+import org.assertj.core.internal.Conditions;
+import org.assertj.db.api.AbstractAssert;
+import org.assertj.db.type.Value;
+
+/**
+ * Implements the assertion methods on the matching with condition.
+ *
+ * @author Julien Roy
+ */
+public class AssertionsOnValueCondition {
+
+  /**
+   * Assertions for {@code Object}s provided by assertj-core.
+   */
+  private static final Conditions conditions = Conditions.instance();
+
+  /**
+   * Private constructor.
+   */
+  private AssertionsOnValueCondition() {
+    // Empty
+  }
+
+  /**
+   * Verifies that the value match with condition.
+   *
+   * @param <A>       The type of the assertion which call this method.
+   * @param assertion The assertion which call this method.
+   * @param info      Writable information about an assertion.
+   * @param value     The value.
+   * @param condition The condition to use for validation.
+   * @return {@code this} assertion object.
+   * @throws AssertionError If the value is not equal to the number in parameter.
+   */
+  public static <A extends AbstractAssert<?>> A is(A assertion, WritableAssertionInfo info, Value value, Condition<?> condition) {
+    conditions.assertIs(info, value.getValue(), (Condition<? super Object>) condition);
+    return assertion;
+  }
+
+  /**
+   * Verifies that the value not match with condition.
+   *
+   * @param <A>       The type of the assertion which call this method.
+   * @param assertion The assertion which call this method.
+   * @param info      Writable information about an assertion.
+   * @param value     The value.
+   * @param condition The condition to use for validation.
+   * @return {@code this} assertion object.
+   * @throws AssertionError If the value is not equal to the number in parameter.
+   */
+  public static <A extends AbstractAssert<?>> A isNot(A assertion, WritableAssertionInfo info, Value value, Condition<?> condition) {
+    conditions.assertIsNot(info, value.getValue(), (Condition<? super Object>) condition);
+    return assertion;
+  }
+
+}