Changeset 10122 in josm

Timestamp:

2016-04-08T22:13:47+02:00 (8 years ago)

Author:

Don-vip

Message:

add more debug messages to debug failing unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

@@ -27 +27 @@
 import javax.swing.event.ChangeListener;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -229 +230 @@
         }
 
-        if (msg instanceof String) {
-            msg = new JMultilineLabel((String) msg, true);
-        }
-
         final JOptionPane pane = new JOptionPane(
-                msg,
+                msg instanceof String ? new JMultilineLabel((String) msg, true) : msg,
                 messageType,
                 JOptionPane.DEFAULT_OPTION,
@@ -241 +238 @@
                 defaultButton
         );
+
+        // Log message. Useful for bug reports and unit tests
+        switch (messageType) {
+            case JOptionPane.ERROR_MESSAGE:
+                Main.error(title + " - " + msg);
+                break;
+            case JOptionPane.WARNING_MESSAGE:
+                Main.warn(title + " - " + msg);
+                break;
+            default:
+                Main.info(title + " - " + msg);
+        }
 
         if (!GraphicsEnvironment.isHeadless()) {

trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java

@@ -39 +39 @@
         try {
             System.setProperty("josm.plugins", "buildings_tools,plastic_laf");
-            assertEquals("buildings_tools,plastic_laf", System.getProperty("josm.plugins"));
             SplashProgressMonitor monitor = new SplashProgressMonitor("foo", new ChangeListener() {
                 @Override
@@ -47 +46 @@
             });
             Collection<PluginInformation> plugins = MainApplication.updateAndLoadEarlyPlugins(null, monitor);
-            assertEquals("buildings_tools,plastic_laf", System.getProperty("josm.plugins"));
             assertEquals(2, plugins.size());
             assertNotNull(PluginHandler.getPlugin("plastic_laf"));