Changeset 12636 in josm for trunk/test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java

Timestamp:

2017-08-24T22:53:50+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.getLayerManager(). Replacement: gui.MainApplication.getLayerManager()

File:

• trunk/test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java (modified) (5 diffs)

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

@@ -8 +8 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -38 +38 @@
             action = new MergeLayerAction();
         }
-        for (TestLayer testLayer : Main.getLayerManager().getLayersOfType(TestLayer.class)) {
-            Main.getLayerManager().removeLayer(testLayer);
+        for (TestLayer testLayer : MainApplication.getLayerManager().getLayersOfType(TestLayer.class)) {
+            MainApplication.getLayerManager().removeLayer(testLayer);
         }
     }
@@ -48 +48 @@
     @Test
     public void testMergeNoSourceLayer() {
-        assertNull(Main.getLayerManager().getActiveLayer());
+        assertNull(MainApplication.getLayerManager().getActiveLayer());
         action.actionPerformed(null);
-        assertEquals(0, Main.getLayerManager().getLayers().size());
+        assertEquals(0, MainApplication.getLayerManager().getLayers().size());
     }
 
@@ -59 +59 @@
     public void testMergeNoTargetLayer() {
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
-        Main.getLayerManager().addLayer(layer);
-        assertEquals(1, Main.getLayerManager().getLayers().size());
+        MainApplication.getLayerManager().addLayer(layer);
+        assertEquals(1, MainApplication.getLayerManager().getLayers().size());
         assertNull(action.merge(layer));
-        assertEquals(1, Main.getLayerManager().getLayers().size());
+        assertEquals(1, MainApplication.getLayerManager().getLayers().size());
     }
 
@@ -73 +73 @@
         OsmDataLayer layer1 = new OsmDataLayer(new DataSet(), "1", null);
         OsmDataLayer layer2 = new OsmDataLayer(new DataSet(), "2", null);
-        Main.getLayerManager().addLayer(layer1);
-        Main.getLayerManager().addLayer(layer2);
-        assertEquals(2, Main.getLayerManager().getLayers().size());
+        MainApplication.getLayerManager().addLayer(layer1);
+        MainApplication.getLayerManager().addLayer(layer2);
+        assertEquals(2, MainApplication.getLayerManager().getLayers().size());
         action.merge(layer2).get();
-        assertEquals(1, Main.getLayerManager().getLayers().size());
+        assertEquals(1, MainApplication.getLayerManager().getLayers().size());
     }
 }