Changeset 10279 in josm for trunk/test

Timestamp:

2016-05-25T08:52:14+02:00 (9 years ago)

Author:

Don-vip

Message:

GSOC core rework - LayerManager, see #12863, rename LayerManagerWithActive to MainLayerManager

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerWithActiveTest.java ) (8 diffs)

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

@@ -13 +13 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.gui.layer.LayerManagerWithActive.ActiveLayerChangeEvent;
-import org.openstreetmap.josm.gui.layer.LayerManagerWithActive.ActiveLayerChangeListener;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Predicates;
 
 /**
- * Tests {@link LayerManagerWithActive}
+ * Tests {@link MainLayerManager}.
  * @author Michael Zangl
- *
  */
-public class LayerManagerWithActiveTest extends LayerManagerTest {
-
-    private LayerManagerWithActive layerManagerWithActive;
+public class MainLayerManagerTest extends LayerManagerTest {
+
+    private MainLayerManager layerManagerWithActive;
 
     private class CapturingActiveLayerChangeListener implements ActiveLayerChangeListener {
@@ -64 +63 @@
     @Before
     public void setUp() {
-        layerManager = layerManagerWithActive = new LayerManagerWithActive();
+        layerManager = layerManagerWithActive = new MainLayerManager();
     }
 
@@ -137 +136 @@
 
     /**
-     * Test if {@link LayerManagerWithActive#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from beeing added twice.
+     * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from beeing added twice.
      */
     @Test(expected = IllegalArgumentException.class)
@@ -147 +146 @@
 
     /**
-     * Test if {@link LayerManagerWithActive#removeActiveLayerChangeListener(ActiveLayerChangeListener)} works.
+     * Test if {@link MainLayerManager#removeActiveLayerChangeListener(ActiveLayerChangeListener)} works.
      */
     @Test
@@ -165 +164 @@
 
     /**
-     * Test if {@link LayerManagerWithActive#removeActiveLayerChangeListener(ActiveLayerChangeListener)} checks if listener is in list.
+     * Test if {@link MainLayerManager#removeActiveLayerChangeListener(ActiveLayerChangeListener)} checks if listener is in list.
      */
     @Test(expected = IllegalArgumentException.class)
@@ -173 +172 @@
 
     /**
-     * Tests {@link LayerManagerWithActive#setActiveLayer(Layer)} and {@link LayerManagerWithActive#getActiveLayer()}.
+     * Tests {@link MainLayerManager#setActiveLayer(Layer)} and {@link MainLayerManager#getActiveLayer()}.
      * <p>
      * Edit and active layer getters are also tested in {@link #testAddLayerSetsActiveLayer()}
@@ -192 +191 @@
 
     /**
-     * Tests {@link LayerManagerWithActive#getEditDataSet()}
+     * Tests {@link MainLayerManager#getEditDataSet()}
      */
     @Test
@@ -214 +213 @@
 
     /**
-     * Tests {@link LayerManagerWithActive#getVisibleLayersInZOrder()}
+     * Tests {@link MainLayerManager#getVisibleLayersInZOrder()}
      */
     @Test