Changeset 18393 in josm for trunk

Timestamp:

2022-03-11T16:08:16+01:00 (2 years ago)

Author:

GerdP

Message:

see #21740: IAE: Attempted to add listener that was already in list: external preset with group name RoadSigns

• fix unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java

@@ -3 +3 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Arrays;
@@ -17 +17 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -146 +147 @@
         CapturingActiveLayerChangeListener listener = new CapturingActiveLayerChangeListener();
         layerManagerWithActive.addActiveLayerChangeListener(listener);
-        assertThrows(IllegalArgumentException.class, () -> layerManagerWithActive.addActiveLayerChangeListener(listener));
+        Logging.clearLastErrorAndWarnings();
+        layerManagerWithActive.addActiveLayerChangeListener(listener);
+        assertFalse(Logging.getLastErrorAndWarnings().isEmpty());
     }
 
@@ -172 +175 @@
     @Test
     void testRemoveActiveLayerChangeListenerNotInList() {
-        assertThrows(IllegalArgumentException.class,
-                () -> layerManagerWithActive.removeActiveLayerChangeListener(new CapturingActiveLayerChangeListener()));
+        Logging.clearLastErrorAndWarnings();
+        layerManagerWithActive.removeActiveLayerChangeListener(new CapturingActiveLayerChangeListener());
+        assertFalse(Logging.getLastErrorAndWarnings().isEmpty());
     }