Changeset 12024 in josm for trunk

Timestamp:

2017-04-29T22:03:28+02:00 (8 years ago)

Author:

michael2402

Message:

See #14120: Fix unit tests by using a separate layer manager when mocking the map view.

Location:

trunk/test/unit/org/openstreetmap/josm/actions/mapmode

Files:

• MapViewMock.java (modified) (1 diff)
• SelectActionTest.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.layer.MainLayerManager;
 
 class MapViewMock extends MapView {
     MapViewMock() {
-        super(Main.getLayerManager(), null);
+        this(Main.getLayerManager());
+    }
+
+    MapViewMock(MainLayerManager layerManager) {
+        super(layerManager, null);
     }
 

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

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.layer.MainLayerManager;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -41 +42 @@
             Field mv = SelectAction.class.getDeclaredField("mv");
             Utils.setObjectsAccessible(mv);
-            mv.set(this, new MapViewMock());
+            mv.set(this, new MapViewMock(new MainLayerManager()));
         }