Changeset 11931 in josm for trunk

Timestamp:

2017-04-16T20:45:20+02:00 (7 years ago)

Author:

Don-vip

Message:

improve unit test coverage

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/projection/CustomProjection.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/projection/CustomProjectionTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/projection/proj (added)
• test/unit/org/openstreetmap/josm/data/projection/proj/LonLatTest.java (added)
• test/unit/org/openstreetmap/josm/data/projection/proj/MercatorTest.java (added)
• test/unit/org/openstreetmap/josm/gui/datatransfer/TagTransferableTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java (added)

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -170 +170 @@
     }
 
-    private enum Polarity {
+    enum Polarity {
         NORTH(LatLon.NORTH_POLE),
         SOUTH(LatLon.SOUTH_POLE);
@@ -180 +180 @@
         }
 
-        private LatLon getLatLon() {
+        LatLon getLatLon() {
             return latlon;
         }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -142 +142 @@
     @Override
     public LayerPainter attachToMapView(MapViewEvent event) {
-        event.getMapView().addMouseListener(new MouseAdapter() {
-            @Override
-            public void mousePressed(MouseEvent e) {
-                if (e.getButton() != MouseEvent.BUTTON1)
-                    return;
-                boolean mousePressedInButton = false;
-                for (Marker mkr : data) {
-                    if (mkr.containsPoint(e.getPoint())) {
-                        mousePressedInButton = true;
-                        break;
-                    }
-                }
-                if (!mousePressedInButton)
-                    return;
-                mousePressed = true;
-                if (isVisible()) {
-                    invalidate();
-                }
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent ev) {
-                if (ev.getButton() != MouseEvent.BUTTON1 || !mousePressed)
-                    return;
-                mousePressed = false;
-                if (!isVisible())
-                    return;
-                for (Marker mkr : data) {
-                    if (mkr.containsPoint(ev.getPoint())) {
-                        mkr.actionPerformed(new ActionEvent(this, 0, null));
-                    }
-                }
-                invalidate();
-            }
-        });
+        event.getMapView().addMouseListener(new MarkerMouseAdapter());
 
         if (event.getMapView().playHeadMarker == null) {
@@ -475 +441 @@
     }
 
+    private final class MarkerMouseAdapter extends MouseAdapter {
+        @Override
+        public void mousePressed(MouseEvent e) {
+            if (e.getButton() != MouseEvent.BUTTON1)
+                return;
+            boolean mousePressedInButton = false;
+            for (Marker mkr : data) {
+                if (mkr.containsPoint(e.getPoint())) {
+                    mousePressedInButton = true;
+                    break;
+                }
+            }
+            if (!mousePressedInButton)
+                return;
+            mousePressed = true;
+            if (isVisible()) {
+                invalidate();
+            }
+        }
+
+        @Override
+        public void mouseReleased(MouseEvent ev) {
+            if (ev.getButton() != MouseEvent.BUTTON1 || !mousePressed)
+                return;
+            mousePressed = false;
+            if (!isVisible())
+                return;
+            for (Marker mkr : data) {
+                if (mkr.containsPoint(ev.getPoint())) {
+                    mkr.actionPerformed(new ActionEvent(this, 0, null));
+                }
+            }
+            invalidate();
+        }
+    }
+
     public static final class ShowHideMarkerText extends AbstractAction implements LayerAction {
         private final transient MarkerLayer layer;

trunk/test/unit/org/openstreetmap/josm/data/projection/CustomProjectionTest.java

@@ -10 +10 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.CustomProjection.Polarity;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -71 +73 @@
                 });
     }
+
+    /**
+     * Test {@link CustomProjection.Polarity}.
+     */
+    @Test
+    public void testPolarity() {
+        assertEquals(LatLon.NORTH_POLE, Polarity.NORTH.getLatLon());
+        assertEquals(LatLon.SOUTH_POLE, Polarity.SOUTH.getLatLon());
+    }
 }