Changeset 11181 in josm for trunk

Timestamp:

2016-10-28T11:50:35+02:00 (8 years ago)

Author:

simon04

Message:

see #13828 - Fix unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -75 +75 @@
             }
         } catch (IllegalArgumentException ex) {
-            if (ex.getMessage() == null || ex.getMessage().isEmpty()) {
+            if (ex.getMessage() == null || ex.getMessage().isEmpty() || GraphicsEnvironment.isHeadless()) {
                 throw ex;
             } else {

trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java

@@ -71 +71 @@
     public void testActionPerformedDisabled() {
         assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
-        new AddImageryLayerAction(new ImageryInfo()).actionPerformed(null);
+        try {
+            new AddImageryLayerAction(new ImageryInfo()).actionPerformed(null);
+        } catch (IllegalArgumentException expected) {
+            assertEquals("Parameter 'info.url' must not be null", expected.getMessage());
+        }
         assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
     }