#555 - Use a common timestamp value for @WhenCreated and @WhenModified

src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java

@@ -8,7 +8,7 @@ import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 public class InsertTimestampFactoryTest {
 
@@ -20,7 +20,7 @@ public class InsertTimestampFactoryTest {
     DeployBeanProperty prop = new DeployBeanProperty(null, LocalDateTime.class, null, null);
 
     GeneratedProperty insertTimestamp = factory.createInsertTimestamp(prop);
-    Object value = insertTimestamp.getInsertValue(null, null);
+    Object value = insertTimestamp.getInsertValue(null, null, System.currentTimeMillis());
     assertTrue(value instanceof LocalDateTime);
   }
 
@@ -30,7 +30,7 @@ public class InsertTimestampFactoryTest {
     DeployBeanProperty prop = new DeployBeanProperty(null, OffsetDateTime.class, null, null);
 
     GeneratedProperty insertTimestamp = factory.createInsertTimestamp(prop);
-    Object value = insertTimestamp.getInsertValue(null, null);
+    Object value = insertTimestamp.getInsertValue(null, null, System.currentTimeMillis());
     assertTrue(value instanceof OffsetDateTime);
   }
 
@@ -40,7 +40,7 @@ public class InsertTimestampFactoryTest {
     DeployBeanProperty prop = new DeployBeanProperty(null, Timestamp.class, null, null);
 
     GeneratedProperty insertTimestamp = factory.createInsertTimestamp(prop);
-    Object value = insertTimestamp.getInsertValue(null, null);
+    Object value = insertTimestamp.getInsertValue(null, null, System.currentTimeMillis());
     assertTrue(value instanceof Timestamp);
   }
 
@@ -50,7 +50,7 @@ public class InsertTimestampFactoryTest {
     DeployBeanProperty prop = new DeployBeanProperty(null, java.util.Date.class, null, null);
 
     GeneratedProperty insertTimestamp = factory.createInsertTimestamp(prop);
-    Object value = insertTimestamp.getInsertValue(null, null);
+    Object value = insertTimestamp.getInsertValue(null, null, System.currentTimeMillis());
     assertTrue(value instanceof java.util.Date);
   }
 

src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java

@@ -21,7 +21,7 @@ public class UpdateTimestampFactoryTest {
     DeployBeanProperty prop = new DeployBeanProperty(null, LocalDateTime.class, null, null);
 
     GeneratedProperty generatedProperty = factory.createUpdateTimestamp(prop);
-    Object value = generatedProperty.getInsertValue(null, null);
+    Object value = generatedProperty.getInsertValue(null, null, System.currentTimeMillis());
     assertTrue(value instanceof LocalDateTime);
   }
 
@@ -31,7 +31,7 @@ public class UpdateTimestampFactoryTest {
     DeployBeanProperty prop = new DeployBeanProperty(null, OffsetDateTime.class, null, null);
 
     GeneratedProperty generatedProperty = factory.createUpdateTimestamp(prop);
-    Object value = generatedProperty.getInsertValue(null, null);
+    Object value = generatedProperty.getInsertValue(null, null, System.currentTimeMillis());
     assertTrue(value instanceof OffsetDateTime);
   }
 
@@ -41,7 +41,7 @@ public class UpdateTimestampFactoryTest {
     DeployBeanProperty prop = new DeployBeanProperty(null, Timestamp.class, null, null);
 
     GeneratedProperty generatedProperty = factory.createUpdateTimestamp(prop);
-    Object value = generatedProperty.getInsertValue(null, null);
+    Object value = generatedProperty.getInsertValue(null, null, System.currentTimeMillis());
     assertTrue(value instanceof Timestamp);
   }
 
@@ -51,7 +51,7 @@ public class UpdateTimestampFactoryTest {
     DeployBeanProperty prop = new DeployBeanProperty(null, java.util.Date.class, null, null);
 
     GeneratedProperty generatedProperty = factory.createUpdateTimestamp(prop);
-    Object value = generatedProperty.getInsertValue(null, null);
+    Object value = generatedProperty.getInsertValue(null, null, System.currentTimeMillis());
     assertTrue(value instanceof java.util.Date);
   }
 }

src/test/java/com/avaje/tests/generated/TestGeneratedProperties.java

@@ -5,6 +5,7 @@ import com.avaje.ebean.Ebean;
 import com.avaje.tests.model.EGenProps;
 import org.junit.Test;
 
+import static org.assertj.core.api.StrictAssertions.assertThat;
 import static org.junit.Assert.assertNotNull;
 
 public class TestGeneratedProperties extends BaseTestCase {
@@ -31,9 +32,16 @@ public class TestGeneratedProperties extends BaseTestCase {
     assertNotNull(bean.getLongCreated());
     assertNotNull(bean.getLongUpdated());
 
+    assertThat(bean.getWhenCreated().toInstant().toEpochMilli()).isEqualTo(bean.getLongCreated());
+    assertThat(bean.getWhenModified().toInstant().toEpochMilli()).isEqualTo(bean.getLongCreated());
+    assertThat(bean.getWhenModified().toInstant().toEpochMilli()).isEqualTo(bean.getLongCreated());
+
     bean.setName("updating...");
     Ebean.save(bean);
 
+    assertThat(bean.getWhenModified()).isNotEqualTo(bean.getLongCreated());
+    assertThat(bean.getWhenModified().toInstant().toEpochMilli()).isEqualTo(bean.getLongUpdated());
+
     Ebean.delete(bean);
   }
 }