source: josm/src/org/openstreetmap/josm/test/MergeVisitorTest.java@ 119

Last change on this file since 119 was 119, checked in by imi, 18 years ago
  • added Annotation Preset Tester
  • added Language selection in preferences
  • fixed merging bug where incomplete line segments were not replaced
File size: 8.0 KB
Line 
1package org.openstreetmap.josm.test;
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.data.osm.visitor.MergeVisitor;
14import org.openstreetmap.josm.test.framework.Bug;
15import org.openstreetmap.josm.test.framework.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);
29 n = DataSetTestCaseHelper.createNode(null);
30 }
31
32
33 public void testNodesMergeUpdate() {
34 dsNode.id = 1;
35 n.id = 1;
36 n.timestamp = new Date();
37 v.visit(n);
38 assertEquals(dsNode, n);
39 }
40 public void testNodesMergeModified() {
41 dsNode.id = 1;
42 n.id = 1;
43 n.modified = true;
44 v.visit(n);
45 assertEquals(dsNode, n);
46 }
47 public void testNodesConflictBothModified() {
48 n.modified = true;
49 dsNode.modified = true;
50 n.id = 1;
51 dsNode.id = 1;
52 v.visit(n);
53 assertEquals(1, v.conflicts.size());
54 }
55 public void testNodesConflict() {
56 dsNode.id = 1;
57 dsNode.timestamp = new Date();
58 n.id = 1;
59 n.modified = true;
60 n.timestamp = new Date(dsNode.timestamp.getTime()-1);
61 v.visit(n);
62 assertEquals(1, v.conflicts.size());
63 assertSame(dsNode, v.conflicts.keySet().iterator().next());
64 assertSame(n, v.conflicts.values().iterator().next());
65 }
66 public void testNodesConflict2() {
67 dsNode.id = 1;
68 dsNode.timestamp = new Date();
69 dsNode.modified = true;
70 n.id = 1;
71 n.timestamp = new Date(dsNode.timestamp.getTime()+1);
72 v.visit(n);
73 assertEquals(1, v.conflicts.size());
74 }
75 public void testNodesConflictModifyDelete() {
76 dsNode.id = 1;
77 dsNode.modified = true;
78 n.id = 1;
79 n.delete(true);
80 v.visit(n);
81 assertEquals(1, v.conflicts.size());
82 }
83 public void testNodesMergeSamePosition() {
84 n.id = 1; // new node comes from server
85 dsNode.modified = true; // our node is modified
86 dsNode.coor = new LatLon(n.coor.lat(), n.coor.lon());
87 v.visit(n);
88 v.fixReferences();
89 assertEquals(0, v.conflicts.size());
90 assertEquals(1, dsNode.id);
91 assertFalse("updating a new node clear the modified state", dsNode.modified);
92 }
93
94 public void testNoConflictNewNodesMerged() {
95 assertEquals(0, n.id);
96 assertEquals(0, dsNode.id);
97 v.visit(n);
98 v.fixReferences();
99 assertEquals(0,v.conflicts.size());
100 assertTrue(ds.nodes.contains(n));
101 assertEquals(2, ds.nodes.size());
102 }
103
104 /**
105 * Test that two new segments that have different from/to are not merged
106 */
107 @Bug(101)
108 public void testNewSegmentNotMerged() {
109 v.visit(n);
110 Segment s1 = new Segment(n, dsNode);
111 v.visit(s1);
112 Segment s2 = new Segment(dsNode, n);
113 v.visit(s2);
114 assertEquals(2, ds.segments.size());
115 }
116
117 public void testFixReferencesConflicts() {
118 // make two nodes mergable
119 dsNode.id = 1;
120 n.id = 1;
121 n.timestamp = new Date();
122 // have an old segment with the old node
123 Segment sold = new Segment(dsNode, dsNode);
124 sold.id = 23;
125 sold.modified = true;
126 ds.segments.add(sold);
127 // have a conflicting segment point to the new node
128 Segment s = new Segment(n,DataSetTestCaseHelper.createNode(null));
129 s.id = 23;
130 s.modified = true;
131
132 v.visit(n); // merge
133 assertEquals(n.timestamp, dsNode.timestamp);
134 v.visit(s);
135 assertEquals(1, v.conflicts.size());
136 v.fixReferences();
137 assertSame(s.from, dsNode);
138 }
139
140 public void testNoConflictForSame() {
141 dsNode.id = 1;
142 dsNode.modified = true;
143 n.cloneFrom(dsNode);
144 v.visit(n);
145 assertEquals(0, v.conflicts.size());
146 }
147
148 /**
149 * Merge of an old segment with a new one. This should
150 * be mergable (if the nodes matches).
151 */
152 public void testMergeOldSegmentsWithNew() {
153 Node[] n = createNodes(ds, 2);
154 Segment ls1 = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
155 ls1.id = 3;
156
157 Node newnode = new Node(new LatLon(n[1].coor.lat(), n[1].coor.lon()));
158 Segment newls = new Segment(n[0], newnode);
159
160 v.visit(newls);
161 assertEquals("segment should have been merged.", 1, ds.segments.size());
162 }
163
164 /**
165 * Incomplete segments should always loose.
166 */
167 public void testImportIncomplete() throws Exception {
168 Segment s1 = DataSetTestCaseHelper.createSegment(ds, dsNode, dsNode);
169 s1.id = 1;
170 Segment s2 = new Segment(s1);
171 s1.incomplete = true;
172 s2.timestamp = new Date();
173 v.visit(s2);
174 assertTrue(s1.realEqual(s2));
175 }
176 /**
177 * Incomplete segments should extend existing ways.
178 */
179 public void testImportIncompleteExtendWays() throws Exception {
180 Segment s1 = DataSetTestCaseHelper.createSegment(ds, dsNode, dsNode);
181 Way w = DataSetTestCaseHelper.createWay(ds, new Segment[]{s1});
182 s1.id = 1;
183 Segment s2 = new Segment(s1);
184 s1.incomplete = true;
185 v.visit(s2);
186 v.fixReferences();
187 assertEquals(1, w.segments.size());
188 assertEquals(s2, w.segments.get(0));
189 assertFalse(s2.incomplete);
190 }
191
192
193 /**
194 * Nodes beeing merged are equal but should be the same.
195 */
196 @Bug(54)
197 public void testEqualNotSame() {
198 ds = new DataSet();
199 // create a dataset with segment a-b
200 Node n[] = createNodes(ds, 2);
201 Segment ls1 = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
202 ls1.id = 1;
203
204 // create an other dataset with segment a'-c (a' is equal, but not same to a)
205 DataSet ds2 = new DataSet();
206 Node n2[] = createNodes(ds2, 2);
207 n2[0].coor = new LatLon(n[0].coor.lat(), n[0].coor.lon());
208 n2[0].id = 0;
209 n2[1].id = 42;
210
211 Segment ls2 = DataSetTestCaseHelper.createSegment(ds, n2[0], n2[1]);
212 v = new MergeVisitor(ds);
213 for (OsmPrimitive osm : ds2.allPrimitives())
214 osm.visit(v);
215 v.fixReferences();
216
217 assertSame(ls1.from, ls2.from);
218 }
219
220
221 public void testCloneWayNotIncomplete() {
222 DataSet ds = new DataSet();
223 Node[] n = createNodes(ds, 2);
224 Segment s = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
225 Way w = DataSetTestCaseHelper.createWay(ds, s);
226 MergeVisitor v = new MergeVisitor(ds);
227 v.visit(n[0]);
228 v.visit(n[1]);
229 v.visit(s);
230 v.visit(w);
231 Way w2 = new Way(w);
232 w2.timestamp = new Date();
233 Segment s2 = new Segment(s);
234 s2.incomplete = true;
235 w2.segments.clear();
236 w2.segments.add(s2);
237 v.visit(w2);
238 assertSame("Do not import incomplete segments when merging ways.", s, w.segments.iterator().next());
239 }
240
241 /**
242 * When merging an incomplete way over a dataset that contain already all
243 * necessary segments, the way must be completed.
244 */
245 @Bug(117)
246 public void testMergeIncompleteOnExistingDoesNotComplete() {
247 // create a dataset with an segment (as base for the later incomplete way)
248 DataSet ds = new DataSet();
249 Node[] n = createNodes(ds, 2);
250 Segment s = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
251 s.id = 23;
252 // create an incomplete way which references the former segment
253 Way w = new Way();
254 Segment incompleteSegment = new Segment(s.id);
255 w.segments.add(incompleteSegment);
256 w.id = 42;
257 // merge both
258 MergeVisitor v = new MergeVisitor(ds);
259 v.visit(w);
260 v.fixReferences();
261
262 assertTrue(ds.ways.contains(w));
263 assertEquals(1, w.segments.size());
264 assertFalse(w.segments.get(0).incomplete);
265 }
266
267 /**
268 * Deleted segments should be deleted when merged over unchanged segments.
269 * Deleted segments should also raise an conflict when merged over changed segments.
270 */
271 //TODO
272
273 /**
274 * Create that amount of nodes and add them to the dataset. The id will be 1,2,3,4...
275 * @param amount Number of nodes to create.
276 * @return The created nodes.
277 */
278 private Node[] createNodes(DataSet ds, int amount) {
279 Node[] nodes = new Node[amount];
280 for (int i = 0; i < amount; ++i) {
281 nodes[i] = DataSetTestCaseHelper.createNode(ds);
282 nodes[i].id = i+1;
283 }
284 return nodes;
285 }
286}
Note: See TracBrowser for help on using the repository browser.