Changeset 8949 in josm for trunk

Timestamp:

2015-10-26T01:10:35+01:00 (9 years ago)

Author:

Don-vip

Message:

see #11968, see #12011 - add a new non-regression unit test reproducing #12011

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java (added)
• test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java (added)
• test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -141 +141 @@
     // Map modes
     public final SelectAction mapModeSelect;
+    public final DrawAction mapModeDraw;
+    public final ZoomAction mapModeZoom;
     public LassoModeAction mapModeSelectLasso;
 
     private final transient Map<Layer, MapMode> lastMapMode = new HashMap<>();
-    private final MapMode mapModeDraw;
-    private final MapMode mapModeZoom;
 
     /**

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

@@ -7 +7 @@
 import static org.junit.Assert.fail;
 
-import java.awt.Cursor;
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.geom.Point2D;
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -26 +23 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
@@ -34 +29 @@
  */
 public class SelectActionTest {
-
-    private class MapViewMock extends MapView {
-        private OsmDataLayer layer;
-        private DataSet currentDataSet;
-
-        MapViewMock(DataSet dataSet, OsmDataLayer layer) {
-            super(null, null);
-            this.layer = layer;
-            this.currentDataSet = dataSet;
-        }
-
-        @Override
-        public EastNorth getEastNorth(int x, int y) {
-            return new EastNorth(x, y);
-        }
-
-        @Override
-        public void addMouseListener(MouseListener ml) {}
-
-        @Override
-        public void removeMouseListener(MouseListener ml) {}
-
-        @Override
-        public void setVirtualNodesEnabled(boolean enabled) {}
-
-        @Override
-        public void setNewCursor(Cursor cursor, Object reference) {}
-
-        @Override
-        public void setNewCursor(int cursor, Object reference) {}
-
-        @Override
-        public boolean isActiveLayerVisible() {
-            return true;
-        }
-
-        @Override
-        public void requestClearRect() {}
-
-        @Override
-        public Point2D getPoint2D(EastNorth p) {
-            return new Point2D.Double(p.getX(), p.getY());
-        }
-
-        @Override
-        public void setActiveLayer(Layer layer) {}
-
-        @Override
-        public Layer getActiveLayer() {
-            return layer;
-        }
-
-        @Override
-        protected DataSet getCurrentDataSet() {
-            return currentDataSet;
-        }
-    }
 
     /**
@@ -134 +72 @@
      */
     @BeforeClass
-    public static void setUp() {
+    public static void setUpBeforeClass() {
         JOSMFixture.createUnitTestFixture().init(true);
     }