Changeset 15717 in josm for trunk/test

Timestamp:

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

Author:

simon04

Message:

Java 8: use Collectors.joining

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (5 diffs)
• unit/org/openstreetmap/josm/io/MultiFetchOverpassObjectReaderTest.java (added)
• unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java (modified) (3 diffs)

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -18 +18 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Locale;
 import java.util.Random;
+import java.util.TreeSet;
 import java.util.logging.Logger;
 
@@ -35 +37 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -42 +45 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 /**
@@ -49 +53 @@
 public class MultiFetchServerObjectReaderTest {
     private static Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName());
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().preferences();
 
     /**
@@ -332 +343 @@
         assertEquals(9999999, reader.getMissingPrimitives().iterator().next().getUniqueId());
     }
+
+    /**
+     * Test {@link MultiFetchServerObjectReader#buildRequestString}
+     */
+    @Test
+    public void testBuildRequestString() {
+        String requestString = new MultiFetchServerObjectReader()
+                .buildRequestString(OsmPrimitiveType.WAY, new TreeSet<>(Arrays.asList(130L, 123L, 126L)));
+        assertEquals("ways?ways=123,126,130", requestString);
+    }
 }

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);