Index: trunk/test/unit/org/openstreetmap/josm/tools/GeoUrlToBoundsTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/GeoUrlToBoundsTest.java	(revision 10630)
+++ trunk/test/unit/org/openstreetmap/josm/tools/GeoUrlToBoundsTest.java	(revision 10630)
@@ -0,0 +1,53 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
+/**
+ * Unit tests of {@link GeoUrlToBoundsTest} class.
+ */
+public class GeoUrlToBoundsTest {
+
+    /**
+     * Tests parsing Geo URLs with the zoom specified.
+     */
+    @Test
+    public void testParse() {
+        assertThat(
+                GeoUrlToBounds.parse("geo:12.34,56.78?z=9"),
+                is(OsmUrlToBounds.positionToBounds(12.34, 56.78, 9))
+        );
+    }
+
+    /**
+     * Tests parsing Geo URLs without the zoom parameter.
+     */
+    @Test
+    public void testParseWithoutZoom() {
+        assertThat(
+                GeoUrlToBounds.parse("geo:12.34,56.78"),
+                is(OsmUrlToBounds.positionToBounds(12.34, 56.78, 18))
+        );
+    }
+
+    /**
+     * Tests parsing invalid Geo URL.
+     */
+    @Test
+    public void testInvalid() {
+        assertThat(GeoUrlToBounds.parse("geo:foo"), nullValue());
+        assertThat(GeoUrlToBounds.parse("geo:foo,bar"), nullValue());
+    }
+
+    /**
+     * Tests parsing null.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testNull() {
+        GeoUrlToBounds.parse(null);
+    }
+}