Changeset 8914 in josm for trunk

Timestamp:

2015-10-19T23:49:11+02:00 (9 years ago)

Author:

Don-vip

Message:

improve unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java (added)

trunk/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java

@@ -61 +61 @@
     @Override
     public void undoCommand() {
-        if (Main.map != null && !Main.map.mapView.hasLayer(getLayer())) {
+        if (Main.isDisplayingMapView() && !Main.map.mapView.hasLayer(getLayer())) {
             Main.warn(tr("Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
                     getLayer().getName(),

trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

@@ -68 +68 @@
         super.undoCommand();
 
-        if (!Main.map.mapView.hasLayer(getLayer())) {
-            Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
-                    this.toString(),
-                    getLayer().toString()
-            ));
-            return;
+        if (Main.isDisplayingMapView()) {
+            if (!Main.map.mapView.hasLayer(getLayer())) {
+                Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
+                        this.toString(),
+                        getLayer().toString()
+                ));
+                return;
+            }
+
+            Main.map.mapView.setActiveLayer(getLayer());
         }
-
-        Main.map.mapView.setActiveLayer(getLayer());
         reconstituteConflicts();
     }

trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -15 +19 @@
  */
 public class ConflictAddCommandTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
 
     /**
@@ -31 +43 @@
         assertTrue(layer.getConflicts().isEmpty());
     }
+
+    /**
+     * Unit test of {@code ConflictAddCommand#getDescriptionIcon} method.
+     */
+    @Test
+    public void testGetDescriptionIcon() {
+        OsmDataLayer layer = new OsmDataLayer(new DataSet(), null, null);
+        Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
+        assertNotNull(new ConflictAddCommand(layer, conflict).getDescriptionIcon());
+    }
 }