Changeset 10396 in josm for trunk/test/unit/org/openstreetmap/josm/actions/mapmode

Timestamp:

2016-06-16T12:38:56+02:00 (8 years ago)

Author:

Don-vip

Message:

gsoc-core - remove more deprecation warnings (unit tests)

Location:

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

Files:

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

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

@@ -56 +56 @@
         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));

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

@@ -8 +8 @@
 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 +44 @@
         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;
-    }
 }

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

@@ -55 +55 @@
                 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();