Changeset 16161 in josm for trunk

Timestamp:

2020-03-17T20:09:43+01:00 (5 years ago)

Author:

simon04

Message:

see #18948 - Get rid of remaining com.google.common.collect

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/conflict/tags/TagConflictResolutionUtilTest.java (modified) (10 diffs)
• gui/preferences/plugin/PluginPreferenceHighLevelTest.java (modified) (28 diffs)
• plugins/PluginHandlerJOSMTooOldTest.java (modified) (11 diffs)
• plugins/PluginHandlerMultiVersionTest.java (modified) (7 diffs)
• testutils/PluginServer.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtilTest.java

@@ -11 +11 @@
 import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.Rule;
@@ -21 +22 @@
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import com.google.common.collect.Sets;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -36 +35 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
+
+    @SafeVarargs
+    private static <T> HashSet<T> newHashSet(T... values) {
+        return Arrays.stream(values).collect(Collectors.toCollection(HashSet::new));
+    }
 
     /**
@@ -48 +52 @@
         tc.add(new Tag("building", "garage"));
         TagConflictResolutionUtil.applyAutomaticTagConflictResolution(tc);
-        assertEquals(Sets.newHashSet("school", "garage"), new HashSet<>(tc.getValues("building")));
+        assertEquals(newHashSet("school", "garage"), new HashSet<>(tc.getValues("building")));
 
         // Check US Tiger tag conflict resolution
@@ -55 +59 @@
         tc.add(new Tag("tiger:test", "A"));
         TagConflictResolutionUtil.applyAutomaticTagConflictResolution(tc);
-        assertEquals(Sets.newHashSet("A:B"), new HashSet<>(tc.getValues("tiger:test")));
+        assertEquals(newHashSet("A:B"), new HashSet<>(tc.getValues("tiger:test")));
 
         // Check FR:cadastre source tag conflict resolution (most common values from taginfo except last one without accentuated characters)
@@ -84 +88 @@
         tc.remove(otherSource);
         TagConflictResolutionUtil.applyAutomaticTagConflictResolution(tc);
-        assertEquals(Sets.newHashSet("cadastre-dgi-fr source : Direction Generale des Finances Publiques - Cadastre. Mise a jour : 2015"),
+        assertEquals(newHashSet("cadastre-dgi-fr source : Direction Generale des Finances Publiques - Cadastre. Mise a jour : 2015"),
                 new HashSet<>(tc.getValues("source")));
 
@@ -97 +101 @@
         tc.add(new Tag("source", "NRCan-CanVec-12.0"));
         TagConflictResolutionUtil.applyAutomaticTagConflictResolution(tc);
-        assertEquals(Sets.newHashSet("NRCan-CanVec-12.0"), new HashSet<>(tc.getValues("source")));
+        assertEquals(newHashSet("NRCan-CanVec-12.0"), new HashSet<>(tc.getValues("source")));
     }
 
@@ -209 +213 @@
         public void testResolve() {
             for (AutomaticCombine resolver: differentlyConstructed(new AutomaticCombine("random", "", true, "|", "String"))) {
-                assertEquals(resolver.resolve(Sets.newHashSet("value1", "value2")), "value1|value2");
-                assertEquals(resolver.resolve(Sets.newHashSet("3|1", "4|2|1", "6|05", "3;1")), "05|1|2|3|3;1|4|6");
+                assertEquals(resolver.resolve(newHashSet("value1", "value2")), "value1|value2");
+                assertEquals(resolver.resolve(newHashSet("3|1", "4|2|1", "6|05", "3;1")), "05|1|2|3|3;1|4|6");
             }
 
             for (AutomaticCombine resolver: differentlyConstructed(new AutomaticCombine("test[45].*", "", true, ";", "Integer"))) {
-                assertEquals(resolver.resolve(Sets.newHashSet("1254545;95;24", "25;24;3")), "3;24;25;95;1254545");
+                assertEquals(resolver.resolve(newHashSet("1254545;95;24", "25;24;3")), "3;24;25;95;1254545");
             }
 
             for (AutomaticCombine resolver: differentlyConstructed(new AutomaticCombine("AB", "", true, ";", null))) {
-                String resolution = resolver.resolve(Sets.newHashSet("3;x;1", "4;x"));
+                String resolution = resolver.resolve(newHashSet("3;x;1", "4;x"));
                 assertTrue(resolution.equals("3;x;1;4") || resolution.equals("4;x;3;1"));
             }
@@ -383 +387 @@
             assertEquals(group1.key, choiceKey1Group1.key);
             assertEquals(group1.group, choiceKey1Group1.group);
-            assertEquals(new HashSet<>(group1.choices), Sets.newHashSet(choiceKey1Group1, choiceKey1Group1bis));
+            assertEquals(new HashSet<>(group1.choices), newHashSet(choiceKey1Group1, choiceKey1Group1bis));
 
             groups = AutomaticChoiceGroup.groupChoices(Arrays.asList(
@@ -428 +432 @@
                     choiceKey1Group1.key, choiceKey1Group1.group, choiceKey1Group1.isRegex,
                     Arrays.asList(choiceKey1Group1, choiceKey1Group1bis));
-            assertEquals(group.resolve(Sets.newHashSet(choiceKey1Group1.value)), choiceKey1Group1.value);
-            assertEquals(group.resolve(Sets.newHashSet(choiceKey1Group1.value, choiceKey1Group1bis.value)), choiceKey1Group1bis.value);
-            assertNull(group.resolve(Sets.newHashSet("random", choiceKey1Group1.value, choiceKey1Group1bis.value)));
+            assertEquals(group.resolve(newHashSet(choiceKey1Group1.value)), choiceKey1Group1.value);
+            assertEquals(group.resolve(newHashSet(choiceKey1Group1.value, choiceKey1Group1bis.value)), choiceKey1Group1bis.value);
+            assertNull(group.resolve(newHashSet("random", choiceKey1Group1.value, choiceKey1Group1bis.value)));
 
             group = new AutomaticChoiceGroup(
                     choiceKey2Group1.key, choiceKey2Group2.group, choiceKey2Group2.isRegex,
                     Arrays.asList(choiceKey2Group2, choiceKey2Group2bis));
-            assertEquals(group.resolve(Sets.newHashSet("value1")), "value1");
-            assertEquals(group.resolve(Sets.newHashSet("value1Z", "value2A")), "value1Z");
-            assertEquals(group.resolve(Sets.newHashSet("value1A", "value2Z")), "value2Z");
-            assertNull(group.resolve(Sets.newHashSet("value1Z", "value2A", "other not matched value")));
+            assertEquals(group.resolve(newHashSet("value1")), "value1");
+            assertEquals(group.resolve(newHashSet("value1Z", "value2A")), "value1Z");
+            assertEquals(group.resolve(newHashSet("value1A", "value2Z")), "value2Z");
+            assertNull(group.resolve(newHashSet("value1Z", "value2A", "other not matched value")));
         }
     }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceHighLevelTest.java

@@ -11 +11 @@
 import java.io.File;
 import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.stream.Collectors;
 
 import javax.swing.JOptionPane;
@@ -26 +29 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.PluginProxy;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -35 +39 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import com.google.common.collect.ImmutableList;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -79 +82 @@
             "pluginList"
         );
-        this.originalPluginList = ImmutableList.copyOf(pluginList);
+        this.originalPluginList = new ArrayList<>(pluginList);
         pluginList.clear();
 
@@ -85 +88 @@
         Config.getPref().put("pluginmanager.lastupdate", "999");
         Config.getPref().putList("pluginmanager.sites",
-            ImmutableList.of(String.format("http://localhost:%s/plugins", this.pluginServerRule.port()))
+            Collections.singletonList(String.format("http://localhost:%s/plugins", this.pluginServerRule.port()))
         );
 
@@ -140 +143 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of("dummy_plugin"));
+        Config.getPref().putList("plugins", Collections.singletonList("dummy_plugin"));
 
         final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker(
@@ -181 +184 @@
 
         assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("dummy_plugin"),
-            model.getSelectedPlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("(null)", "31701", "(null)"),
+            Arrays.asList("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
+            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
+        );
+        assertEquals(
+            Collections.singletonList("dummy_plugin"),
+            model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("(null)", "31701", "(null)"),
             model.getAvailablePlugins().stream().map(
                 (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("6", "31772", "2"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(ImmutableList.toImmutableList())
+            ).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("6", "31772", "2"),
+            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
         );
 
@@ -203 +206 @@
 
         assertEquals(
-            ImmutableList.of("baz_plugin"),
-            model.getNewlyActivatedPlugins().stream().map(
-                (pi) -> pi.getName()
-            ).collect(ImmutableList.toImmutableList())
-        );
-        assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());
-        assertEquals(
-            ImmutableList.of("baz_plugin"),
-            model.getPluginsScheduledForUpdateOrDownload().stream().map(
-                (pi) -> pi.getName()
-            ).collect(ImmutableList.toImmutableList())
+            Collections.singletonList("baz_plugin"),
+            model.getNewlyActivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
+        );
+        assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());
+        assertEquals(
+            Collections.singletonList("baz_plugin"),
+            model.getPluginsScheduledForUpdateOrDownload().stream().map(PluginInformation::getName).collect(Collectors.toList())
         );
 
@@ -248 +247 @@
         // baz_plugin should have been added to the plugins list
         assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin"),
-            Config.getPref().getList("plugins", null).stream().sorted().collect(ImmutableList.toImmutableList())
+            Arrays.asList("baz_plugin", "dummy_plugin"),
+            Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList())
         );
     }
@@ -265 +264 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of("baz_plugin", "dummy_plugin"));
+        Config.getPref().putList("plugins", Arrays.asList("baz_plugin", "dummy_plugin"));
 
         final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker(
@@ -305 +304 @@
 
         assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin"),
-            model.getSelectedPlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("6", "31701", "(null)"),
+            Arrays.asList("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
+            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("baz_plugin", "dummy_plugin"),
+            model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("6", "31701", "(null)"),
             model.getAvailablePlugins().stream().map(
                 (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("7", "31772", "(null)"),
+            ).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("7", "31772", "(null)"),
             model.getAvailablePlugins().stream().map(
                 (pi) -> pi.version == null ? "(null)" : pi.version
-            ).collect(ImmutableList.toImmutableList())
+            ).collect(Collectors.toList())
         );
 
@@ -330 +329 @@
         assertTrue(model.getNewlyActivatedPlugins().isEmpty());
         assertEquals(
-            ImmutableList.of("baz_plugin"),
-            model.getNewlyDeactivatedPlugins().stream().map(
-                (pi) -> pi.getName()
-            ).collect(ImmutableList.toImmutableList())
+            Collections.singletonList("baz_plugin"),
+            model.getNewlyDeactivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
         );
         // questionably correct
@@ -369 +366 @@
         // baz_plugin should have been removed from the installed plugins list
         assertEquals(
-            ImmutableList.of("dummy_plugin"),
-            Config.getPref().getList("plugins", null).stream().sorted().collect(ImmutableList.toImmutableList())
+            Collections.singletonList("dummy_plugin"),
+            Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList())
         );
     }
@@ -389 +386 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of("baz_plugin", "dummy_plugin"));
+        Config.getPref().putList("plugins", Arrays.asList("baz_plugin", "dummy_plugin"));
 
         final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker();
@@ -424 +421 @@
 
         assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin"),
-            model.getSelectedPlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("6", "31701"),
+            Arrays.asList("baz_plugin", "dummy_plugin"),
+            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("baz_plugin", "dummy_plugin"),
+            model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("6", "31701"),
             model.getAvailablePlugins().stream().map(
                 (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("7", "31772"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(ImmutableList.toImmutableList())
+            ).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("7", "31772"),
+            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
         );
 
@@ -447 +444 @@
         assertTrue(model.getNewlyActivatedPlugins().isEmpty());
         assertEquals(
-            ImmutableList.of("baz_plugin"),
-            model.getNewlyDeactivatedPlugins().stream().map(
-                pi -> pi.getName()
-            ).collect(ImmutableList.toImmutableList())
+            Collections.singletonList("baz_plugin"),
+            model.getNewlyDeactivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
         );
         // questionably correct
@@ -502 +497 @@
         // plugins list shouldn't have been altered, we haven't hit save yet
         assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin"),
-            Config.getPref().getList("plugins", null).stream().sorted().collect(ImmutableList.toImmutableList())
+                Arrays.asList("baz_plugin", "dummy_plugin"),
+            Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList())
         );
 
@@ -509 +504 @@
         assertTrue(model.getNewlyActivatedPlugins().isEmpty());
         assertEquals(
-            ImmutableList.of("baz_plugin"),
-            model.getNewlyDeactivatedPlugins().stream().map(
-                (pi) -> pi.getName()
-            ).collect(ImmutableList.toImmutableList())
+            Collections.singletonList("baz_plugin"),
+            model.getNewlyDeactivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
         );
         assertTrue(model.getPluginsScheduledForUpdateOrDownload().isEmpty());
@@ -524 +517 @@
         assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());
         assertEquals(
-            ImmutableList.of("baz_plugin"),
-            model.getPluginsScheduledForUpdateOrDownload().stream().map(
-                (pi) -> pi.getName()
-            ).collect(ImmutableList.toImmutableList())
+            Collections.singletonList("baz_plugin"),
+            model.getPluginsScheduledForUpdateOrDownload().stream().map(PluginInformation::getName).collect(Collectors.toList())
         );
 
@@ -584 +575 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of("baz_plugin", "dummy_plugin"));
+        Config.getPref().putList("plugins", Arrays.asList("baz_plugin", "dummy_plugin"));
 
         final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker(
@@ -623 +614 @@
 
         assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin"),
-            model.getSelectedPlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("6", "31701", "(null)"),
+            Arrays.asList("baz_plugin", "dummy_plugin", "irrelevant_plugin"),
+            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("baz_plugin", "dummy_plugin"),
+            model.getSelectedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("6", "31701", "(null)"),
             model.getAvailablePlugins().stream().map(
                 (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("6", "31701", "123"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(ImmutableList.toImmutableList())
+            ).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("6", "31701", "123"),
+            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
         );
 
@@ -676 +667 @@
         // plugins list shouldn't have been altered
         assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin"),
-            Config.getPref().getList("plugins", null).stream().sorted().collect(ImmutableList.toImmutableList())
+            Arrays.asList("baz_plugin", "dummy_plugin"),
+            Config.getPref().getList("plugins", null).stream().sorted().collect(Collectors.toList())
         );
 
@@ -737 +728 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of());
+        Config.getPref().putList("plugins", Collections.emptyList());
 
         final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker();
@@ -772 +763 @@
 
         assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
+            Arrays.asList("baz_plugin", "dummy_plugin"),
+            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
         );
         assertTrue(model.getSelectedPlugins().isEmpty());
         assertEquals(
-            ImmutableList.of("(null)", "(null)"),
+            Arrays.asList("(null)", "(null)"),
             model.getAvailablePlugins().stream().map(
                 (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("7", "31772"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(ImmutableList.toImmutableList())
+            ).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("7", "31772"),
+            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
         );
 
@@ -792 +783 @@
         // model should now reflect this
         assertEquals(
-            ImmutableList.of("dummy_plugin"),
-            model.getNewlyActivatedPlugins().stream().map(
-                pi -> pi.getName()
-            ).collect(ImmutableList.toImmutableList())
+            Collections.singletonList("dummy_plugin"),
+            model.getNewlyActivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
         );
         assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());
@@ -858 +847 @@
             )
         );
-        Config.getPref().putList("plugins", ImmutableList.of());
+        Config.getPref().putList("plugins", Collections.emptyList());
 
         final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker(Collections.singletonMap(
@@ -895 +884 @@
 
         assertEquals(
-            ImmutableList.of("baz_plugin", "dummy_plugin"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.getName()).collect(ImmutableList.toImmutableList())
+            Arrays.asList("baz_plugin", "dummy_plugin"),
+            model.getAvailablePlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
         );
         assertTrue(model.getSelectedPlugins().isEmpty());
         assertEquals(
-            ImmutableList.of("(null)", "(null)"),
+            Arrays.asList("(null)", "(null)"),
             model.getAvailablePlugins().stream().map(
                 (pi) -> pi.localversion == null ? "(null)" : pi.localversion
-            ).collect(ImmutableList.toImmutableList())
-        );
-        assertEquals(
-            ImmutableList.of("6", "31772"),
-            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(ImmutableList.toImmutableList())
+            ).collect(Collectors.toList())
+        );
+        assertEquals(
+            Arrays.asList("6", "31772"),
+            model.getAvailablePlugins().stream().map((pi) -> pi.version).collect(Collectors.toList())
         );
 
@@ -915 +904 @@
         // model should now reflect this
         assertEquals(
-            ImmutableList.of("baz_plugin"),
-            model.getNewlyActivatedPlugins().stream().map(
-                pi -> pi.getName()
-            ).collect(ImmutableList.toImmutableList())
+            Collections.singletonList("baz_plugin"),
+            model.getNewlyActivatedPlugins().stream().map(PluginInformation::getName).collect(Collectors.toList())
         );
         assertTrue(model.getNewlyDeactivatedPlugins().isEmpty());

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

@@ -10 +10 @@
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.junit.Before;
@@ -27 +31 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import com.google.common.collect.ImmutableList;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -60 +63 @@
         Config.getPref().put("pluginmanager.lastupdate", "999");
         Config.getPref().putList("pluginmanager.sites",
-            ImmutableList.of(String.format("http://localhost:%s/plugins", this.pluginServerRule.port()))
+                Collections.singletonList(String.format("http://localhost:%s/plugins", this.pluginServerRule.port()))
         );
 
@@ -114 +117 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of("dummy_plugin", "baz_plugin"));
+        Config.getPref().putList("plugins", Arrays.asList("dummy_plugin", "baz_plugin"));
 
         final ExtendedDialogMocker edMocker = new ExtendedDialogMocker();
@@ -128 +131 @@
             null,
             false
-        ).stream().sorted((a, b) -> a.name.compareTo(b.name)).collect(ImmutableList.toImmutableList());
+        ).stream().sorted(Comparator.comparing(a -> a.name)).collect(Collectors.toList());
 
         assertEquals(
-            ImmutableList.of(
-                this.dummyPluginVersionReqString,
-                this.bazPluginVersionReqString
-            ),
+                Arrays.asList(
+                        this.dummyPluginVersionReqString,
+                        this.bazPluginVersionReqString
+                ),
             edMocker.getInvocationLog().stream().map(
                 invocationEntry -> invocationEntry[1]
-            ).sorted().collect(ImmutableList.toImmutableList())
+            ).sorted().collect(Collectors.toList())
         );
 
@@ -176 +179 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of("dummy_plugin", "baz_plugin"));
+        Config.getPref().putList("plugins", Arrays.asList("dummy_plugin", "baz_plugin"));
 
         final ExtendedDialogMocker edMocker = new ExtendedDialogMocker();
@@ -192 +195 @@
             null,
             false
-        ).stream().sorted((a, b) -> a.name.compareTo(b.name)).collect(ImmutableList.toImmutableList());
+        ).stream().sorted(Comparator.comparing(a -> a.name)).collect(Collectors.toList());
 
         assertEquals(
-            ImmutableList.of(
-                this.dummyPluginVersionReqString,
-                this.bazPluginVersionReqString
-            ),
+                Arrays.asList(
+                        this.dummyPluginVersionReqString,
+                        this.bazPluginVersionReqString
+                ),
             edMocker.getInvocationLog().stream().map(
                 invocationEntry -> invocationEntry[1]
-            ).sorted().collect(ImmutableList.toImmutableList())
-        );
-
-        assertEquals(
-            ImmutableList.of(
-                this.dummyPluginFailedString
-            ),
+            ).sorted().collect(Collectors.toList())
+        );
+
+        assertEquals(Collections.singletonList(this.dummyPluginFailedString),
             haMocker.getInvocationLog().stream().map(
                 invocationEntry -> invocationEntry[1]
-            ).sorted().collect(ImmutableList.toImmutableList())
+            ).sorted().collect(Collectors.toList())
         );
 
@@ -251 +251 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of("baz_plugin"));
+        Config.getPref().putList("plugins", Collections.singletonList("baz_plugin"));
 
         // setting up blank ExtendedDialogMocker which would raise an exception if any attempt to show
@@ -259 +259 @@
         Files.copy(this.referenceBazJarOld.toPath(), this.targetBazJar.toPath());
 
-        final List<PluginInformation> updatedPlugins = ImmutableList.copyOf(PluginHandler.updatePlugins(
+        final List<PluginInformation> updatedPlugins = new ArrayList<>(PluginHandler.updatePlugins(
             MainApplication.getMainFrame(),
             null,
@@ -309 +309 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of("qux_plugin", "baz_plugin"));
+        Config.getPref().putList("plugins", Arrays.asList("qux_plugin", "baz_plugin"));
 
         new ExtendedDialogMocker(Collections.singletonMap("JOSM version 7,500 required for plugin qux_plugin.", "Download Plugin"));
@@ -321 +321 @@
             null,
             false
-        ).stream().sorted((a, b) -> a.name.compareTo(b.name)).collect(ImmutableList.toImmutableList());
+        ).stream().sorted(Comparator.comparing(a -> a.name)).collect(Collectors.toList());
 
         assertEquals(2, updatedPlugins.size());

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

@@ -9 +9 @@
 import java.io.File;
 import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.junit.Before;
@@ -26 +30 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import com.google.common.collect.ImmutableList;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -57 +60 @@
         Config.getPref().put("pluginmanager.lastupdate", "999");
         Config.getPref().putList("pluginmanager.sites",
-            ImmutableList.of(String.format("http://localhost:%s/plugins", this.pluginServerRule.port()))
+                Collections.singletonList(String.format("http://localhost:%s/plugins", this.pluginServerRule.port()))
         );
 
@@ -115 +118 @@
             )
         );
-        Config.getPref().putList("plugins", ImmutableList.of("qux_plugin", "baz_plugin"));
+        Config.getPref().putList("plugins", Arrays.asList("qux_plugin", "baz_plugin"));
 
         // catch any (unexpected) attempts to show us an ExtendedDialog
@@ -128 +131 @@
             null,
             false
-        ).stream().sorted((a, b) -> a.name.compareTo(b.name)).collect(ImmutableList.toImmutableList());
+        ).stream().sorted(Comparator.comparing(a -> a.name)).collect(Collectors.toList());
 
         assertEquals(2, updatedPlugins.size());
@@ -173 +176 @@
         );
         pluginServer.applyToWireMockServer(this.pluginServerRule);
-        Config.getPref().putList("plugins", ImmutableList.of("qux_plugin", "baz_plugin"));
+        Config.getPref().putList("plugins", Arrays.asList("qux_plugin", "baz_plugin"));
 
         // catch any (unexpected) attempts to show us an ExtendedDialog
@@ -186 +189 @@
             null,
             false
-        ).stream().sorted((a, b) -> a.name.compareTo(b.name)).collect(ImmutableList.toImmutableList());
+        ).stream().sorted(Comparator.comparing(a -> a.name)).collect(Collectors.toList());
 
         assertEquals(2, updatedPlugins.size());

trunk/test/unit/org/openstreetmap/josm/testutils/PluginServer.java

@@ -7 +7 @@
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -13 +14 @@
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 import org.junit.runner.Description;
@@ -25 +27 @@
 import com.github.tomakehurst.wiremock.core.Options;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Streams;
 
 public class PluginServer {
@@ -120 +120 @@
                 if (jarPath.startsWith(filesRootPath)) {
                     // would just use .toString() but need to force use of *forward slash* path separators on all platforms
-                    return Streams.stream(filesRootPath.relativize(jarPath)).map(p -> p.toString()).collect(Collectors.joining("/"));
+                    final Path path = filesRootPath.relativize(jarPath);
+                    return StreamSupport.stream(path.spliterator(), false)
+                            .map(Path::toString)
+                            .collect(Collectors.joining("/"));
                 }
             }
@@ -187 +190 @@
 
     public PluginServer(RemotePlugin... remotePlugins) {
-        this.pluginList = ImmutableList.copyOf(remotePlugins);
+        this.pluginList = Arrays.asList(remotePlugins);
     }