Fix closeto tolerance when seconds exceed 60 (#62)

Author: VanRoy

src/main/java/org/assertj/db/type/TimeValue.java

@@ -20,7 +20,8 @@
  * This class represents a time value in the database.
  * 
  * @author Régis Pouiller
- * 
+ * @author Julien Roy
+ *
  */
 public class TimeValue implements Comparable<TimeValue> {
 
@@ -376,20 +377,31 @@ public TimeValue move(TimeValue time) {
       thisNanoSeconds += 1000000000 + nanoSeconds;
       seconds--;
     }
-    if (seconds >= 0 || thisSeconds >= -seconds) {
+
+    if (seconds > 0 && (thisSeconds + seconds >= 60)) {
+      thisSeconds += seconds - 60;
+      minutes++;
+    }
+    else if (seconds >= 0 || thisSeconds >= -seconds) {
       thisSeconds += seconds;
     }
     else {
       thisSeconds += 60 + seconds;
       minutes--;
     }
-    if (minutes >= 0 || thisMinutes >= -minutes) {
+
+    if ( minutes > 0 && (thisMinutes + minutes >= 60 )) {
+      thisMinutes += minutes - 60;
+      hours++;
+    }
+    else if (minutes >= 0 || thisMinutes >= -minutes) {
       thisMinutes += minutes;
     }
     else {
       thisMinutes += 60 + minutes;
       hours--;
     }
+
     thisHours += hours;
 
     return of(thisHours, thisMinutes, thisSeconds, thisNanoSeconds);

src/test/java/org/assertj/db/api/assertions/impl/AssertionsOnValueCloseness_IsCloseTo_DateTimeValue_TimeValue_Test.java

@@ -33,6 +33,7 @@
  * {@link  AssertionsOnValueCloseness#isCloseTo(org.assertj.db.api.AbstractAssert, org.assertj.core.api.WritableAssertionInfo, org.assertj.db.type.Value, org.assertj.db.type.DateTimeValue, org.assertj.db.type.TimeValue)} method.
  *
  * @author Régis Pouiller
+ * @author Julien Roy
  *
  */
 public class AssertionsOnValueCloseness_IsCloseTo_DateTimeValue_TimeValue_Test extends AbstractTest {
@@ -45,15 +46,22 @@ public void test_is_close_to() throws Exception {
     WritableAssertionInfo info = new WritableAssertionInfo();
     Table table = new Table();
     TableAssert tableAssert = assertThat(table);
+
     TableAssert tableAssert2 = AssertionsOnValueCloseness.isCloseTo(tableAssert, info, getValue(
             null, Date.valueOf("2007-12-23")), DateTimeValue.of(DateValue.of(2007, 12, 23)), TimeValue.of(0, 0, 0));
     Assertions.assertThat(tableAssert2).isSameAs(tableAssert);
+
     tableAssert2 = AssertionsOnValueCloseness.isCloseTo(tableAssert, info, getValue(
             null, Timestamp.valueOf("2007-12-23 09:01:00")), DateTimeValue.of(
             DateValue.of(2007, 12, 23), TimeValue.of(9, 1)), TimeValue.of(0, 0, 0));
     Assertions.assertThat(tableAssert2).isSameAs(tableAssert);
+
     tableAssert2 = AssertionsOnValueCloseness.isCloseTo(tableAssert, info, getValue(null, null), (DateTimeValue) null, TimeValue.of(0, 0, 0));
     Assertions.assertThat(tableAssert2).isSameAs(tableAssert);
+
+    tableAssert2 = AssertionsOnValueCloseness.isCloseTo(tableAssert, info, getValue(
+        null, Timestamp.valueOf("2019-12-03 09:25:00")), DateTimeValue.from(Timestamp.valueOf("2019-12-03 09:24:58")), TimeValue.of(0, 0, 10));
+    Assertions.assertThat(tableAssert2).isSameAs(tableAssert);
   }
 
   /**

src/test/java/org/assertj/db/type/TimeValue_Test.java

@@ -25,7 +25,8 @@
  * Tests on the time value.
  * 
  * @author Régis Pouiller
- * 
+ * @author Julien Roy
+ *
  */
 public class TimeValue_Test extends AbstractTest {
 
@@ -521,6 +522,15 @@ public void test_move_time() {
     assertThat(TimeValue.of(9, 1).move(TimeValue.of(0, 0, 2))).as("add 2 seconds").isEqualTo(
             TimeValue.of(9, 1, 2));
 
+    assertThat(TimeValue.of(9, 1, 58).move(TimeValue.of(0, 0,  10))).as("add 10 seconds to 58").isEqualTo(
+        TimeValue.of(9, 2, 8));
+
+    assertThat(TimeValue.of(9, 59, 58).move(TimeValue.of(0, 0,  50))).as("add 50 seconds to 58").isEqualTo(
+        TimeValue.of(10, 00, 48));
+
+    assertThat(TimeValue.of(9, 0, 0).move(TimeValue.of(0, 0,  -10))).as("substract 10 seconds to 0").isEqualTo(
+        TimeValue.of(8, 59, 50));
+
     assertThat(TimeValue.of(9, 1).move(TimeValue.of(0, 0, -1))).as("substract 1 second").isEqualTo(
             TimeValue.of(9, 0, 59, 0));
     assertThat(TimeValue.of(9, 1).move(TimeValue.of(0, 0, -2))).as("substract 2 seconds").isEqualTo(