Changeset 16950 in josm for trunk/test

Timestamp:

2020-08-28T22:38:19+02:00 (4 years ago)

Author:

simon04

Message:

Revert "fix #19717 - DefaultNameFormatter: use FIRST-STRONG ISOLATE for bidirectional texts"

This reverts commit r16937

Location:

trunk/test/unit/org/openstreetmap/josm/data

Files:

• osm/DefaultNameFormatterTest.java (modified) (2 diffs)
• validation/util/MultipleNameVisitorTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java

@@ -124 +124 @@
     @Test
     public void testWayName() {
-        assertEquals("\u2068building\u2069 \u2068(0 nodes)\u2069",
-                getFormattedWayName("building=yes"));
-        assertEquals("\u2068House number 123\u2069 \u2068(0 nodes)\u2069",
-                getFormattedWayName("building=yes addr:housenumber=123"));
-        assertEquals("\u2068House number 123 at FooStreet\u2069 \u2068(0 nodes)\u2069",
-                getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"));
-        assertEquals("\u2068House FooName\u2069 \u2068(0 nodes)\u2069",
-                getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"));
+        assertEquals("building (0 nodes)", getFormattedWayName("building=yes"));
+        assertEquals("House number 123 (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123"));
+        assertEquals("House number 123 at FooStreet (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:street=FooStreet"));
+        assertEquals("House FooName (0 nodes)", getFormattedWayName("building=yes addr:housenumber=123 addr:housename=FooName"));
     }
 
     static String getFormattedRelationName(String tagsString) {
-        return DefaultNameFormatter.getInstance().format((Relation) OsmUtils.createPrimitive("relation " + tagsString));
+        return DefaultNameFormatter.getInstance().format((Relation) OsmUtils.createPrimitive("relation " + tagsString))
+                .replace("\u200E", "").replace("\u200F", "");
     }
 
     static String getFormattedWayName(String tagsString) {
-        return DefaultNameFormatter.getInstance().format((Way) OsmUtils.createPrimitive("way " + tagsString));
+        return DefaultNameFormatter.getInstance().format((Way) OsmUtils.createPrimitive("way " + tagsString))
+                .replace("\u200E", "").replace("\u200F", "");
     }
 
@@ -152 +150 @@
         List<Node> nodes = IntStream.rangeClosed(1, 10).mapToObj(i -> new Node(i, 1))
                 .collect(Collectors.toList());
-        assertEquals("<ul>" +
-                        "<li>\u20681\u2069</li>" +
-                        "<li>\u20682\u2069</li>" +
-                        "<li>\u20683\u2069</li>" +
-                        "<li>\u20684\u2069</li>" +
-                        "<li>...</li></ul>",
+        assertEquals("<ul><li>1</li><li>2</li><li>3</li><li>4</li><li>...</li></ul>",
                 DefaultNameFormatter.getInstance().formatAsHtmlUnorderedList(nodes, 5));
     }

trunk/test/unit/org/openstreetmap/josm/data/validation/util/MultipleNameVisitorTest.java

@@ -33 +33 @@
         MultipleNameVisitor visitor = new MultipleNameVisitor();
         visitor.visit(Arrays.asList(new Way(), new Way()));
-        assertEquals("2 ways: \u20680\u2069 \u2068(0 nodes)\u2069, \u20680\u2069 \u2068(0 nodes)\u2069", visitor.toString());
+        assertEquals("2 ways: ‎0‎ (0 nodes), ‎0‎ (0 nodes)", visitor.toString());
     }
 
@@ -46 +46 @@
                 TestUtils.newWay("addr:housename=Stark"),
                 TestUtils.newRelation("type=route")));
-        assertEquals("3 objects: \u2068foo\u2069, \u2068House Stark\u2069 \u2068(0 nodes)\u2069, route (0, 0 members)", visitor.toString());
+        assertEquals("3 objects: foo, ‎House Stark‎ (0 nodes), route (0, 0 members)", visitor.toString());
     }
 }