Changeset 14052 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

Timestamp:

2018-07-26T22:01:31+02:00 (8 years ago)

Author:

Don-vip

Message:

see #16010 - use JMockit to enable more extensive test coverage (patch by ris, modified)

see ​https://github.com/openstreetmap/josm/pull/24/commits for details

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -7 +7 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -159 +158 @@
         }
         sb.append("</html>");
-        if (!GraphicsEnvironment.isHeadless()) {
-            GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog(
-                    parent,
-                    sb.toString(),
-                    tr("Update plugins"),
-                    !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
-                            HelpUtil.ht("/Preferences/Plugins")
-                    ));
-        }
+        GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog(
+                parent,
+                sb.toString(),
+                tr("Update plugins"),
+                !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
+                        HelpUtil.ht("/Preferences/Plugins")
+                ));
     }
 
@@ -212 +209 @@
     }
 
+    private static Component addButton(JPanel pnl, JButton button, String buttonName) {
+        button.setName(buttonName);
+        return pnl.add(button);
+    }
+
     private JPanel buildActionPanel() {
         JPanel pnl = new JPanel(new GridLayout(1, 4));
 
-        pnl.add(new JButton(new DownloadAvailablePluginsAction()));
-        pnl.add(new JButton(new UpdateSelectedPluginsAction()));
-        ExpertToggleAction.addVisibilitySwitcher(pnl.add(new JButton(new SelectByListAction())));
-        ExpertToggleAction.addVisibilitySwitcher(pnl.add(new JButton(new ConfigureSitesAction())));
+        // assign some component names to these as we go to aid testing
+        addButton(pnl, new JButton(new DownloadAvailablePluginsAction()), "downloadListButton");
+        addButton(pnl, new JButton(new UpdateSelectedPluginsAction()), "updatePluginsButton");
+        ExpertToggleAction.addVisibilitySwitcher(addButton(pnl, new JButton(new SelectByListAction()), "loadFromListButton"));
+        ExpertToggleAction.addVisibilitySwitcher(addButton(pnl, new JButton(new ConfigureSitesAction()), "configureSitesButton"));
         return pnl;
     }