Changeset 11468 in josm


Ignore:
Timestamp:
2017-01-16T20:36:49+01:00 (3 years ago)
Author:
bastiK
Message:

see #14252 - fix tests

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java

    r11403 r11468  
    7575        List<TestError> errors = testRelation(r);
    7676        assertEquals(1, errors.size());
    77         assertEquals("Role outer2 unknown in templates outer/inner", errors.get(0).getDescription());
     77        assertEquals("Role 'outer2' unknown in templates 'outer/inner'", errors.get(0).getDescription());
    7878    }
    7979
     
    8686        List<TestError> errors = testRelation(r);
    8787        assertEquals(1, errors.size());
    88         assertEquals("Role via missing", errors.get(0).getDescription());
     88        assertEquals("Role 'via' missing", errors.get(0).getDescription());
    8989    }
    9090
     
    9898        List<TestError> errors = testRelation(r);
    9999        assertEquals(1, errors.size());
    100         assertEquals("Role member type relation does not match accepted list of node/way in template Turn Restriction",
     100        assertEquals("Role member type 'relation' does not match accepted list of 'node/way' in template Turn Restriction",
    101101                errors.get(0).getDescription());
    102102    }
     
    112112        List<TestError> errors = testRelation(r);
    113113        assertEquals(1, errors.size());
    114         assertEquals("Number of from roles too high (2)", errors.get(0).getDescription());
     114        assertEquals("Number of 'from' roles too high (2)", errors.get(0).getDescription());
    115115    }
    116116
     
    135135        List<TestError> errors = testRelation(r);
    136136        assertEquals(1, errors.size());
    137         assertEquals("Role member does not match expression power in template Power Route", errors.get(0).getDescription());
     137        assertEquals("Role member does not match expression 'power' in template Power Route", errors.get(0).getDescription());
    138138    }
    139139
     
    148148        r.addMember(new RelationMember("", createPrimitive("way no-rail-way=yes")));
    149149        assertEquals(1, testRelation(r).size());
    150         assertEquals("Role member does not match expression railway in template Public Transport Route (Rail)",
     150        assertEquals("Role member does not match expression 'railway' in template Public Transport Route (Rail)",
    151151                testRelation(r).get(0).getDescription());
    152152
     
    154154        r.addMember(new RelationMember("stop", createPrimitive("way no-rail-way=yes")));
    155155        assertEquals(1, testRelation(r).size());
    156         assertEquals("Role member type way does not match accepted list of node in template Public Transport Route (Rail)",
     156        assertEquals("Role member type 'way' does not match accepted list of 'node' in template Public Transport Route (Rail)",
    157157                testRelation(r).get(0).getDescription());
    158158
     
    160160        r.addMember(new RelationMember("stop", createPrimitive("node public_transport=stop_position bus=yes")));
    161161        assertEquals(1, testRelation(r).size());
    162         assertEquals("Role member does not match expression public_transport=stop_position && "+
    163                 "(train=yes || subway=yes || monorail=yes || tram=yes || light_rail=yes) in template Public Transport Route (Rail)",
     162        assertEquals("Role member does not match expression 'public_transport=stop_position && "+
     163                "(train=yes || subway=yes || monorail=yes || tram=yes || light_rail=yes)' in template Public Transport Route (Rail)",
    164164                testRelation(r).get(0).getDescription());
    165165    }
Note: See TracChangeset for help on using the changeset viewer.