Ignore:
Timestamp:
2017-08-26T00:40:19+02:00 (4 years ago)
Author:
Don-vip
Message:

see #15182 - move SearchCompiler from actions.search to data.osm.search

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java

    r12548 r12656  
    99import org.junit.Test;
    1010import org.openstreetmap.josm.JOSMFixture;
    11 import org.openstreetmap.josm.actions.search.SearchCompiler;
    12 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
    1311import org.openstreetmap.josm.data.osm.Node;
    1412import org.openstreetmap.josm.data.osm.Relation;
    1513import org.openstreetmap.josm.data.osm.RelationMember;
     14import org.openstreetmap.josm.data.osm.search.SearchCompiler;
     15import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
     16import org.openstreetmap.josm.data.osm.search.SearchParseError;
    1617import org.openstreetmap.josm.testutils.DatasetFactory;
    1718import org.unitils.reflectionassert.ReflectionAssert;
     
    7980    }
    8081
    81     private static Match compile(String expression) throws SearchCompiler.ParseError {
     82    private static Match compile(String expression) throws SearchParseError {
    8283        return SearchCompiler.compile(expression);
    8384    }
     
    8687     * Test to parse a search expression condition.
    8788     * @throws ParseError if the template cannot be parsed
    88      * @throws SearchCompiler.ParseError if an error has been encountered while compiling
    89      */
    90     @Test
    91     public void testConditionSearchExpression() throws ParseError, SearchCompiler.ParseError {
     89     * @throws SearchParseError if an error has been encountered while compiling
     90     */
     91    @Test
     92    public void testConditionSearchExpression() throws ParseError, SearchParseError {
    9293        TemplateParser parser = new TemplateParser("?{ admin_level = 2 'NUTS 1' | admin_level = 4 'NUTS 2' |  '{admin_level}'}");
    9394        Condition condition = new Condition();
Note: See TracChangeset for help on using the changeset viewer.