Changeset 10279 in josm for trunk/test


Ignore:
Timestamp:
2016-05-25T08:52:14+02:00 (4 years ago)
Author:
Don-vip
Message:

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

File:
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java

    r10278 r10279  
    1313import org.openstreetmap.josm.JOSMFixture;
    1414import org.openstreetmap.josm.data.osm.DataSet;
    15 import org.openstreetmap.josm.gui.layer.LayerManagerWithActive.ActiveLayerChangeEvent;
    16 import org.openstreetmap.josm.gui.layer.LayerManagerWithActive.ActiveLayerChangeListener;
     15import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
     16import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
    1717import org.openstreetmap.josm.gui.util.GuiHelper;
    1818import org.openstreetmap.josm.tools.Predicates;
    1919
    2020/**
    21  * Tests {@link LayerManagerWithActive}
     21 * Tests {@link MainLayerManager}.
    2222 * @author Michael Zangl
    23  *
    2423 */
    25 public class LayerManagerWithActiveTest extends LayerManagerTest {
    26 
    27     private LayerManagerWithActive layerManagerWithActive;
     24public class MainLayerManagerTest extends LayerManagerTest {
     25
     26    private MainLayerManager layerManagerWithActive;
    2827
    2928    private class CapturingActiveLayerChangeListener implements ActiveLayerChangeListener {
     
    6463    @Before
    6564    public void setUp() {
    66         layerManager = layerManagerWithActive = new LayerManagerWithActive();
     65        layerManager = layerManagerWithActive = new MainLayerManager();
    6766    }
    6867
     
    137136
    138137    /**
    139      * Test if {@link LayerManagerWithActive#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from beeing added twice.
     138     * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from beeing added twice.
    140139     */
    141140    @Test(expected = IllegalArgumentException.class)
     
    147146
    148147    /**
    149      * Test if {@link LayerManagerWithActive#removeActiveLayerChangeListener(ActiveLayerChangeListener)} works.
     148     * Test if {@link MainLayerManager#removeActiveLayerChangeListener(ActiveLayerChangeListener)} works.
    150149     */
    151150    @Test
     
    165164
    166165    /**
    167      * Test if {@link LayerManagerWithActive#removeActiveLayerChangeListener(ActiveLayerChangeListener)} checks if listener is in list.
     166     * Test if {@link MainLayerManager#removeActiveLayerChangeListener(ActiveLayerChangeListener)} checks if listener is in list.
    168167     */
    169168    @Test(expected = IllegalArgumentException.class)
     
    173172
    174173    /**
    175      * Tests {@link LayerManagerWithActive#setActiveLayer(Layer)} and {@link LayerManagerWithActive#getActiveLayer()}.
     174     * Tests {@link MainLayerManager#setActiveLayer(Layer)} and {@link MainLayerManager#getActiveLayer()}.
    176175     * <p>
    177176     * Edit and active layer getters are also tested in {@link #testAddLayerSetsActiveLayer()}
     
    192191
    193192    /**
    194      * Tests {@link LayerManagerWithActive#getEditDataSet()}
     193     * Tests {@link MainLayerManager#getEditDataSet()}
    195194     */
    196195    @Test
     
    214213
    215214    /**
    216      * Tests {@link LayerManagerWithActive#getVisibleLayersInZOrder()}
     215     * Tests {@link MainLayerManager#getVisibleLayersInZOrder()}
    217216     */
    218217    @Test
Note: See TracChangeset for help on using the changeset viewer.