Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java	(revision 16436)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTestFT.java	(revision 16438)
@@ -3,4 +3,6 @@
 
 import java.awt.BorderLayout;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import javax.swing.JFrame;
@@ -22,9 +24,7 @@
             n1.put("key" + i, "value" + i);
         }
-        StringBuilder note = new StringBuilder();
-        for (int i = 0; i < 50; i++) {
-            note.append(" A very long text ");
-        }
-        n1.put("note", note.toString());
+        // Java 11: use String.repeat
+        String note = IntStream.range(0, 50).mapToObj(i -> " A very long text ").collect(Collectors.joining());
+        n1.put("note", note);
         w1.addNode(new Node(2));
         w1.addNode(new Node(3));
Index: trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 16436)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java	(revision 16438)
@@ -183,9 +183,5 @@
 
     private static double getOriginalLength(Collection<Way> ways) {
-        double len = 0;
-        for (Way w : ways) {
-            len += w.getLength();
-        }
-        return len;
+        return ways.stream().mapToDouble(Way::getLength).sum();
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 16436)
+++ trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 16438)
@@ -234,11 +234,8 @@
         Set<RelationMember> matchCandidates = new HashSet<>(r2.getMembers());
         for (RelationMember rm : r1.getMembers()) {
-            RelationMember matched = null;
-            for (RelationMember cand : matchCandidates) {
-                if (!rm.getRole().equals(cand.getRole())) continue;
-                if (!isSemanticallyEqual(rm.getMember(), cand.getMember())) continue;
-                matched = cand;
-                break;
-            }
+            RelationMember matched = matchCandidates.stream()
+                    .filter(m -> rm.getRole().equals(m.getRole()))
+                    .filter(m -> isSemanticallyEqual(rm.getMember(), m.getMember()))
+                    .findFirst().orElse(null);
             if (matched == null) return false;
             matchCandidates.remove(matched);
Index: trunk/test/unit/org/openstreetmap/josm/data/coor/conversion/ICoordinateFormatTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/coor/conversion/ICoordinateFormatTest.java	(revision 16436)
+++ trunk/test/unit/org/openstreetmap/josm/data/coor/conversion/ICoordinateFormatTest.java	(revision 16438)
@@ -8,4 +8,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -25,4 +26,5 @@
      * Tests {@link ICoordinateFormat#latToString(org.openstreetmap.josm.data.coor.ILatLon)}
      * and {@link ICoordinateFormat#lonToString(org.openstreetmap.josm.data.coor.ILatLon)}
+     * and {@link ICoordinateFormat#toString(ILatLon, String)}
      * for various implementations.
      */
@@ -32,6 +34,8 @@
         assertEquals("47.0", DecimalDegreesCoordinateFormat.INSTANCE.latToString(c));
         assertEquals("19.0", DecimalDegreesCoordinateFormat.INSTANCE.lonToString(c));
+        assertEquals("47.0 19.0", DecimalDegreesCoordinateFormat.INSTANCE.toString(c, " "));
         assertEquals("47°00'00.0\"N", DMSCoordinateFormat.INSTANCE.latToString(c));
         assertEquals("19°00'00.0\"E", DMSCoordinateFormat.INSTANCE.lonToString(c));
+        assertEquals("47°00'00.0\"N  19°00'00.0\"E", DMSCoordinateFormat.INSTANCE.toString(c, "  "));
         assertEquals("47°00.000'N", NauticalCoordinateFormat.INSTANCE.latToString(c));
         assertEquals("19°00.000'E", NauticalCoordinateFormat.INSTANCE.lonToString(c));
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java	(revision 16436)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java	(revision 16438)
@@ -52,17 +52,9 @@
 
     private Relation getRelation(String testType) {
-        for (Relation r: testDataset.getRelations()) {
-            if (testType.equals(r.get("test")))
-                return r;
-        }
-        return null;
+        return testDataset.getRelations().stream().filter(r -> testType.equals(r.get("test"))).findFirst().orElse(null);
     }
 
     private String[] getNames(List<RelationMember> members) {
-        String[] result = new String[members.size()];
-        for (int i = 0; i < result.length; i++) {
-            result[i] = members.get(i).getMember().get("name");
-        }
-        return result;
+        return members.stream().map(member -> member.getMember().get("name")).toArray(String[]::new);
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java	(revision 16436)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java	(revision 16438)
@@ -59,9 +59,5 @@
 
     private Relation getRelation(String testType) {
-        for (Relation r: testDataset.getRelations()) {
-            if (testType.equals(r.get("test")))
-                return r;
-        }
-        return null;
+        return testDataset.getRelations().stream().filter(r -> testType.equals(r.get("test"))).findFirst().orElse(null);
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java	(revision 16436)
+++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java	(revision 16438)
@@ -20,4 +20,5 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.imageio.ImageIO;
@@ -280,5 +281,5 @@
         // |  8  3  7  |
         // +-----------+
-        for (LatLon candidate : new LatLon[] {
+        return Stream.of(
                 new LatLon(y1, x2),
                 new LatLon(y2, x3),
@@ -289,10 +290,5 @@
                 new LatLon(y3, x3),
                 new LatLon(y3, x1)
-        }) {
-            if (shape.contains(candidate)) {
-                return candidate;
-            }
-        }
-        return center;
+        ).filter(shape::contains).findFirst().orElse(center);
     }