Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 10390)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 10396)
@@ -125,5 +125,5 @@
             } else {
                 for (Layer l: Main.getLayerManager().getLayers()) {
-                    Main.map.mapView.removeLayer(l);
+                    Main.getLayerManager().removeLayer(l);
                 }
             }
Index: trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java	(revision 10390)
+++ trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java	(revision 10396)
@@ -54,7 +54,7 @@
             assertEquals(1, wmsLayers.size());
 
-            Main.map.mapView.removeLayer(wmsLayers.get(0));
+            Main.getLayerManager().removeLayer(wmsLayers.get(0));
         } finally {
-            Main.map.mapView.removeLayer(tmsLayers.get(0));
+            Main.getLayerManager().removeLayer(tmsLayers.get(0));
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java	(revision 10390)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java	(revision 10396)
@@ -56,5 +56,5 @@
         Field mapView = MapFrame.class.getDeclaredField("mapView");
         Utils.setObjectsAccessible(mapView);
-        mapView.set(Main.map, new MapViewMock(dataSet, layer));
+        mapView.set(Main.map, new MapViewMock());
 
         Node n1 = new Node(new EastNorth(0, 0));
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java	(revision 10390)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java	(revision 10396)
@@ -8,17 +8,9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 class MapViewMock extends MapView {
-    private final transient OsmDataLayer layer;
-    private final transient DataSet currentDataSet;
-
-    MapViewMock(DataSet dataSet, OsmDataLayer layer) {
+    MapViewMock() {
         super(Main.getLayerManager(), null, null);
-        this.layer = layer;
-        this.currentDataSet = dataSet;
     }
 
@@ -52,16 +44,3 @@
         return p != null ? new Point2D.Double(p.getX(), p.getY()) : null;
     }
-
-    @Override
-    public void setActiveLayer(Layer layer) {}
-
-    @Override
-    public Layer getActiveLayer() {
-        return layer;
-    }
-
-    @Override
-    protected DataSet getCurrentDataSet() {
-        return currentDataSet;
-    }
 }
Index: trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java	(revision 10390)
+++ trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java	(revision 10396)
@@ -55,5 +55,5 @@
                 Field mv = SelectAction.class.getDeclaredField("mv");
                 Utils.setObjectsAccessible(mv);
-                mv.set(this, new MapViewMock(dataSet, layer));
+                mv.set(this, new MapViewMock());
             } catch (ReflectiveOperationException e) {
                 e.printStackTrace();
Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java	(revision 10390)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityActionTest.java	(revision 10396)
@@ -40,5 +40,5 @@
             assertFalse(action.isEnabled());
 
-            Main.map.mapView.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             action.updateEnabledState();
             assertTrue(action.isEnabled());
@@ -87,5 +87,5 @@
 
         } finally {
-            Main.map.mapView.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java	(revision 10390)
+++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java	(revision 10396)
@@ -58,5 +58,5 @@
                 } finally {
                     // Ensure we clean the place before leaving, even if test fails.
-                    Main.map.mapView.removeLayer(layer);
+                    Main.getLayerManager().removeLayer(layer);
                 }
             } finally {
Index: trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java	(revision 10390)
+++ trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java	(revision 10396)
@@ -24,5 +24,5 @@
         if (Main.map != null) {
             for (Layer l: Main.getLayerManager().getLayers()) {
-                Main.map.mapView.removeLayer(l);
+                Main.getLayerManager().removeLayer(l);
             }
             Main.main.setMapFrame(null);
Index: trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java	(revision 10390)
+++ trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java	(revision 10396)
@@ -140,5 +140,5 @@
         if (Main.isDisplayingMapView()) {
             for (NoteLayer nl : Main.getLayerManager().getLayersOfType(NoteLayer.class)) {
-                Main.map.mapView.removeLayer(nl);
+                Main.getLayerManager().removeLayer(nl);
             }
         }