Changeset 12636 in josm for trunk/test/unit/org/openstreetmap/josm/io

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/test/unit/org/openstreetmap/josm/io

Files:

• NoteImporterTest.java (modified) (2 diffs)
• remotecontrol/handler/AddNodeHandlerTest.java (modified) (3 diffs)
• remotecontrol/handler/AddWayHandlerTest.java (modified) (3 diffs)
• remotecontrol/handler/ImportHandlerTest.java (modified) (2 diffs)
• session/SessionReaderTest.java (modified) (2 diffs)
• session/SessionWriterTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java

@@ -9 +9 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -30 +29 @@
     @Test
     public void testTicket12531() {
-        Main.getLayerManager().resetState();
+        MainApplication.getLayerManager().resetState();
         assertNull(MainApplication.getMap());
         assertTrue(new NoteImporter().importDataHandleExceptions(

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java

@@ -5 +5 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
@@ -59 +59 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             newHandler(null).handle();
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }
@@ -96 +96 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             newHandler("https://localhost?lat=0&lon=0").handle();
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java

@@ -5 +5 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
@@ -59 +59 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             newHandler(null).handle();
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }
@@ -96 +96 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             newHandler("https://localhost?way=0,0;1,1").handle();
         } finally {
-            Main.getLayerManager().removeLayer(layer);
+            MainApplication.getLayerManager().removeLayer(layer);
         }
     }

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java

@@ -9 +9 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
@@ -96 +96 @@
             newHandler("https://localhost?url=" + Utils.encodeUrl(url)).handle();
         } finally {
-            for (OsmDataLayer layer : Main.getLayerManager().getLayersOfType(OsmDataLayer.class)) {
-                Main.getLayerManager().removeLayer(layer);
+            for (OsmDataLayer layer : MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class)) {
+                MainApplication.getLayerManager().removeLayer(layer);
             }
         }

trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java

@@ -12 +12 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -142 +141 @@
     public void testReadNotes() throws IOException, IllegalDataException {
         if (MainApplication.isDisplayingMapView()) {
-            for (NoteLayer nl : Main.getLayerManager().getLayersOfType(NoteLayer.class)) {
-                Main.getLayerManager().removeLayer(nl);
+            for (NoteLayer nl : MainApplication.getLayerManager().getLayersOfType(NoteLayer.class)) {
+                MainApplication.getLayerManager().removeLayer(nl);
             }
         }

trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.notes.Note;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
@@ -95 +96 @@
     @Before
     public void setUp() {
-        Main.getLayerManager().addLayer(createOsmLayer());
+        MainApplication.getLayerManager().addLayer(createOsmLayer());
     }