Changeset 11475 in josm for trunk

Timestamp:

2017-01-17T13:50:51+01:00 (8 years ago)

Author:

bastiK

Message:

see #14252 - better wording in validator message

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -237 +237 @@
                             possibleMatchError = TestError.builder(this, Severity.WARNING, WRONG_TYPE)
                                     .message(ROLE_VERIF_PROBLEM_MSG,
-                                            marktr("Role member does not match expression ''{0}'' in template {1}"),
+                                            marktr("Role of relation member does not match expression ''{0}'' in template {1}"),
                                             r.memberExpression, rolePreset.name)
                                     .primitives(member.getMember().isUsable() ? member.getMember() : n)
@@ -271 +271 @@
             errors.add(TestError.builder(this, Severity.WARNING, WRONG_TYPE)
                     .message(ROLE_VERIF_PROBLEM_MSG,
-                            marktr("Role member type ''{0}'' does not match accepted list of ''{1}'' in template {2}"),
-                            member.getType(), typesStr, rolePreset.name)
+                            marktr("Type ''{0}'' of relation member with role ''{1}'' does not match accepted types ''{2}'' in template {3}"),
+                            member.getType(), member.getRole(), typesStr, rolePreset.name)
                     .primitives(member.getMember().isUsable() ? member.getMember() : n)
                     .build());

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

@@ -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("Type 'relation' of relation member with role 'via' does not match accepted types 'node/way' in template Turn Restriction",
                 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 of relation 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 of relation 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("Type 'way' of relation member with role 'stop' does not match accepted types '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 && "+
+        assertEquals("Role of relation 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());