Changeset 8917 in josm for trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java

Timestamp:

2015-10-20T16:05:10+02:00 (9 years ago)

Author:

Don-vip

Message:

fix unit tests

File:

• trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java (modified) (4 diffs)

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

@@ -9 +9 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -24 +25 @@
     @BeforeClass
     public static void setUpBeforeClass() {
-        JOSMFixture.createUnitTestFixture().init();
+        JOSMFixture.createUnitTestFixture().init(true);
+        Main.map.mapView.addLayer(new OsmDataLayer(new DataSet(), null, null));
     }
 
@@ -32 +34 @@
     @Test
     public void testExecuteUndoCommand() {
-        OsmDataLayer layer = new OsmDataLayer(new DataSet(), null, null);
+        OsmDataLayer layer = Main.map.mapView.getEditLayer();
         Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
         ConflictAddCommand cmd = new ConflictAddCommand(layer, conflict);
@@ -48 +50 @@
     @Test
     public void testGetDescriptionIcon() {
-        OsmDataLayer layer = new OsmDataLayer(new DataSet(), null, null);
+        OsmDataLayer layer = Main.map.mapView.getEditLayer();
         Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
         assertNotNull(new ConflictAddCommand(layer, conflict).getDescriptionIcon());