Changeset 12659 in josm for trunk/test/unit


Ignore:
Timestamp:
2017-08-26T00:55:22+02:00 (2 years ago)
Author:
Don-vip
Message:

see #15182 - extract SearchMode and SearchSetting from actions.search.SearchAction to data.osm.search

Location:
trunk/test/unit/org/openstreetmap/josm
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java

    r12656 r12659  
    1212import org.junit.Test;
    1313import org.openstreetmap.josm.TestUtils;
    14 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
    1514import org.openstreetmap.josm.command.SequenceCommand;
    1615import org.openstreetmap.josm.data.osm.DataSet;
     
    1918import org.openstreetmap.josm.data.osm.Way;
    2019import org.openstreetmap.josm.data.osm.search.SearchParseError;
     20import org.openstreetmap.josm.data.osm.search.SearchSetting;
    2121import org.openstreetmap.josm.data.osm.search.SearchCompiler;
    2222import org.openstreetmap.josm.io.OsmReader;
  • trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

    r12643 r12659  
    2525import org.openstreetmap.josm.data.osm.RelationMember;
    2626import org.openstreetmap.josm.data.osm.Way;
     27import org.openstreetmap.josm.data.osm.search.SearchMode;
    2728import org.openstreetmap.josm.gui.MainApplication;
    2829import org.openstreetmap.josm.gui.layer.Layer;
     
    8485            for (String ref : new String[]{"A", "B", "C", "D", "E"}) {
    8586                System.out.print("Joining ways " + ref);
    86                 Collection<OsmPrimitive> found = SearchAction.searchAndReturn("type:way ref="+ref, SearchAction.SearchMode.replace);
     87                Collection<OsmPrimitive> found = SearchAction.searchAndReturn("type:way ref="+ref, SearchMode.replace);
    8788                assertEquals(2, found.size());
    8889
    8990                MainApplication.getMenu().joinAreas.join(Utils.filteredCollection(found, Way.class));
    9091
    91                 Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, SearchAction.SearchMode.replace);
     92                Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, SearchMode.replace);
    9293                assertEquals(1, found2.size());
    9394                System.out.println(" ==> OK");
  • trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java

    r12656 r12659  
    1616import org.junit.Rule;
    1717import org.junit.Test;
    18 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
    1918import org.openstreetmap.josm.data.coor.LatLon;
    2019import org.openstreetmap.josm.data.osm.Filter.FilterPreferenceEntry;
     20import org.openstreetmap.josm.data.osm.search.SearchMode;
    2121import org.openstreetmap.josm.data.osm.search.SearchParseError;
    2222import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
  • trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

    r12656 r12659  
    1919import org.junit.Test;
    2020import org.openstreetmap.josm.TestUtils;
    21 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
    2221import org.openstreetmap.josm.data.coor.LatLon;
    2322import org.openstreetmap.josm.data.osm.DataSet;
  • trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchModeTest.java

    r12656 r12659  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.actions.search;
     2package org.openstreetmap.josm.data.osm.search;
    33
    44import org.junit.Rule;
    55import org.junit.Test;
    66import org.openstreetmap.josm.TestUtils;
    7 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
    8 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
    97import org.openstreetmap.josm.testutils.JOSMTestRules;
    108
     
    1210
    1311/**
    14  * Unit tests for class {@link SearchCompiler}.
     12 * Unit tests for class {@link SearchMode}.
    1513 */
    16 public class SearchActionTest {
     14public class SearchModeTest {
    1715
    1816    /**
  • trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollectionTest.java

    r12656 r12659  
    1111import org.junit.Rule;
    1212import org.junit.Test;
    13 import org.openstreetmap.josm.actions.search.SearchAction;
    1413import org.openstreetmap.josm.data.osm.Tag;
    1514import org.openstreetmap.josm.data.osm.search.SearchParseError;
     15import org.openstreetmap.josm.data.osm.search.SearchSetting;
    1616import org.openstreetmap.josm.data.preferences.CollectionProperty;
    1717import org.openstreetmap.josm.testutils.JOSMTestRules;
     
    6363        recentTags.add(bar);
    6464        recentTags.add(baz);
    65         final SearchAction.SearchSetting searchSetting = new SearchAction.SearchSetting();
     65        final SearchSetting searchSetting = new SearchSetting();
    6666        recentTags.ignoreTag(baz, searchSetting);
    6767        recentTags.ignoreTag(new Tag("something", "else"), searchSetting);
Note: See TracChangeset for help on using the changeset viewer.