Changeset 11468 in josm for trunk

Timestamp:

2017-01-16T20:36:49+01:00 (8 years ago)

Author:

bastiK

Message:

see #14252 - fix tests

File:

• trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java

@@ -75 +75 @@
         List<TestError> errors = testRelation(r);
         assertEquals(1, errors.size());
-        assertEquals("Role outer2 unknown in templates outer/inner", errors.get(0).getDescription());
+        assertEquals("Role 'outer2' unknown in templates 'outer/inner'", errors.get(0).getDescription());
     }
 
@@ -86 +86 @@
         List<TestError> errors = testRelation(r);
         assertEquals(1, errors.size());
-        assertEquals("Role via missing", errors.get(0).getDescription());
+        assertEquals("Role 'via' missing", errors.get(0).getDescription());
     }
 
@@ -98 +98 @@
         List<TestError> errors = testRelation(r);
         assertEquals(1, errors.size());
-        assertEquals("Role member type relation does not match accepted list of node/way in template Turn Restriction",
+        assertEquals("Role member type 'relation' does not match accepted list of 'node/way' in template Turn Restriction",
                 errors.get(0).getDescription());
     }
@@ -112 +112 @@
         List<TestError> errors = testRelation(r);
         assertEquals(1, errors.size());
-        assertEquals("Number of from roles too high (2)", errors.get(0).getDescription());
+        assertEquals("Number of 'from' roles too high (2)", errors.get(0).getDescription());
     }
 
@@ -135 +135 @@
         List<TestError> errors = testRelation(r);
         assertEquals(1, errors.size());
-        assertEquals("Role member does not match expression power in template Power Route", errors.get(0).getDescription());
+        assertEquals("Role member does not match expression 'power' in template Power Route", errors.get(0).getDescription());
     }
 
@@ -148 +148 @@
         r.addMember(new RelationMember("", createPrimitive("way no-rail-way=yes")));
         assertEquals(1, testRelation(r).size());
-        assertEquals("Role member does not match expression railway in template Public Transport Route (Rail)",
+        assertEquals("Role member does not match expression 'railway' in template Public Transport Route (Rail)",
                 testRelation(r).get(0).getDescription());
 
@@ -154 +154 @@
         r.addMember(new RelationMember("stop", createPrimitive("way no-rail-way=yes")));
         assertEquals(1, testRelation(r).size());
-        assertEquals("Role member type way does not match accepted list of node in template Public Transport Route (Rail)",
+        assertEquals("Role member type 'way' does not match accepted list of 'node' in template Public Transport Route (Rail)",
                 testRelation(r).get(0).getDescription());
 
@@ -160 +160 @@
         r.addMember(new RelationMember("stop", createPrimitive("node public_transport=stop_position bus=yes")));
         assertEquals(1, testRelation(r).size());
-        assertEquals("Role member does not match expression public_transport=stop_position && "+
-                "(train=yes || subway=yes || monorail=yes || tram=yes || light_rail=yes) in template Public Transport Route (Rail)",
+        assertEquals("Role member does not match expression 'public_transport=stop_position && "+
+                "(train=yes || subway=yes || monorail=yes || tram=yes || light_rail=yes)' in template Public Transport Route (Rail)",
                 testRelation(r).get(0).getDescription());
     }