Changeset 11282 in josm

Timestamp:

2016-11-18T18:27:07+01:00 (7 years ago)

Author:

simon04

Message:

Fix OsmLinkPasterTest due to r11279

File:

• trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPasterTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPasterTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.datatransfer.importers;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -25 +25 @@
 
     /**
-     * Test of {@link OsmLinkPaster#parseIds(String)}
+     * Test of {@link OsmLinkPaster#parseLatLon(String)}
      */
     @Test
-    public void testParseIds() {
-        assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.NODE) },
-                OsmLinkPaster.parseIds("http://www.openstreetmap.org/node/1234").toArray());
-        assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.WAY) },
-                OsmLinkPaster.parseIds("http://www.openstreetmap.org/way/1234").toArray());
-        assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.RELATION) },
-                OsmLinkPaster.parseIds("http://www.openstreetmap.org/relation/1234").toArray());
-
-        assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.NODE) },
-                OsmLinkPaster.parseIds("http://www.osm.org/node/1234").toArray());
-        assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.WAY) },
-                OsmLinkPaster.parseIds("http://osm.org/way/1234").toArray());
-        assertArrayEquals(new Object[] {new SimplePrimitiveId(1234, OsmPrimitiveType.RELATION) },
-                OsmLinkPaster.parseIds("https://www.openstreetmap.org/relation/1234").toArray());
-
-        assertArrayEquals(new Object[0], OsmLinkPaster.parseIds("http://www.openstreetmap.org/xx/1234").toArray());
-        assertArrayEquals(new Object[0], OsmLinkPaster.parseIds("http://www.openstreetmap.org/way/1234x").toArray());
-        assertArrayEquals(new Object[0], OsmLinkPaster.parseIds("").toArray());
+    public void testParseLatLon() {
+        assertEquals(new LatLon(51.71873, 8.76164),
+                OsmLinkPaster.parseLatLon("https://www.openstreetmap.org/#map=17/51.71873/8.76164"));
+        assertNull(OsmLinkPaster.parseLatLon("http://www.openstreetmap.org/"));
+        assertNull(OsmLinkPaster.parseLatLon("foo-bar"));
     }
 }