Changeset 16436 in josm for trunk/test

Timestamp:

2020-05-17T12:08:17+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/imagery/ShapeTest.java (added)
• data/osm/ChangesetTest.java (modified) (2 diffs)
• data/projection/ProjectionRegressionTest.java (modified) (3 diffs)
• io/GeoJSONReaderTest.java (modified) (2 diffs)
• io/remotecontrol/RemoteControlTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java

@@ -13 +13 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.junit.Assert;
@@ -65 +67 @@
         // Add a map with too long values => IllegalArgumentException
         keys = new HashMap<>();
-        StringBuilder b = new StringBuilder(MAX_CHANGESET_TAG_LENGTH + 1);
-        for (int i = 0; i < MAX_CHANGESET_TAG_LENGTH + 1; i++) {
-           b.append("x");
-        }
-        keys.put("test", b.toString());
+        // Java 11: use String.repeat
+        keys.put("test", IntStream.range(0, MAX_CHANGESET_TAG_LENGTH + 1).mapToObj(i -> "x").collect(Collectors.joining()));
         try {
             cs.setKeys(keys);

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -13 +13 @@
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -19 +18 @@
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 import org.junit.BeforeClass;
@@ -160 +160 @@
     public void testNonRegression() throws IOException {
         List<TestData> allData = readData();
-        Set<String> dataCodes = new HashSet<>();
-        for (TestData data : allData) {
-            dataCodes.add(data.code);
-        }
+        Set<String> dataCodes = allData.stream().map(data -> data.code).collect(Collectors.toSet());
 
         StringBuilder fail = new StringBuilder();

trunk/test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java

@@ -15 +15 @@
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.IntStream;
 
 import org.junit.Rule;
@@ -160 +161 @@
             return false;
         }
-        for (int i = 0; i < ((Way) p1).getNodes().size(); i++) {
-            if (!areEqualNodes(((Way) p1).getNode(i), ((Way) p2).getNode(i))) {
-                return false;
-            }
-        }
-        return true;
+        return IntStream.range(0, ((Way) p1).getNodes().size())
+                .allMatch(i -> areEqualNodes(((Way) p1).getNode(i), ((Way) p2).getNode(i)));
     }
 }

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/RemoteControlTest.java

@@ -13 +13 @@
 import java.security.GeneralSecurityException;
 import java.security.KeyStore.TrustedCertificateEntry;
+import java.util.stream.Collectors;
 
 import org.junit.After;
@@ -88 +89 @@
         try (InputStream is = connection.getErrorStream()) {
             // TODO this code should be refactored somewhere in Utils as it is used in several JOSM classes
-            StringBuilder responseBody = new StringBuilder();
+            String responseBody;
             try (BufferedReader in = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
-                String s;
-                while ((s = in.readLine()) != null) {
-                    responseBody.append(s);
-                    responseBody.append("\n");
-                }
+                responseBody = in.lines().collect(Collectors.joining("\n"));
             }
-            assert responseBody.toString().contains(RequestProcessor.getUsageAsHtml());
+            assert responseBody.contains(RequestProcessor.getUsageAsHtml());
         }
     }