source: josm/test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java@ 209

Last change on this file since 209 was 209, checked in by imi, 17 years ago
  • fixed a bug in the Segment compare code to not have all incomplete segments beeing realEqual() to each other
File size: 10.1 KB
Line 
1package org.openstreetmap.josm.data.osm.visitor;
2
3import java.util.Date;
4
5import junit.framework.TestCase;
6
7import org.openstreetmap.josm.data.coor.LatLon;
8import org.openstreetmap.josm.data.osm.DataSet;
9import org.openstreetmap.josm.data.osm.Node;
10import org.openstreetmap.josm.data.osm.OsmPrimitive;
11import org.openstreetmap.josm.data.osm.Segment;
12import org.openstreetmap.josm.data.osm.Way;
13import org.openstreetmap.josm.testframework.Bug;
14import org.openstreetmap.josm.testframework.DataSetTestCaseHelper;
15
16public class MergeVisitorTest extends TestCase {
17
18
19 private DataSet ds;
20 private Node dsNode;
21 private Node n;
22 private MergeVisitor v;
23
24 @Override protected void setUp() throws Exception {
25 ds = new DataSet();
26 dsNode = DataSetTestCaseHelper.createNode(ds);
27 v = new MergeVisitor(ds);
28 n = DataSetTestCaseHelper.createNode(null);
29 }
30
31
32 private Segment createSegment(DataSet ds, boolean incomplete, boolean deleted, int id) {
33 Node n1 = DataSetTestCaseHelper.createNode(ds);
34 Node n2 = DataSetTestCaseHelper.createNode(ds);
35 Segment s = DataSetTestCaseHelper.createSegment(ds, n1, n2);
36 s.incomplete = incomplete;
37 s.id = id;
38 s.deleted = deleted;
39 s.timestamp = new Date();
40 return s;
41 }
42
43 /**
44 * Create that amount of nodes and add them to the dataset. The id will be 1,2,3,4...
45 * @param amount Number of nodes to create.
46 * @return The created nodes.
47 */
48 private Node[] createNodes(DataSet ds, int amount) {
49 Node[] nodes = new Node[amount];
50 for (int i = 0; i < amount; ++i) {
51 nodes[i] = DataSetTestCaseHelper.createNode(ds);
52 nodes[i].id = i+1;
53 }
54 return nodes;
55 }
56
57
58 public void testNodesMergeUpdate() {
59 dsNode.id = 1;
60 n.id = 1;
61 n.timestamp = new Date();
62 v.visit(n);
63 assertEquals(dsNode, n);
64 }
65 public void testNodesMergeModified() {
66 dsNode.id = 1;
67 n.id = 1;
68 n.modified = true;
69 v.visit(n);
70 assertEquals(dsNode, n);
71 }
72 public void testNodesConflictBothModified() {
73 n.modified = true;
74 dsNode.modified = true;
75 n.id = 1;
76 dsNode.id = 1;
77 v.visit(n);
78 assertEquals(1, v.conflicts.size());
79 }
80 public void testNodesConflict() {
81 dsNode.id = 1;
82 dsNode.timestamp = new Date();
83 n.id = 1;
84 n.modified = true;
85 n.timestamp = new Date(dsNode.timestamp.getTime()-1);
86 v.visit(n);
87 assertEquals(1, v.conflicts.size());
88 assertSame(dsNode, v.conflicts.keySet().iterator().next());
89 assertSame(n, v.conflicts.values().iterator().next());
90 }
91 public void testNodesConflict2() {
92 dsNode.id = 1;
93 dsNode.timestamp = new Date();
94 dsNode.modified = true;
95 n.id = 1;
96 n.timestamp = new Date(dsNode.timestamp.getTime()+1);
97 v.visit(n);
98 assertEquals(1, v.conflicts.size());
99 }
100 public void testNodesConflictModifyDelete() {
101 dsNode.id = 1;
102 dsNode.modified = true;
103 n.id = 1;
104 n.delete(true);
105 v.visit(n);
106 assertEquals(1, v.conflicts.size());
107 }
108 public void testNodesMergeSamePosition() {
109 n.id = 1; // new node comes from server
110 dsNode.modified = true; // our node is modified
111 dsNode.coor = new LatLon(n.coor.lat(), n.coor.lon());
112 v.visit(n);
113 v.fixReferences();
114 assertEquals(0, v.conflicts.size());
115 assertEquals(1, dsNode.id);
116 assertFalse("updating a new node clear the modified state", dsNode.modified);
117 }
118
119 public void testNoConflictNewNodesMerged() {
120 assertEquals(0, n.id);
121 assertEquals(0, dsNode.id);
122 v.visit(n);
123 v.fixReferences();
124 assertEquals(0,v.conflicts.size());
125 assertTrue(ds.nodes.contains(n));
126 assertEquals(2, ds.nodes.size());
127 }
128
129 /**
130 * Test that two new segments that have different from/to are not merged
131 */
132 @Bug(101)
133 public void testNewSegmentNotMerged() {
134 v.visit(n);
135 Segment s1 = new Segment(n, dsNode);
136 v.visit(s1);
137 Segment s2 = new Segment(dsNode, n);
138 v.visit(s2);
139 assertEquals(2, ds.segments.size());
140 }
141
142 public void testFixReferencesConflicts() {
143 // make two nodes mergable
144 dsNode.id = 1;
145 n.id = 1;
146 n.timestamp = new Date();
147 // have an old segment with the old node
148 Segment sold = new Segment(dsNode, dsNode);
149 sold.id = 23;
150 sold.modified = true;
151 ds.segments.add(sold);
152 // have a conflicting segment point to the new node
153 Segment s = new Segment(n,DataSetTestCaseHelper.createNode(null));
154 s.id = 23;
155 s.modified = true;
156
157 v.visit(n); // merge
158 assertEquals(n.timestamp, dsNode.timestamp);
159 v.visit(s);
160 assertEquals(1, v.conflicts.size());
161 v.fixReferences();
162 assertSame(s.from, dsNode);
163 }
164
165 public void testNoConflictForSame() {
166 dsNode.id = 1;
167 dsNode.modified = true;
168 n.cloneFrom(dsNode);
169 v.visit(n);
170 assertEquals(0, v.conflicts.size());
171 }
172
173 /**
174 * Merge of an old segment with a new one. This should
175 * be mergable (if the nodes matches).
176 */
177 public void testMergeOldSegmentsWithNew() {
178 Node[] n = createNodes(ds, 2);
179 Segment ls1 = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
180 ls1.id = 3;
181
182 Node newnode = new Node(new LatLon(n[1].coor.lat(), n[1].coor.lon()));
183 Segment newls = new Segment(n[0], newnode);
184
185 v.visit(newls);
186 assertEquals("segment should have been merged.", 1, ds.segments.size());
187 }
188
189 /**
190 * Incomplete segments should always loose.
191 */
192 public void testImportIncomplete() throws Exception {
193 Segment s1 = DataSetTestCaseHelper.createSegment(ds, dsNode, dsNode);
194 s1.id = 1;
195 Segment s2 = new Segment(s1);
196 s1.incomplete = true;
197 s2.timestamp = new Date();
198 v.visit(s2);
199 assertTrue(s1.realEqual(s2, false));
200 }
201 /**
202 * Incomplete segments should extend existing ways.
203 */
204 public void testImportIncompleteExtendWays() throws Exception {
205 Segment s1 = DataSetTestCaseHelper.createSegment(ds, dsNode, dsNode);
206 Way w = DataSetTestCaseHelper.createWay(ds, new Segment[]{s1});
207 s1.id = 1;
208 Segment s2 = new Segment(s1);
209 s1.incomplete = true;
210 v.visit(s2);
211 v.fixReferences();
212 assertEquals(1, w.segments.size());
213 assertEquals(s2, w.segments.get(0));
214 assertFalse(s2.incomplete);
215 }
216
217
218 /**
219 * Nodes beeing merged are equal but should be the same.
220 */
221 @Bug(54)
222 public void testEqualNotSame() {
223 ds = new DataSet();
224 // create a dataset with segment a-b
225 Node n[] = createNodes(ds, 2);
226 Segment ls1 = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
227 ls1.id = 1;
228
229 // create an other dataset with segment a'-c (a' is equal, but not same to a)
230 DataSet ds2 = new DataSet();
231 Node n2[] = createNodes(ds2, 2);
232 n2[0].coor = new LatLon(n[0].coor.lat(), n[0].coor.lon());
233 n2[0].id = 0;
234 n2[1].id = 42;
235
236 Segment ls2 = DataSetTestCaseHelper.createSegment(ds, n2[0], n2[1]);
237 v = new MergeVisitor(ds);
238 for (OsmPrimitive osm : ds2.allPrimitives())
239 osm.visit(v);
240 v.fixReferences();
241
242 assertSame(ls1.from, ls2.from);
243 }
244
245
246 public void testCloneWayNotIncomplete() {
247 DataSet ds = new DataSet();
248 Node[] n = createNodes(ds, 2);
249 Segment s = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
250 Way w = DataSetTestCaseHelper.createWay(ds, s);
251 MergeVisitor v = new MergeVisitor(ds);
252 v.visit(n[0]);
253 v.visit(n[1]);
254 v.visit(s);
255 v.visit(w);
256 Way w2 = new Way(w);
257 w2.timestamp = new Date();
258 Segment s2 = new Segment(s);
259 s2.incomplete = true;
260 w2.segments.clear();
261 w2.segments.add(s2);
262 v.visit(w2);
263 assertSame("Do not import incomplete segments when merging ways.", s, w.segments.iterator().next());
264 }
265
266 /**
267 * When merging an incomplete way over a dataset that contain already all
268 * necessary segments, the way must be completed.
269 */
270 @Bug(117)
271 public void testMergeIncompleteOnExistingDoesNotComplete() {
272 // create a dataset with an segment (as base for the later incomplete way)
273 DataSet ds = new DataSet();
274 Node[] n = createNodes(ds, 2);
275 Segment s = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
276 s.id = 23;
277 // create an incomplete way which references the former segment
278 Way w = new Way();
279 Segment incompleteSegment = new Segment(s.id);
280 w.segments.add(incompleteSegment);
281 w.id = 42;
282 // merge both
283 MergeVisitor v = new MergeVisitor(ds);
284 v.visit(w);
285 v.fixReferences();
286
287 assertTrue(ds.ways.contains(w));
288 assertEquals(1, w.segments.size());
289 assertFalse(w.segments.get(0).incomplete);
290 }
291
292 /**
293 * Deleted segments should raise an conflict when merged over changed segments.
294 */
295 public void testMergeDeletedOverChangedConflict() {
296 DataSet ds = new DataSet();
297 createSegment(ds, false, false, 23).modified = true;
298 Segment s = createSegment(null, false, true, 23);
299 s.timestamp = new Date(new Date().getTime()+1);
300
301 MergeVisitor v = new MergeVisitor(ds);
302 v.visit(s);
303 v.fixReferences();
304
305 assertEquals(1, v.conflicts.size());
306 }
307
308 public void testMergeIncompleteSegmentsAddToDataSet() throws Exception {
309 DataSet ds = new DataSet();
310 MergeVisitor v = new MergeVisitor(ds);
311 v.visit(createSegment(null, true, false, 1));
312 assertEquals(1, ds.segments.size());
313 }
314
315 /**
316 * The merger should auto-resolve items, that have not changed but are marked as
317 * changed. In the case where an unmodified newer item is merged over an modified
318 * older, the modified-flag should be removed and the newer timestamp is used.
319 */
320 public void testMergeModifiedWithOlderTimestampOverUnmodifiedNewerDoesNotConflict() throws Exception {
321 DataSet ds = new DataSet();
322
323 Node oldNode = createNodes(ds, 1)[0];
324 oldNode.modified = true;
325 oldNode.timestamp = new Date();
326
327 Node newNode = new Node(oldNode);
328 Date date = new Date(oldNode.timestamp.getTime()+10000);
329 newNode.modified = false;
330 newNode.timestamp = new Date(date.getTime());
331
332 MergeVisitor v = new MergeVisitor(ds);
333 v.visit(newNode);
334
335 assertEquals(0, v.conflicts.size());
336 assertEquals(date, ds.nodes.iterator().next().timestamp);
337 assertFalse(ds.nodes.iterator().next().modified);
338 }
339
340 public void testMergeTwoIncompleteWaysMergesSecondAsWell() throws Exception {
341 DataSet ds = new DataSet();
342 Segment s1 = new Segment(23);
343 Segment s2 = new Segment(42);
344
345 MergeVisitor v = new MergeVisitor(ds);
346 v.visit(s1);
347 v.visit(s2);
348
349 assertEquals(2, ds.segments.size());
350 assertEquals(23, ds.segments.iterator().next().id);
351 }
352}
Note: See TracBrowser for help on using the repository browser.