Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java	(revision 16952)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java	(revision 16953)
@@ -142,5 +142,5 @@
         List<String> ways = osm.getWays().stream()
                 .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream()
-                        .sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey())).collect(Collectors.toList()).toString())
+                        .sorted(Comparator.comparing(Map.Entry::getKey)).collect(Collectors.toList()).toString())
                 .sorted()
                 .collect(Collectors.toList());
@@ -148,5 +148,5 @@
         List<String> waysExpected = osmExpected.getWays().stream()
                 .map(w -> Integer.toString(w.getNodes().size()) + ":" + w.getKeys().entrySet().stream()
-                        .sorted((e1, e2) -> e1.getKey().compareTo(e2.getKey())).collect(Collectors.toList()).toString())
+                        .sorted(Comparator.comparing(Map.Entry::getKey)).collect(Collectors.toList()).toString())
                 .sorted()
                 .collect(Collectors.toList());