Index: trunk/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java	(revision 10343)
+++ trunk/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java	(revision 10343)
@@ -0,0 +1,130 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import static org.junit.Assert.assertEquals;
+
+import java.awt.Rectangle;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+
+/**
+ * Test {@link MapViewState}
+ * @author Michael Zangl
+ */
+public class MapViewStateTest {
+
+    private static final int HEIGHT = 200;
+    private static final int WIDTH = 300;
+    private NavigatableComponent component;
+    private MapViewState state;
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Create a new, fresh {@link NavigatableComponent}
+     */
+    @Before
+    public void setUp() {
+        component = new NavigatableComponent();
+        component.setBounds(new Rectangle(WIDTH, HEIGHT));
+        // wait for the event to be propagated.
+        GuiHelper.runInEDTAndWait(new Runnable() {
+            @Override
+            public void run() {
+            }
+        });
+        state = new MapViewState(component);
+    }
+
+    /**
+     * Test {@link MapViewState#getCenter()} returns map view center.
+     */
+    @Test
+    public void testGetCenter() {
+        MapViewPoint center = state.getCenter();
+        assertHasViewCoords(WIDTH / 2, HEIGHT / 2, center);
+
+        component.zoomTo(new LatLon(3, 4));
+
+        // state should not change, but new state should.
+        center = state.getCenter();
+        assertHasViewCoords(WIDTH / 2, HEIGHT / 2, center);
+
+        center = new MapViewState(component).getCenter();
+        assertEquals("x", 3, center.getLatLon().lat(), 0.01);
+        assertEquals("y", 4, center.getLatLon().lon(), 0.01);
+    }
+
+    private void assertHasViewCoords(double x, double y, MapViewPoint center) {
+        assertEquals("x", x, center.getInViewX(), 0.01);
+        assertEquals("y", y, center.getInViewY(), 0.01);
+        assertEquals("x", x, center.getInView().getX(), 0.01);
+        assertEquals("y", y, center.getInView().getY(), 0.01);
+    }
+
+    /**
+     * Test {@link MapViewState#getForView(double, double)}
+     */
+    @Test
+    public void testGetForView() {
+        MapViewPoint corner = state.getForView(0, 0);
+        assertHasViewCoords(0, 0, corner);
+
+        MapViewPoint middle = state.getForView(120, 130);
+        assertHasViewCoords(120, 130, middle);
+
+        MapViewPoint fraction = state.getForView(0.12, 0.7);
+        assertHasViewCoords(0.12, 0.7, fraction);
+
+        MapViewPoint negative = state.getForView(-17, -30);
+        assertHasViewCoords(-17, -30, negative);
+    }
+
+    /**
+     * Test {@link MapViewState#getViewWidth()} and {@link MapViewState#getViewHeight()}
+     */
+    @Test
+    public void testGetViewSize() {
+        assertEquals(WIDTH, state.getViewWidth(), 0.01);
+        assertEquals(HEIGHT, state.getViewHeight(), 0.01);
+    }
+
+    /**
+     * Tests that all coordinate conversions for the point work.
+     */
+    @Test
+    public void testPointConversions() {
+        MapViewPoint p = state.getForView(50, 70);
+        assertHasViewCoords(50, 70, p);
+
+        EastNorth eastnorth = p.getEastNorth();
+        EastNorth shouldEastNorth = component.getEastNorth(50, 70);
+        assertEquals("east", shouldEastNorth.east(), eastnorth.east(), 0.01);
+        assertEquals("north", shouldEastNorth.north(), eastnorth.north(), 0.01);
+        MapViewPoint reversed = state.getPointFor(shouldEastNorth);
+        assertHasViewCoords(50, 70, reversed);
+
+        LatLon latlon = p.getLatLon();
+        LatLon shouldLatLon = Main.getProjection().eastNorth2latlon(shouldEastNorth);
+        assertEquals("lat", shouldLatLon.lat(), latlon.lat(), 0.01);
+        assertEquals("lon", shouldLatLon.lon(), latlon.lon(), 0.01);
+
+        MapViewPoint p2 = state.getPointFor(new EastNorth(2, 3));
+        assertEquals("east", 2, p2.getEastNorth().east(), 0.01);
+        assertEquals("north", 3, p2.getEastNorth().north(), 0.01);
+    }
+}