Changeset 9675 in josm for trunk

Timestamp:

2016-01-29T22:08:26+01:00 (8 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/JosmAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/Coastlines.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/actions/upload (added)
• test/unit/org/openstreetmap/josm/actions/upload/FixDataHookTest.java (added)
• test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java (added)
• test/unit/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUITest.java (added)
• test/unit/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUITest.java (added)
• test/unit/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUITest.java (added)

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -208 +208 @@
      * @return the current edit layer. null, if no edit layer exists
      */
-    protected static OsmDataLayer getEditLayer() {
+    public static OsmDataLayer getEditLayer() {
         return Main.main != null ? Main.main.getEditLayer() : null;
     }

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -14 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -73 +74 @@
         }
         tests = null;
-        OsmDataLayer editLayer = Main.main.getEditLayer();
-        editLayer.validationErrors.clear();
-        editLayer.validationErrors.addAll(errors);
-        Main.map.validatorDialog.tree.setErrors(errors);
-        if (errors == null || errors.isEmpty())
+        OsmDataLayer editLayer = JosmAction.getEditLayer();
+        if (editLayer != null) {
+            editLayer.validationErrors.clear();
+            editLayer.validationErrors.addAll(errors);
+        }
+        if (Main.map != null) {
+            Main.map.validatorDialog.tree.setErrors(errors);
+        }
+        if (errors.isEmpty())
             return true;
 

trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java

@@ -12 +12 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
@@ -53 +53 @@
         super.startTest(monitor);
 
-        OsmDataLayer layer = Main.main.getEditLayer();
+        OsmDataLayer layer = JosmAction.getEditLayer();
 
         if (layer != null) {

trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java

@@ -8 +8 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -120 +121 @@
     public void startTest(ProgressMonitor monitor) {
         super.startTest(monitor);
+        DataSet ds = JosmAction.getCurrentDataSet();
+        if (ds == null)
+            return;
         waysUsedInRelations = new HashSet<>();
-        for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
+        for (Relation r : ds.getRelations()) {
             if (r.isUsable()) {
                 for (RelationMember m : r.getMembers()) {