Changeset 12659 in josm for trunk/test

Timestamp:

2017-08-26T00:55:22+02:00 (7 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:

• actions/CreateMultipolygonActionTest.java (modified) (2 diffs)
• actions/JoinAreasActionTest.java (modified) (2 diffs)
• data/osm/FilterTest.java (modified) (1 diff)
• data/osm/search/SearchCompilerTest.java (modified) (1 diff)
• data/osm/search/SearchModeTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/actions/search/SearchActionTest.java ) (2 diffs)
• gui/dialogs/properties/RecentTagCollectionTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java

@@ -12 +12 @@
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -19 +18 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
+import org.openstreetmap.josm.data.osm.search.SearchSetting;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
 import org.openstreetmap.josm.io.OsmReader;

trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.search.SearchMode;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -84 +85 @@
             for (String ref : new String[]{"A", "B", "C", "D", "E"}) {
                 System.out.print("Joining ways " + ref);
-                Collection<OsmPrimitive> found = SearchAction.searchAndReturn("type:way ref="+ref, SearchAction.SearchMode.replace);
+                Collection<OsmPrimitive> found = SearchAction.searchAndReturn("type:way ref="+ref, SearchMode.replace);
                 assertEquals(2, found.size());
 
                 MainApplication.getMenu().joinAreas.join(Utils.filteredCollection(found, Way.class));
 
-                Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, SearchAction.SearchMode.replace);
+                Collection<OsmPrimitive> found2 = SearchAction.searchAndReturn("type:way ref="+ref, SearchMode.replace);
                 assertEquals(1, found2.size());
                 System.out.println(" ==> OK");

trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java

@@ -16 +16 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Filter.FilterPreferenceEntry;
+import org.openstreetmap.josm.data.osm.search.SearchMode;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

@@ -19 +19 @@
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchModeTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.actions.search;
+package org.openstreetmap.josm.data.osm.search;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
-import org.openstreetmap.josm.data.osm.search.SearchCompiler;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -12 +10 @@
 
 /**
- * Unit tests for class {@link SearchCompiler}.
+ * Unit tests for class {@link SearchMode}.
  */
-public class SearchActionTest {
+public class SearchModeTest {
 
     /**

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollectionTest.java

@@ -11 +11 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
+import org.openstreetmap.josm.data.osm.search.SearchSetting;
 import org.openstreetmap.josm.data.preferences.CollectionProperty;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -63 +63 @@
         recentTags.add(bar);
         recentTags.add(baz);
-        final SearchAction.SearchSetting searchSetting = new SearchAction.SearchSetting();
+        final SearchSetting searchSetting = new SearchSetting();
         recentTags.ignoreTag(baz, searchSetting);
         recentTags.ignoreTag(new Tag("something", "else"), searchSetting);