source: josm/trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java@ 626

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