Changeset 11035 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm
- Timestamp:
- 2016-09-20T22:46:47+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
r10945 r11035 11 11 12 12 import java.io.StringWriter; 13 import java.time.Instant; 13 14 import java.util.Arrays; 14 import java.util.Calendar;15 15 import java.util.Date; 16 import java.util.GregorianCalendar;17 16 18 17 import org.junit.After; … … 26 25 27 26 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 28 29 27 /** 30 28 * Unit tests for class {@link DataSetMerger}. … … 298 296 public void testNodeSimpleNoIdSemanticallyEqual() { 299 297 300 Calendar cal = GregorianCalendar.getInstance();301 298 User myUser = User.createOsmUser(1111, "my"); 302 299 … … 307 304 n.put("key1", "value1"); 308 305 n.setUser(myUser); 309 n.setTimestamp( cal.getTime());306 n.setTimestamp(new Date()); 310 307 311 308 my.addPrimitive(n); … … 314 311 n1.setCoor(LatLon.ZERO); 315 312 n1.put("key1", "value1"); 316 cal.add(Calendar.HOUR, 1); 317 Date timestamp = cal.getTime(); 318 n1.setTimestamp(timestamp); 313 n1.setTimestamp(Date.from(Instant.now().plusSeconds(3600))); 319 314 n1.setUser(theirUser); 320 315 their.addPrimitive(n1);
Note:
See TracChangeset
for help on using the changeset viewer.