Changeset 10332 in josm for trunk/test/unit/org/openstreetmap/josm/gui

Timestamp:

2016-06-07T08:22:39+02:00 (8 years ago)

Author:

stoecker

Message:

Do not use deprecated EditLayerChangedListener - patch my Michael Zangl - gsoc-core - fix #12924

File:

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

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

@@ -110 +110 @@
     }
 
+    /**
+     * Test {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} and
+     * {@link MainLayerManager#addAndFireActiveLayerChangeListener(ActiveLayerChangeListener)}
+     */
     @Test
     public void testAddActiveLayerChangeListener() {
@@ -118 +122 @@
 
         CapturingActiveLayerChangeListener listener = new CapturingThreadCheckingActiveLayerChangeListener();
-        layerManagerWithActive.addActiveLayerChangeListener(listener, false);
+        layerManagerWithActive.addActiveLayerChangeListener(listener);
         assertNull(listener.lastEvent);
 
         CapturingActiveLayerChangeListener listener2 = new CapturingActiveLayerChangeListener();
-        layerManagerWithActive.addActiveLayerChangeListener(listener2, true);
+        layerManagerWithActive.addAndFireActiveLayerChangeListener(listener2);
         assertSame(listener2.lastEvent.getPreviousActiveLayer(), null);
         assertSame(listener2.lastEvent.getPreviousEditLayer(), null);
@@ -141 +145 @@
     public void testAddActiveLayerChangeListenerTwice() {
         CapturingActiveLayerChangeListener listener = new CapturingActiveLayerChangeListener();
-        layerManagerWithActive.addActiveLayerChangeListener(listener, false);
-        layerManagerWithActive.addActiveLayerChangeListener(listener, false);
+        layerManagerWithActive.addActiveLayerChangeListener(listener);
+        layerManagerWithActive.addActiveLayerChangeListener(listener);
     }
 
@@ -156 +160 @@
 
         CapturingActiveLayerChangeListener listener = new CapturingActiveLayerChangeListener();
-        layerManagerWithActive.addActiveLayerChangeListener(listener, false);
+        layerManagerWithActive.addActiveLayerChangeListener(listener);
         layerManagerWithActive.removeActiveLayerChangeListener(listener);