Changeset 12636 in josm for trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.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/AddImageryLayerActionTest.java (modified) (5 diffs)

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

@@ -13 +13 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
@@ -58 +58 @@
     @Test
     public void testActionPerformedEnabledTms() {
-        assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
+        assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
         new AddImageryLayerAction(new ImageryInfo("foo_tms", "http://bar", "tms", null, null)).actionPerformed(null);
-        List<TMSLayer> tmsLayers = Main.getLayerManager().getLayersOfType(TMSLayer.class);
+        List<TMSLayer> tmsLayers = MainApplication.getLayerManager().getLayersOfType(TMSLayer.class);
         assertEquals(1, tmsLayers.size());
-        Main.getLayerManager().removeLayer(tmsLayers.get(0));
+        MainApplication.getLayerManager().removeLayer(tmsLayers.get(0));
     }
 
@@ -77 +77 @@
         new AddImageryLayerAction(new ImageryInfo("localhost", "http://localhost:" + wireMockRule.port() + "/wms?",
                 "wms_endpoint", null, null)).actionPerformed(null);
-        List<WMSLayer> wmsLayers = Main.getLayerManager().getLayersOfType(WMSLayer.class);
+        List<WMSLayer> wmsLayers = MainApplication.getLayerManager().getLayersOfType(WMSLayer.class);
         assertEquals(1, wmsLayers.size());
 
-        Main.getLayerManager().removeLayer(wmsLayers.get(0));
+        MainApplication.getLayerManager().removeLayer(wmsLayers.get(0));
     }
 
@@ -88 +88 @@
     @Test
     public void testActionPerformedDisabled() {
-        assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
+        assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
         try {
             new AddImageryLayerAction(new ImageryInfo("foo")).actionPerformed(null);
@@ -94 +94 @@
             assertEquals("Parameter 'info.url' must not be null", expected.getMessage());
         }
-        assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
+        assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
     }
 }