Changeset 159 in josm for test/org/openstreetmap/josm
- Timestamp:
- 2006-10-13T13:02:57+02:00 (18 years ago)
- Location:
- test/org/openstreetmap/josm
- Files:
-
- 2 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
r143 r159 265 265 266 266 /** 267 * Deleted segments should be deleted when merged over unchanged segments.268 */269 public void testMergeDeletedOverUnchangedDeletes() {270 DataSet ds = new DataSet();271 Segment oldSegment = createSegment(ds, false, false, 23);272 Segment s = createSegment(null, false, true, 23);273 274 MergeVisitor v = new MergeVisitor(ds);275 v.visit(s);276 v.fixReferences();277 278 assertEquals(true, oldSegment.deleted);279 }280 281 282 /**283 267 * Deleted segments should raise an conflict when merged over changed segments. 284 268 */ … … 287 271 createSegment(ds, false, false, 23).modified = true; 288 272 Segment s = createSegment(null, false, true, 23); 273 s.timestamp = new Date(new Date().getTime()+1); 289 274 290 275 MergeVisitor v = new MergeVisitor(ds); … … 303 288 s.id = id; 304 289 s.deleted = deleted; 290 s.timestamp = new Date(); 305 291 return s; 306 292 } -
test/org/openstreetmap/josm/testframework/DataSetTestCaseHelper.java
r143 r159 42 42 43 43 public static Way createWay(DataSet ds, Segment... segments) { 44 Way t= new Way();45 t.segments.addAll(Arrays.asList(segments));44 Way w = new Way(); 45 w.segments.addAll(Arrays.asList(segments)); 46 46 if (ds != null) 47 ds.ways.add( t);48 return t;47 ds.ways.add(w); 48 return w; 49 49 } 50 50
Note:
See TracChangeset
for help on using the changeset viewer.