Changeset 15822 in josm for trunk/test/unit

Timestamp:

2020-02-06T21:05:35+01:00 (5 years ago)

Author:

GerdP

Message:

see #18654: Fix unit test
OsmPrimitiveComparator.comparingUniqueId() no longer works because test creates a node with -1 and a way with -1 now. I see no need to store the elements in an unordered set and sort again later.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java

@@ -5 +5 @@
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
@@ -11 +10 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveComparator;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -32 +29 @@
     public JOSMTestRules test = new JOSMTestRules();
 
-    private static String createSearchSetting(DataSet ds, boolean sameType) {
-        List<OsmPrimitive> sel = new ArrayList<>(ds.allPrimitives());
-        Collections.sort(sel, OsmPrimitiveComparator.comparingUniqueId());
+    private static String createSearchSetting(List<OsmPrimitive> sel, boolean sameType) {
         return PropertiesDialog.createSearchSetting("foo", sel, sameType).text;
     }
@@ -43 +38 @@
     @Test
     public void testTicket12504() {
-        DataSet ds = new DataSet();
+        List<OsmPrimitive> sel = new ArrayList<>();
         // 160 objects with foo=bar, 400 objects without foo
         for (int i = 0; i < 160+400; i++) {
@@ -50 +45 @@
                 n.put("foo", "bar");
             }
-            ds.addPrimitive(n);
+            sel.add(n);
         }
-        assertEquals("(\"foo\"=\"bar\")", createSearchSetting(ds, false));
+        assertEquals("(\"foo\"=\"bar\")", createSearchSetting(sel, false));
 
         Node n = new Node(LatLon.ZERO);
         n.put("foo", "baz");
-        ds.addPrimitive(n);
+        sel.add(0, n);
 
-        assertEquals("(\"foo\"=\"baz\") OR (\"foo\"=\"bar\")", createSearchSetting(ds, false));
+        assertEquals("(\"foo\"=\"baz\") OR (\"foo\"=\"bar\")", createSearchSetting(sel, false));
 
-        ds.removePrimitive(n);
+        sel.remove(0);
 
         Way w = new Way();
         w.put("foo", "bar");
-        ds.addPrimitive(w);
+        sel.add(0, w);
 
-        assertEquals("(type:way \"foo\"=\"bar\") OR (type:node \"foo\"=\"bar\")", createSearchSetting(ds, true));
+        assertEquals("(type:way \"foo\"=\"bar\") OR (type:node \"foo\"=\"bar\")", createSearchSetting(sel, true));
     }
 }