Index: trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java (revision 15736) +++ trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java (revision 15737) @@ -13,4 +13,5 @@ import java.util.stream.Stream; +import javax.swing.JOptionPane; import javax.swing.JScrollPane; @@ -26,4 +27,5 @@ import org.openstreetmap.josm.testutils.mockers.HelpAwareOptionPaneMocker; import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker; + import com.google.common.collect.ImmutableMap; @@ -58,14 +60,12 @@ public void testBuildListOfPluginsToLoad() { TestUtils.assumeWorkingJMockit(); - final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker() { - @Override - public String getStringFromMessage(final Object message) { - return ((String) message).substring(0, 66); - } - }; - haMocker.getMockResultMap().put( - "JOSM could not find information about the following plugins:", - "OK" - ); + final HelpAwareOptionPaneMocker haMocker = new HelpAwareOptionPaneMocker( + PluginHandler.UNMAINTAINED_PLUGINS.stream().collect( + Collectors.toMap(PluginHandler::getUnmaintainedPluginMessage, p -> "Disable plugin"))); + final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker(); + jopsMocker.getMockResultMap().put( + PluginHandler.getRemovedPluginsMessage(PluginHandler.DEPRECATED_PLUGINS), + JOptionPane.OK_OPTION + ); final String old = System.getProperty("josm.plugins"); try { @@ -86,8 +86,13 @@ } - assertEquals(1, haMocker.getInvocationLog().size()); - Object[] invocationLogEntry = haMocker.getInvocationLog().get(0); + assertEquals(1, jopsMocker.getInvocationLog().size()); + Object[] invocationLogEntry = jopsMocker.getInvocationLog().get(0); assertEquals(0, (int) invocationLogEntry[0]); assertEquals("Warning", invocationLogEntry[2]); + + assertEquals(PluginHandler.UNMAINTAINED_PLUGINS.size(), haMocker.getInvocationLog().size()); + invocationLogEntry = haMocker.getInvocationLog().get(0); + assertEquals(0, (int) invocationLogEntry[0]); + assertEquals("Disable plugin", invocationLogEntry[2]); }