Add 'IsEqualTo' of JSR-310 value

Author: sciencesakura

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

@@ -19,6 +19,9 @@
 import org.assertj.db.navigation.origin.OriginWithColumnsAndRowsFromChange;
 import org.assertj.db.type.*;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.UUID;
 
 /**
@@ -212,6 +215,24 @@ public E isEqualTo(DateTimeValue expected) {
     return AssertionsOnValueEquality.isEqualTo(myself, info, value, expected);
   }
 
+  /** {@inheritDoc} */
+  @Override
+  public E isEqualTo(LocalDate expected) {
+    return isEqualTo(DateValue.from(expected));
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public E isEqualTo(LocalTime expected) {
+    return isEqualTo(TimeValue.from(expected));
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public E isEqualTo(LocalDateTime expected) {
+    return isEqualTo(DateTimeValue.from(expected));
+  }
+
   /** {@inheritDoc} */
   @Override
   public E isNotEqualTo(Object expected) {

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

@@ -19,6 +19,9 @@
 import org.assertj.db.navigation.element.ValueElement;
 import org.assertj.db.type.*;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.UUID;
 
 /**
@@ -230,6 +233,24 @@ public V isEqualTo(DateTimeValue expected) {
     return AssertionsOnValueEquality.isEqualTo(myself, info, value, expected);
   }
 
+  /** {@inheritDoc} */
+  @Override
+  public V isEqualTo(LocalDate expected) {
+    return isEqualTo(DateValue.from(expected));
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public V isEqualTo(LocalTime expected) {
+    return isEqualTo(TimeValue.from(expected));
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public V isEqualTo(LocalDateTime expected) {
+    return isEqualTo(DateTimeValue.from(expected));
+  }
+
   /** {@inheritDoc} */
   @Override
   public V isNotEqualTo(Object expected) {

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

@@ -16,6 +16,9 @@
 import org.assertj.db.type.DateValue;
 import org.assertj.db.type.TimeValue;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.UUID;
 
 /**
@@ -401,6 +404,99 @@ public interface AssertOnValueEquality<T extends AssertOnValueEquality<T>> {
    */
   T isEqualTo(DateTimeValue expected);
 
+  /**
+   * Verifies that the value is equal to a date value.
+   * <p>
+   * Example where the assertion verifies that the value in the first {@code Column} of the first {@code Row} of the
+   * {@code Table} is equal to a date value :
+   * </p>
+   *
+   * <pre>
+   * <code class='java'>
+   * assertThat(table).row().value().isEqualTo(LocalDate.of(2014, 7, 7));
+   * </code>
+   * </pre>
+   * <p>
+   * Example where the assertion verifies that the value in the first {@code Column} of the {@code Row} at end point
+   * of the first {@code Change} is equal to a date value :
+   * </p>
+   *
+   * <pre>
+   * <code class='java'>
+   * assertThat(changes).change().rowAtEndPoint().value().isEqualTo(LocalDate.of(2014, 7, 7));
+   * </code>
+   * </pre>
+   *
+   * @param expected The expected date value.
+   * @return {@code this} assertion object.
+   * @throws AssertionError If the value is not equal to the date value in parameter.
+   * @see org.assertj.db.api.AbstractValueAssert#isEqualTo(LocalDate)
+   * @see org.assertj.db.api.AbstractAssertWithValues#isEqualTo(LocalDate)
+   */
+  T isEqualTo(LocalDate expected);
+
+  /**
+   * Verifies that the value is equal to a time value.
+   * <p>
+   * Example where the assertion verifies that the value in the first {@code Column} of the first {@code Row} of the
+   * {@code Table} is equal to a time value :
+   * </p>
+   *
+   * <pre>
+   * <code class='java'>
+   * assertThat(table).row().value().isEqualTo(LocalTime.of(21, 29, 30));
+   * </code>
+   * </pre>
+   * <p>
+   * Example where the assertion verifies that the value in the first {@code Column} of the {@code Row} at end point
+   * of the first {@code Change} is equal to a time value :
+   * </p>
+   *
+   * <pre>
+   * <code class='java'>
+   * assertThat(changes).change().rowAtEndPoint().value().isEqualTo(LocalTime.of(21, 29, 30));
+   * </code>
+   * </pre>
+   *
+   * @param expected The expected time value.
+   * @return {@code this} assertion object.
+   * @throws AssertionError If the value is not equal to the time value in parameter.
+   * @see org.assertj.db.api.AbstractValueAssert#isEqualTo(LocalTime)
+   * @see org.assertj.db.api.AbstractAssertWithValues#isEqualTo(LocalTime)
+   */
+  T isEqualTo(LocalTime expected);
+
+  /**
+   * Verifies that the value is equal to a date/time value.
+   * <p>
+   * Example where the assertion verifies that the value in the first {@code Column} of the first {@code Row} of the
+   * {@code Table} is equal to a date/time value :
+   * </p>
+   *
+   * <pre>
+   * <code class='java'>
+   * assertThat(table).row().value().isEqualTo(LocalDateTime.of(2014, 7, 7, 21, 29));
+   * </code>
+   * </pre>
+   * <p>
+   * Example where the assertion verifies that the value in the first {@code Column} of the {@code Row} at end point
+   * of the first {@code Change} is equal to a date/time value :
+   * </p>
+   *
+   * <pre>
+   * <code class='java'>
+   * assertThat(changes).change().rowAtEndPoint().value().isEqualTo(LocalDateTime.of(2014, 7, 7, 21, 29));
+   * </code>
+   * </pre>
+   *
+   * @param expected The expected date/time value.
+   * @return {@code this} assertion object.
+   * @throws AssertionError If the value is not equal to the date/time value in parameter.
+   * @see org.assertj.db.api.AbstractValueAssert#isEqualTo(LocalDateTime)
+   * @see org.assertj.db.api.AbstractAssertWithValues#isEqualTo(LocalDateTime)
+   */
+  T isEqualTo(LocalDateTime expected);
+
   /**
    * Verifies that the value is equal to zero.
    * <p>

src/test/java/org/assertj/db/api/assertions/AssertOnValueEquality_IsEqualTo_LocalDateTime_Test.java

@@ -0,0 +1,89 @@
+/*
+ * 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 2015-2020 the original author or authors.
+ */
+package org.assertj.db.api.assertions;
+
+import org.assertj.core.api.Assertions;
+import org.assertj.db.api.ChangeColumnValueAssert;
+import org.assertj.db.api.TableColumnValueAssert;
+import org.assertj.db.common.AbstractTest;
+import org.assertj.db.common.NeedReload;
+import org.assertj.db.type.Changes;
+import org.assertj.db.type.Table;
+import org.junit.Test;
+
+import java.time.LocalDateTime;
+
+import static org.assertj.db.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+/**
+ * Tests on {@link org.assertj.db.api.assertions.AssertOnValueEquality} class :
+ * {@link org.assertj.db.api.assertions.AssertOnValueEquality#isEqualTo(java.time.LocalDateTime)} method.
+ *
+ * @author Yosuke Nishikawa
+ */
+public class AssertOnValueEquality_IsEqualTo_LocalDateTime_Test extends AbstractTest {
+
+  /**
+   * This method tests the {@code isEqualTo} assertion method.
+   */
+  @Test
+  @NeedReload
+  public void test_is_equal_to() {
+    Table table = new Table(source, "test");
+    Changes changes = new Changes(table).setStartPointNow();
+    update("update test set var14 = 1 where var1 = 1");
+    changes.setEndPointNow();
+
+    ChangeColumnValueAssert changeColumnValueAssert = assertThat(changes).change().column("var10").valueAtEndPoint();
+    ChangeColumnValueAssert changeColumnValueAssert2 = changeColumnValueAssert.isEqualTo(LocalDateTime.of(2014, 5, 24, 9, 46, 30));
+    Assertions.assertThat(changeColumnValueAssert).isSameAs(changeColumnValueAssert2);
+
+    TableColumnValueAssert tableColumnValueAssert = assertThat(table).column("var10").value();
+    TableColumnValueAssert tableColumnValueAssert2 = tableColumnValueAssert.isEqualTo(LocalDateTime.of(2014, 5, 24, 9, 46, 30));
+    Assertions.assertThat(tableColumnValueAssert).isSameAs(tableColumnValueAssert2);
+  }
+
+  /**
+   * This method should fail because the value is no equal to.
+   */
+  @Test
+  @NeedReload
+  public void should_fail_because_value_is_not_equal_to() {
+    Table table = new Table(source, "test");
+    Changes changes = new Changes(table).setStartPointNow();
+    update("update test set var14 = 1 where var1 = 1");
+    changes.setEndPointNow();
+
+    try {
+      assertThat(changes).change().column("var10").valueAtEndPoint().isEqualTo(LocalDateTime.of(2014, 5, 24, 9, 46, 31));
+      fail("An exception must be raised");
+    } catch (AssertionError e) {
+      Assertions.assertThat(e.getMessage()).isEqualTo(String.format("[Value at end point of Column at index 9 (column name : VAR10) of Change at index 0 (with primary key : [1]) of Changes on TEST table of 'sa/jdbc:h2:mem:test' source] %n"
+                                                      + "Expecting:%n"
+                                                      + "  <2014-05-24T09:46:30.000000000>%n"
+                                                      + "to be equal to: %n"
+                                                      + "  <2014-05-24T09:46:31.000000000>"));
+    }
+    try {
+      assertThat(table).column("var10").value().isEqualTo(LocalDateTime.of(2014, 5, 24, 9, 46, 31));
+      fail("An exception must be raised");
+    } catch (AssertionError e) {
+      Assertions.assertThat(e.getMessage()).isEqualTo(String.format("[Value at index 0 of Column at index 9 (column name : VAR10) of TEST table] %n"
+                                                      + "Expecting:%n"
+                                                      + "  <2014-05-24T09:46:30.000000000>%n"
+                                                      + "to be equal to: %n"
+                                                      + "  <2014-05-24T09:46:31.000000000>"));
+    }
+  }
+}

src/test/java/org/assertj/db/api/assertions/AssertOnValueEquality_IsEqualTo_LocalDate_Test.java

@@ -0,0 +1,89 @@
+/*
+ * 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 2015-2020 the original author or authors.
+ */
+package org.assertj.db.api.assertions;
+
+import org.assertj.core.api.Assertions;
+import org.assertj.db.api.ChangeColumnValueAssert;
+import org.assertj.db.api.TableColumnValueAssert;
+import org.assertj.db.common.AbstractTest;
+import org.assertj.db.common.NeedReload;
+import org.assertj.db.type.Changes;
+import org.assertj.db.type.Table;
+import org.junit.Test;
+
+import java.time.LocalDate;
+
+import static org.assertj.db.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+/**
+ * Tests on {@link org.assertj.db.api.assertions.AssertOnValueEquality} class :
+ * {@link org.assertj.db.api.assertions.AssertOnValueEquality#isEqualTo(java.time.LocalDate)} method.
+ *
+ * @author Yosuke Nishikawa
+ */
+public class AssertOnValueEquality_IsEqualTo_LocalDate_Test extends AbstractTest {
+
+  /**
+   * This method tests the {@code isEqualTo} assertion method.
+   */
+  @Test
+  @NeedReload
+  public void test_is_equal_to() {
+    Table table = new Table(source, "test");
+    Changes changes = new Changes(table).setStartPointNow();
+    update("update test set var14 = 1 where var1 = 1");
+    changes.setEndPointNow();
+
+    ChangeColumnValueAssert changeColumnValueAssert = assertThat(changes).change().column("var9").valueAtEndPoint();
+    ChangeColumnValueAssert changeColumnValueAssert2 = changeColumnValueAssert.isEqualTo(LocalDate.of(2014, 5, 24));
+    Assertions.assertThat(changeColumnValueAssert).isSameAs(changeColumnValueAssert2);
+
+    TableColumnValueAssert tableColumnValueAssert = assertThat(table).column("var9").value();
+    TableColumnValueAssert tableColumnValueAssert2 = tableColumnValueAssert.isEqualTo(LocalDate.of(2014, 5, 24));
+    Assertions.assertThat(tableColumnValueAssert).isSameAs(tableColumnValueAssert2);
+  }
+
+  /**
+   * This method should fail because the value is no equal to.
+   */
+  @Test
+  @NeedReload
+  public void should_fail_because_value_is_not_equal_to() {
+    Table table = new Table(source, "test");
+    Changes changes = new Changes(table).setStartPointNow();
+    update("update test set var14 = 1 where var1 = 1");
+    changes.setEndPointNow();
+
+    try {
+      assertThat(changes).change().column("var9").valueAtEndPoint().isEqualTo(LocalDate.of(2014, 5, 23));
+      fail("An exception must be raised");
+    } catch (AssertionError e) {
+      Assertions.assertThat(e.getMessage()).isEqualTo(String.format("[Value at end point of Column at index 8 (column name : VAR9) of Change at index 0 (with primary key : [1]) of Changes on TEST table of 'sa/jdbc:h2:mem:test' source] %n"
+                                                      + "Expecting:%n"
+                                                      + "  <2014-05-24>%n"
+                                                      + "to be equal to: %n"
+                                                      + "  <2014-05-23>"));
+    }
+    try {
+      assertThat(table).column("var9").value().isEqualTo(LocalDate.of(2014, 5, 23));
+      fail("An exception must be raised");
+    } catch (AssertionError e) {
+      Assertions.assertThat(e.getMessage()).isEqualTo(String.format("[Value at index 0 of Column at index 8 (column name : VAR9) of TEST table] %n"
+                                                      + "Expecting:%n"
+                                                      + "  <2014-05-24>%n"
+                                                      + "to be equal to: %n"
+                                                      + "  <2014-05-23>"));
+    }
+  }
+}