Changeset 15717 in josm for trunk/test/unit/org

Timestamp:

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

Author:

simon04

Message:

Java 8: use Collectors.joining

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• io/MultiFetchOverpassObjectReaderTest.java (added)
• plugins/PluginHandlerTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java

@@ -10 +10 @@
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.swing.JScrollPane;
@@ -24 +26 @@
 import org.openstreetmap.josm.testutils.mockers.HelpAwareOptionPaneMocker;
 import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker;
-import org.openstreetmap.josm.tools.Utils;
-
 import com.google.common.collect.ImmutableMap;
 
@@ -70 +70 @@
         final String old = System.getProperty("josm.plugins");
         try {
-            System.setProperty("josm.plugins",
-                    Utils.join(",", PluginHandler.DEPRECATED_PLUGINS) + "," +
-                    Utils.join(",", Arrays.asList(PluginHandler.UNMAINTAINED_PLUGINS)));
+            final String plugins = Stream.concat(
+                    PluginHandler.DEPRECATED_PLUGINS.stream(),
+                    PluginHandler.UNMAINTAINED_PLUGINS.stream()
+            ).map(String::valueOf).collect(Collectors.joining(","));
+            System.setProperty("josm.plugins", plugins);
             List<PluginInformation> list = PluginHandler.buildListOfPluginsToLoad(null, null);
             assertNotNull(list);