Changeset 2471 in josm for trunk/test/unit/org

Timestamp:

2009-11-18T18:50:38+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3963: Synchronize does not work

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

@@ -17 +17 @@
 import java.util.logging.Logger;
 
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -62 +63 @@
     }
 
+    @Before
+    public void setUp() {
+        User.clearUserMap();
+    }
+
     /**
      * two identical nodes, even in id and version. No confict expected.
@@ -348 +354 @@
     /**
      * their node is not visible and doesn't exist in my data set
-     * => ignore their node
+     * => we can't ignore it because we'd run into troubles in case of multi fetch
+     * which can return invisible objects
      *
      */
@@ -373 +380 @@
         Node n2 = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE);
         assertEquals(0,visitor.getConflicts().size());
-        assertEquals(1, my.getNodes().size());
+        assertEquals(2, my.getNodes().size());
         assertEquals(n,n2);
     }
@@ -775 +782 @@
         theirWay.addNode(n3);
         theirWay.addNode(n4);
-        theirWay.setUser(User.createOsmUser(1111, "their"));
+        User user = User.createOsmUser(1111, "their");
+        theirWay.setUser(user);
         theirWay.setTimestamp(new Date());
         their.addPrimitive(theirWay);
@@ -895 +903 @@
         theirWay.addNode(n4);
         theirWay.addNode(n5);
-        theirWay.setUser(User.createOsmUser(1111, "their"));
+        User user = User.getById(1111);
+        if (user == null) {
+            User.createOsmUser(1111, "their");
+        }
+        theirWay.setUser(user);
         theirWay.setTimestamp(new Date());
         their.addPrimitive(theirWay);
@@ -1081 +1093 @@
         assertTrue(!w.getNode(1).incomplete);
     }
+
 }