Changeset 15716 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2020-01-18T14:13:56+01:00 (4 years ago)

Author:

simon04

Message:

Java 8: use String.join

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/projection/ProjectionRefTest.java (modified) (4 diffs)
• gui/io/CustomConfiguratorTest.java (modified) (2 diffs)

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

@@ -32 +32 @@
 import java.util.regex.Pattern;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -42 +43 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.PlatformManager;
-import org.openstreetmap.josm.tools.Utils;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -323 +321 @@
             }
         } catch (IOException e) {
-            System.err.println("Error: Running external command failed: " + e + "\nCommand was: "+Utils.join(" ", args));
+            System.err.println("Error: Running external command failed: " + e + "\nCommand was: " + String.join(" ", args));
             return null;
         }
@@ -341 +339 @@
             return new EastNorth(Double.parseDouble(es), Double.parseDouble(ns));
         } catch (NumberFormatException nfe) {
-            System.err.println("Error: Cannot parse cs2cs output: '" + es + "', '" + ns + "'" + "\nCommand was: "+Utils.join(" ", args));
+            System.err.println("Error: Cannot parse cs2cs output: '" + es + "', '" + ns + "'" + "\nCommand was: " + String.join(" ", args));
             return null;
         }

trunk/test/unit/org/openstreetmap/josm/gui/io/CustomConfiguratorTest.java

@@ -55 +55 @@
                 "Mauris ac mauris sed pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales hendrerit."));
         CustomConfigurator.exportPreferencesKeysToFile(tmp.getAbsolutePath(), false, "lorem_ipsum");
-        String xml = Utils.join("\n", Files.readAllLines(tmp.toPath(), StandardCharsets.UTF_8));
+        String xml = String.join("\n", Files.readAllLines(tmp.toPath(), StandardCharsets.UTF_8));
         assertTrue(xml.contains("<preferences operation=\"replace\">"));
         for (String entry : Config.getPref().getList("lorem_ipsum")) {
@@ -63 +63 @@
         Config.getPref().putList("test", Arrays.asList("11111111", "2222222", "333333333"));
         CustomConfigurator.exportPreferencesKeysByPatternToFile(tmp.getAbsolutePath(), true, "test");
-        xml = Utils.join("\n", Files.readAllLines(tmp.toPath(), StandardCharsets.UTF_8));
+        xml = String.join("\n", Files.readAllLines(tmp.toPath(), StandardCharsets.UTF_8));
         assertTrue(xml.contains("<preferences operation=\"append\">"));
         for (String entry : Config.getPref().getList("test")) {