Changeset 7307 in josm for trunk/test/unit/org

Timestamp:

2014-07-12T17:35:30+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10239 - fix unit test

File:

• trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/DefaultNameFormatterTest.java

@@ -80 +80 @@
     }
 
+    /**
+     * Tests formatting of relation names.
+     */
     @Test
-    public void testRelationName() throws Exception {
+    public void testRelationName() {
         assertThat(getFormattedRelationName("X=Y"), is("relation (0, 0 members)"));
         assertThat(getFormattedRelationName("name=Foo"), is("relation (\"Foo\", 0 members)"));
@@ -91 +94 @@
     }
 
+    /**
+     * Tests formatting of way names.
+     */
     @Test
-    public void testWayName() throws Exception {
+    public void testWayName() {
         assertThat(getFormattedWayName("building=yes"), is("building (0 nodes)"));
         assertThat(getFormattedWayName("building=yes addr:housenumber=123"), is("House number 123 (0 nodes)"));
@@ -100 +106 @@
 
     static String getFormattedRelationName(String tagsString) {
-        return DefaultNameFormatter.getInstance().format((Relation) TestUtils.createPrimitive("relation " + tagsString));
+        return DefaultNameFormatter.getInstance().format((Relation) TestUtils.createPrimitive("relation " + tagsString))
+                .replace("\u200E", "").replace("\u200F", "");
     }
 
     static String getFormattedWayName(String tagsString) {
-        return DefaultNameFormatter.getInstance().format((Way) TestUtils.createPrimitive("way " + tagsString));
+        return DefaultNameFormatter.getInstance().format((Way) TestUtils.createPrimitive("way " + tagsString))
+                .replace("\u200E", "").replace("\u200F", "");
     }
 }