Changeset 8914 in josm for trunk/test

Timestamp:

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

Author:

Don-vip

Message:

improve unit tests

Location:

trunk/test/unit/org/openstreetmap/josm/command/conflict

Files:

• ConflictAddCommandTest.java (modified) (3 diffs)
• CoordinateConflictResolveCommandTest.java (added)

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());
+    }
 }