Changeset 12659 in josm for trunk/test/unit/org
- Timestamp:
- 2017-08-26T00:55:22+02:00 (7 years ago)
- 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 12 12 import org.junit.Test; 13 13 import org.openstreetmap.josm.TestUtils; 14 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;15 14 import org.openstreetmap.josm.command.SequenceCommand; 16 15 import org.openstreetmap.josm.data.osm.DataSet; … … 19 18 import org.openstreetmap.josm.data.osm.Way; 20 19 import org.openstreetmap.josm.data.osm.search.SearchParseError; 20 import org.openstreetmap.josm.data.osm.search.SearchSetting; 21 21 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 22 22 import org.openstreetmap.josm.io.OsmReader; -
trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
r12643 r12659 25 25 import org.openstreetmap.josm.data.osm.RelationMember; 26 26 import org.openstreetmap.josm.data.osm.Way; 27 import org.openstreetmap.josm.data.osm.search.SearchMode; 27 28 import org.openstreetmap.josm.gui.MainApplication; 28 29 import org.openstreetmap.josm.gui.layer.Layer; … … 84 85 for (String ref : new String[]{"A", "B", "C", "D", "E"}) { 85 86 System.out.print("Joining ways " + ref); 86 Collection<OsmPrimitive> found = SearchAction.searchAndReturn("type:way ref="+ref, Search Action.SearchMode.replace);87 Collection<OsmPrimitive> found = SearchAction.searchAndReturn("type:way ref="+ref, SearchMode.replace); 87 88 assertEquals(2, found.size()); 88 89 89 90 MainApplication.getMenu().joinAreas.join(Utils.filteredCollection(found, Way.class)); 90 91 91 Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, Search Action.SearchMode.replace);92 Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, SearchMode.replace); 92 93 assertEquals(1, found2.size()); 93 94 System.out.println(" ==> OK"); -
trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
r12656 r12659 16 16 import org.junit.Rule; 17 17 import org.junit.Test; 18 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;19 18 import org.openstreetmap.josm.data.coor.LatLon; 20 19 import org.openstreetmap.josm.data.osm.Filter.FilterPreferenceEntry; 20 import org.openstreetmap.josm.data.osm.search.SearchMode; 21 21 import org.openstreetmap.josm.data.osm.search.SearchParseError; 22 22 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; -
trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java
r12656 r12659 19 19 import org.junit.Test; 20 20 import org.openstreetmap.josm.TestUtils; 21 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;22 21 import org.openstreetmap.josm.data.coor.LatLon; 23 22 import org.openstreetmap.josm.data.osm.DataSet; -
trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchModeTest.java
r12656 r12659 1 1 // License: GPL. For details, see LICENSE file. 2 package org.openstreetmap.josm. actions.search;2 package org.openstreetmap.josm.data.osm.search; 3 3 4 4 import org.junit.Rule; 5 5 import org.junit.Test; 6 6 import org.openstreetmap.josm.TestUtils; 7 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;8 import org.openstreetmap.josm.data.osm.search.SearchCompiler;9 7 import org.openstreetmap.josm.testutils.JOSMTestRules; 10 8 … … 12 10 13 11 /** 14 * Unit tests for class {@link Search Compiler}.12 * Unit tests for class {@link SearchMode}. 15 13 */ 16 public class Search ActionTest {14 public class SearchModeTest { 17 15 18 16 /** -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollectionTest.java
r12656 r12659 11 11 import org.junit.Rule; 12 12 import org.junit.Test; 13 import org.openstreetmap.josm.actions.search.SearchAction;14 13 import org.openstreetmap.josm.data.osm.Tag; 15 14 import org.openstreetmap.josm.data.osm.search.SearchParseError; 15 import org.openstreetmap.josm.data.osm.search.SearchSetting; 16 16 import org.openstreetmap.josm.data.preferences.CollectionProperty; 17 17 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 63 63 recentTags.add(bar); 64 64 recentTags.add(baz); 65 final Search Action.SearchSetting searchSetting = new SearchAction.SearchSetting();65 final SearchSetting searchSetting = new SearchSetting(); 66 66 recentTags.ignoreTag(baz, searchSetting); 67 67 recentTags.ignoreTag(new Tag("something", "else"), searchSetting);
Note:
See TracChangeset
for help on using the changeset viewer.