Adjust test to respect expected inaccuracies

Author: TimothyGillespie

src/test/java/org/javawebstack/orm/test/TypesTest.java

@@ -8,9 +8,11 @@
 import org.javawebstack.orm.exception.ORMConfigurationException;
 import org.junit.jupiter.api.Test;
 
+import javax.swing.text.TabSet;
 import java.sql.Timestamp;
 import java.time.Instant;
 
+import static org.javawebstack.orm.test.shared.util.TimestampUtil.diffInNanoseconds;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TypesTest extends ORMTestCase {
@@ -58,10 +60,7 @@ public void testFields() throws ORMConfigurationException {
         assertEquals(model.exampleDouble, 123456789.1234567890D);
         assertEquals(model.exampleLong, 999999999999999999L);
         assertEquals(model.exampleLongPrimitive, 999999999999999999L);
-
-        // TODO: Use
-        assertNotNull(model.timestampTest);
-
+        assertTrue(diffInNanoseconds(timestamp, model.timestampTest) < 1);
         model.exampleNull = "Text";
         model.save();
         model = Repo.get(ExampleModel.class).get(id);

src/test/java/org/javawebstack/orm/test/shared/util/TimestampUtil.java

@@ -0,0 +1,43 @@
+package org.javawebstack.orm.test.shared.util;
+
+import java.sql.Timestamp;
+
+/*
+ * The original author is Aaron Digulla
+ * https://stackoverflow.com/a/582487
+ */
+public class TimestampUtil {
+
+    public static Double diffInNanoseconds (java.util.Date t1, java.util.Date t2)
+    {
+        // Make sure the result is always > 0
+        if (t1.compareTo (t2) < 0)
+        {
+            java.util.Date tmp = t1;
+            t1 = t2;
+            t2 = tmp;
+        }
+
+        // Timestamps mix milli and nanoseconds in the API, so we have to separate the two
+        long diffSeconds = (t1.getTime () / 1000) - (t2.getTime () / 1000);
+        // For normals dates, we have millisecond precision
+        int nano1 = ((int) t1.getTime () % 1000) * 1000000;
+        // If the parameter is a Timestamp, we have additional precision in nanoseconds
+        if (t1 instanceof Timestamp)
+            nano1 = ((Timestamp)t1).getNanos ();
+        int nano2 = ((int) t2.getTime () % 1000) * 1000000;
+        if (t2 instanceof Timestamp)
+            nano2 = ((Timestamp)t2).getNanos ();
+
+        int diffNanos = nano1 - nano2;
+        if (diffNanos < 0)
+        {
+            // Borrow one second
+            diffSeconds --;
+            diffNanos += 1000000000;
+        }
+
+        return diffSeconds * 1000000000.0 + diffNanos / 1000.0;
+
+    }
+}