Changeset 15723 in josm

Timestamp:

2020-01-18T21:42:25+01:00 (4 years ago)

Author:

simon04

Message:

Fix unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/MultiMapTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java

@@ -11 +11 @@
 import java.util.Locale;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
@@ -311 +312 @@
     @NullableArguments
     public static String concat(Object... args) { // NO_UCD (unused code)
-        return Arrays.stream(args).map(String::valueOf).collect(Collectors.joining());
+        return Arrays.stream(args)
+                .filter(Objects::nonNull)
+                .map(String::valueOf)
+                .collect(Collectors.joining());
     }
 

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

@@ -71 +71 @@
         try {
             final String plugins = Stream.concat(
-                    PluginHandler.DEPRECATED_PLUGINS.stream(),
+                    PluginHandler.DEPRECATED_PLUGINS.stream().map(p -> p.name),
                     PluginHandler.UNMAINTAINED_PLUGINS.stream()
-            ).map(String::valueOf).collect(Collectors.joining(","));
+            ).collect(Collectors.joining(","));
             System.setProperty("josm.plugins", plugins);
             List<PluginInformation> list = PluginHandler.buildListOfPluginsToLoad(null, null);

trunk/test/unit/org/openstreetmap/josm/tools/MultiMapTest.java

@@ -51 +51 @@
         map.remove("foo");
         assertEquals(null, map.get("foo"));
-        assertEquals("(alpha->{})", map.toString());
+        assertEquals("(alpha->[])", map.toString());
         map.remove("alpha");
         assertTrue(map.isEmpty());