Changeset 2448 in josm for trunk/test/functional/org/openstreetmap

Timestamp:

2009-11-14T17:59:10+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3352: History doesn't get invalidated on upload?
fixed #3912: Extend history dialog to contain the currently modified version
new: zoom to node in list of nodes in history dialog (popup menu)
new: load history of node from node list in history dialog (popup menu or double click)
fixed: close all history dialogs when the number of layers drop to 0
fixed: implemented equals() and hashCode() on SimplePrimitiveId
fixed: history features now usePrimitiveId instead of long.

Location:

trunk/test/functional/org/openstreetmap/josm

Files:

• gui/history/HistoryBrowserTest.java (modified) (2 diffs)
• io/OsmServerHistoryReaderTest.java (modified) (3 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java

@@ -16 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.history.History;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
@@ -78 +79 @@
             return;
         }
-        History h = ds.getHistory(id);
+        History h = ds.getHistory(new SimplePrimitiveId(id, type));
         browser.populate(h);
     }

trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java

@@ -22 +22 @@
         OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.NODE,266187);
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
-        History h = ds.getHistory(266187);
+        History h = ds.getHistory(266187, OsmPrimitiveType.NODE);
         System.out.println("num versions: " + h.getNumVersions());
     }
@@ -30 +30 @@
         OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.WAY,32916);
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
-        History h = ds.getHistory(32916);
+        History h = ds.getHistory(32916, OsmPrimitiveType.WAY);
         System.out.println("num versions: " + h.getNumVersions());
     }
@@ -38 +38 @@
         OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.RELATION,49);
         HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE);
-        History h = ds.getHistory(49);
+        History h = ds.getHistory(49, OsmPrimitiveType.RELATION);
         System.out.println("num versions: " + h.getNumVersions());
     }