Changeset 33446 in osm for applications/editors/josm/plugins/pt_assistant

Timestamp:

2017-07-14T18:51:47+02:00 (7 years ago)

Author:

giackserva

Message:

[pt_assistant] #josm14977 - unit tests

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• src/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTStopsAction.java (modified) (5 diffs)
• test/data/sort_test.osm (added)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTStopsActionTest.java (added)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/SortPTStopsAction.java

@@ -21 +21 @@
 import org.openstreetmap.josm.actions.relation.DownloadSelectedIncompleteMembersAction;
 import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
@@ -44 +43 @@
 public class SortPTStopsAction extends JosmAction {
 
-    private static final long serialVersionUID = 1714879296430852530L;
     private static final String ACTION_NAME = "Sort PT Stops";
 
@@ -87 +85 @@
 
     private void continueAfterDownload(Relation rel) {
-        Main.main.undoRedo.add(getSortPTStopCommand(rel));
-    }
-
-    public Command getSortPTStopCommand(Relation rel) {
         Relation newRel = new Relation(rel);
-        List<RelationMember> members = newRel.getMembers();
+        sortPTStops(newRel);
+        Main.main.undoRedo.add(new ChangeCommand(rel, newRel));
+    }
+
+    public void sortPTStops(Relation rel) {
+        List<RelationMember> members = rel.getMembers();
         for (int i = 0; i < members.size(); i++) {
-            newRel.removeMember(0);
+            rel.removeMember(0);
         }
         members = new RelationSorter().sortMembers(members);
@@ -154 +153 @@
                         if (stop != null) {
                             if (stop.getStopPositionRM() != null)
-                                newRel.addMember(stop.getStopPositionRM());
+                                rel.addMember(stop.getStopPositionRM());
                             if (stop.getPlatformRM() != null)
-                                newRel.addMember(stop.getPlatformRM());
+                                rel.addMember(stop.getPlatformRM());
                         }
                     });
@@ -164 +163 @@
         }
 
-        wayMembers.forEach(newRel::addMember);
-
-        return new ChangeCommand(rel, newRel);
+        wayMembers.forEach(rel::addMember);
     }
 

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/AbstractTest.java

@@ -40 +40 @@
  public static final String PATH_TO_ROUNDABOUT_ONEWAY = "test/data/duesseldorf_roundabout.osm";
 
+ public static final String PATH_TO_SORT_PT_STOPS = "test/data/sort_test.osm";
+
  public static final String PATH_TO_ROAD_TYPE_ERROR = "test/data/road-type.osm";