Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java	(revision 10123)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialogTest.java	(revision 10127)
@@ -3,4 +3,8 @@
 
 import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import org.junit.BeforeClass;
@@ -10,4 +14,6 @@
 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;
 
@@ -23,4 +29,10 @@
     public static void setUpBeforeClass() {
         JOSMFixture.createUnitTestFixture().init();
+    }
+
+    private static String createSearchSetting(DataSet ds, boolean sameType) {
+        List<OsmPrimitive> sel = new ArrayList<>(ds.allPrimitives());
+        Collections.sort(sel, new OsmPrimitiveComparator(true, false));
+        return PropertiesDialog.createSearchSetting("foo", sel, sameType).text;
     }
 
@@ -39,6 +51,5 @@
             ds.addPrimitive(n);
         }
-        assertEquals("(\"foo\"=\"bar\")",
-                PropertiesDialog.createSearchSetting("foo", ds.allPrimitives(), false).text);
+        assertEquals("(\"foo\"=\"bar\")", createSearchSetting(ds, false));
 
         Node n = new Node(LatLon.ZERO);
@@ -46,6 +57,5 @@
         ds.addPrimitive(n);
 
-        assertEquals("(\"foo\"=\"bar\") OR (\"foo\"=\"baz\")",
-                PropertiesDialog.createSearchSetting("foo", ds.allPrimitives(), false).text);
+        assertEquals("(\"foo\"=\"baz\") OR (\"foo\"=\"bar\")", createSearchSetting(ds, false));
 
         ds.removePrimitive(n);
@@ -55,6 +65,5 @@
         ds.addPrimitive(w);
 
-        assertEquals("(type:node \"foo\"=\"bar\") OR (type:way \"foo\"=\"bar\")",
-                PropertiesDialog.createSearchSetting("foo", ds.allPrimitives(), true).text);
+        assertEquals("(type:way \"foo\"=\"bar\") OR (type:node \"foo\"=\"bar\")", createSearchSetting(ds, true));
     }
 }