Changeset 11035 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2016-09-20T22:46:47+02:00 (8 years ago)

Author:

simon04

Message:

see #13376 - Replace Calendar usages with Java 8 Date API

Location:

trunk/test/unit/org/openstreetmap/josm/data

Files:

• AutosaveTaskTest.java (modified) (2 diffs)
• osm/DataSetMergerTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/data/AutosaveTaskTest.java

@@ -14 +14 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Calendar;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.List;
@@ -87 +88 @@
         Files.createDirectories(task.getAutosaveDir());
         AutosaveLayerInfo info = new AutosaveLayerInfo(new OsmDataLayer(new DataSet(), "layer", null));
-        Calendar cal = Calendar.getInstance();
-        cal.set(2016, 0, 1, 1, 2, 3);
-        cal.set(Calendar.MILLISECOND, 456);
-        Date fixed = cal.getTime();
+        Date fixed = Date.from(ZonedDateTime.of(2016, 1, 1, 1, 2, 3, 456_000_000, ZoneId.systemDefault()).toInstant());
 
         AutosaveTask.PROP_INDEX_LIMIT.put(5);

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

@@ -11 +11 @@
 
 import java.io.StringWriter;
+import java.time.Instant;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 
 import org.junit.After;
@@ -26 +25 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * Unit tests for class {@link DataSetMerger}.
@@ -298 +296 @@
     public void testNodeSimpleNoIdSemanticallyEqual() {
 
-        Calendar cal = GregorianCalendar.getInstance();
         User myUser = User.createOsmUser(1111, "my");
 
@@ -307 +304 @@
         n.put("key1", "value1");
         n.setUser(myUser);
-        n.setTimestamp(cal.getTime());
+        n.setTimestamp(new Date());
 
         my.addPrimitive(n);
@@ -314 +311 @@
         n1.setCoor(LatLon.ZERO);
         n1.put("key1", "value1");
-        cal.add(Calendar.HOUR, 1);
-        Date timestamp = cal.getTime();
-        n1.setTimestamp(timestamp);
+        n1.setTimestamp(Date.from(Instant.now().plusSeconds(3600)));
         n1.setUser(theirUser);
         their.addPrimitive(n1);