Changeset 203 in josm for test/org

Timestamp:

2007-02-17T17:09:49+01:00 (17 years ago)

Author:

imi

Message:

• Fixed a bug in the Merger/Conflict to auto-resolve marked changes without real changes
• Fixed bug in split way, that reversed the order of segments in one way.
• Fixed bug where dialogs did not update anymore after loading a dataset twice

Location:

test/org/openstreetmap/josm/data

Files:

• conflict/MergerTest.java (deleted)
• osm/DataSetTest.java (modified) (2 diffs)
• osm/NodeTest.java (modified) (1 diff)
• osm/SegmentTest.java (modified) (2 diffs)
• osm/WayTest.java (modified) (2 diffs)
• osm/visitor/MergeVisitorTest.java (modified) (2 diffs)

test/org/openstreetmap/josm/data/osm/DataSetTest.java

@@ -77 +77 @@
         public void testFireSelectionChanged() {
                 TestSelectionChangeListener l = new TestSelectionChangeListener();
-                ds.addSelectionChangedListener(l);
+                ds.listeners.add(l);
                 ds.setSelected(segment);
                 assertNotNull(l.called);
@@ -84 +84 @@
         }
 
-        public void testAddRemoveSelectionChangedListener() {
-                TestSelectionChangeListener l = new TestSelectionChangeListener();
-                ds.addSelectionChangedListener(l);
-                ds.removeSelectionChangedListener(l);
-                ds.setSelected(way);
-                assertNull(l.called);
-        }
-
         public void testAddAllSelectionListener() {
                 DataSet ds2 = new DataSet();
                 TestSelectionChangeListener l1 = new TestSelectionChangeListener();
                 TestSelectionChangeListener l2 = new TestSelectionChangeListener();
-                ds2.addSelectionChangedListener(l1);
-                ds2.addSelectionChangedListener(l2);
-                ds.addAllSelectionListener(ds2);
-                ds2.removeSelectionChangedListener(l1);
+                ds2.listeners.add(l1);
+                ds2.listeners.add(l2);
+                ds.listeners.addAll(ds2.listeners);
+                ds2.listeners.remove(l1);
                 ds.setSelected(node2);
                 assertNotNull(l1.called);
                 assertNotNull(l2.called);
         }
-
-        public void testRealEqual() {
-                Collection<OsmPrimitive> all = new LinkedList<OsmPrimitive>();
-                all.add(new Node(node1));
-                all.add(new Node(node2));
-                all.add(new Node(node3));
-                all.add(createSegment(segment.id, node1, node2));
-                all.add(createWay(way.id, way.segments.iterator().next()));
-                assertTrue(ds.realEqual(all));
-        }
 }

test/org/openstreetmap/josm/data/osm/NodeTest.java

@@ -21 +21 @@
         public void testCloneFromRealEqual() {
                 Node node2 = createNode(23,3,4);
-                assertFalse(node2.realEqual(node));
-                assertFalse(node.realEqual(node2));
+                assertFalse(node2.realEqual(node, false));
+                assertFalse(node.realEqual(node2, false));
                 node.cloneFrom(node2);
-                assertTrue(node2.realEqual(node));
-                assertTrue(node.realEqual(node2));
+                assertTrue(node2.realEqual(node, false));
+                assertTrue(node.realEqual(node2, false));
         }
 
         public void testNodeNode() {
                 Node node2 = new Node(node);
-                assertTrue(node2.realEqual(node));
+                assertTrue(node2.realEqual(node, false));
         }
 

test/org/openstreetmap/josm/data/osm/SegmentTest.java

@@ -21 +21 @@
                 Segment s2 = createSegment(23, createNode(1,2,3), createNode(2,3,4));
                 segment.cloneFrom(s2);
-                assertTrue(segment.realEqual(s2));
-                assertTrue(s2.realEqual(segment));
+                assertTrue(segment.realEqual(s2, false));
+                assertTrue(s2.realEqual(segment, false));
                 assertSame(segment.from, s2.from);
                 assertSame(segment.to, s2.to);
@@ -29 +29 @@
         public void testSegmentSegment() {
                 Segment s = new Segment(segment);
-                assertTrue(s.realEqual(segment));
+                assertTrue(s.realEqual(segment, false));
         }
 

test/org/openstreetmap/josm/data/osm/WayTest.java

@@ -21 +21 @@
                 Way w2 = createWay(42);
                 way.cloneFrom(w2);
-                assertTrue(way.realEqual(w2));
+                assertTrue(way.realEqual(w2, false));
                 assertEquals(w2.segments.size(), way.segments.size());
         }
@@ -28 +28 @@
                 Way w = new Way(way);
                 assertEquals(way.id, w.id);
-                assertTrue(way.realEqual(w));
+                assertTrue(way.realEqual(w, false));
         }
 

test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -197 +197 @@
                 s2.timestamp = new Date();
                 v.visit(s2);
-                assertTrue(s1.realEqual(s2));
+                assertTrue(s1.realEqual(s2, false));
         }
         /**
@@ -312 +312 @@
                 assertEquals(1, ds.segments.size());
     }
-        
+
+        /**
+         * The merger should auto-resolve items, that have not changed but are marked as
+         * changed. In the case where an unmodified newer item is merged over an modified
+         * older, the modified-flag should be removed and the newer timestamp is used.
+         */
+        public void testMergeModifiedWithOlderTimestampOverUnmodifiedNewerDoesNotConflict() throws Exception {
+                DataSet ds = new DataSet();
+
+                Node oldNode = createNodes(ds, 1)[0];
+                oldNode.modified = true;
+                oldNode.timestamp = new Date();
+                
+                Node newNode = new Node(oldNode);
+                Date date = new Date(oldNode.timestamp.getTime()+10000);
+                newNode.modified = false;
+                newNode.timestamp = new Date(date.getTime());
+                
+                MergeVisitor v = new MergeVisitor(ds);
+                v.visit(newNode);
+
+                assertEquals(0, v.conflicts.size());
+                assertEquals(date, ds.nodes.iterator().next().timestamp);
+                assertFalse(ds.nodes.iterator().next().modified);
+        }
 }