SONAR-5183 - analysis unsensitive to timezones - snapshots table

2 files changed, 4 insertions, 9 deletions

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/database/model/SnapshotTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/database/model/SnapshotTest.java
index 5a0c8427a51..c102f844234 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/database/model/SnapshotTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/database/model/SnapshotTest.java
@@ -21,13 +21,8 @@ package org.sonar.api.database.model;
 
 import org.junit.Test;
 
-import java.util.Date;
-
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 public class SnapshotTest {
 
@@ -36,7 +31,7 @@ public class SnapshotTest {
     Snapshot snapshot = new Snapshot();
     assertNull(snapshot.getCreatedAt());
 
-    Date now = new Date();
+    Long now = System.currentTimeMillis();
     snapshot.setCreatedAt(now);
     assertEquals(now, snapshot.getCreatedAt());
   }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
index 888ceeb4c69..7aa32f3cb20 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/DateUtilsTest.java
@@ -109,8 +109,8 @@ public class DateUtilsTest {
   @Test
   public void time_to_date() throws Exception {
     Date date = new Date();
-    Assertions.assertThat(DateUtils.timeToDate(date.getTime())).isEqualTo(date);
-    Assertions.assertThat(DateUtils.timeToDate(null)).isNull();
+    Assertions.assertThat(DateUtils.longToDate(date.getTime())).isEqualTo(date);
+    Assertions.assertThat(DateUtils.longToDate(null)).isNull();
   }
 
   /**