Changeset 12630 in josm for trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java

Timestamp:

2017-08-24T00:15:51+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

File:

• trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.NoteData;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -39 +41 @@
             Main.getLayerManager().addLayer(layer);
             AddNoteAction mapMode = new AddNoteAction(new NoteData(Collections.<Note>emptyList()));
-            MapMode oldMapMode = Main.map.mapMode;
-            assertTrue(Main.map.selectMapMode(mapMode));
-            assertEquals(mapMode, Main.map.mapMode);
-            assertTrue(Main.map.selectMapMode(oldMapMode));
+            MapFrame map = MainApplication.getMap();
+            MapMode oldMapMode = map.mapMode;
+            assertTrue(map.selectMapMode(mapMode));
+            assertEquals(mapMode, map.mapMode);
+            assertTrue(map.selectMapMode(oldMapMode));
         } finally {
             Main.getLayerManager().removeLayer(layer);