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

Timestamp:

2017-09-04T23:45:49+02:00 (7 years ago)

Author:

Don-vip

Message:

see #13036 - deprecate Command() default constructor, fix unit tests and java warnings

File:

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

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

@@ -6 +6 @@
 import static org.junit.Assert.assertTrue;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.command.CommandTest.CommandTestData;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -28 +27 @@
 public class ConflictAddCommandTest {
 
-    private OsmDataLayer layer;
-
     /**
      * Setup test.
@@ -36 +33 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().platform();
+    private CommandTestData testData;
 
     /**
@@ -42 +40 @@
     @Before
     public void setUp() {
-        layer = new OsmDataLayer(new DataSet(), null, null);
-        MainApplication.getLayerManager().addLayer(layer);
-    }
-
-    /**
-     * Cleanup test resources.
-     */
-    @After
-    public void tearDown() {
-        MainApplication.getLayerManager().removeLayer(layer);
+        testData = new CommandTestData();
     }
 
@@ -59 +48 @@
     @Test
     public void testExecuteUndoCommand() {
-        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
-        Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
+        DataSet ds = testData.layer.data;
+        Conflict<Node> conflict = new Conflict<>(testData.existingNode, testData.existingNode2);
         ConflictAddCommand cmd = new ConflictAddCommand(ds, conflict);
         assertTrue(cmd.executeCommand());
@@ -75 +64 @@
     @Test
     public void testGetDescriptionIcon() {
-        OsmDataLayer layer = MainApplication.getLayerManager().getEditLayer();
-        Conflict<Node> conflict = new Conflict<>(new Node(), new Node());
-        assertNotNull(new ConflictAddCommand(layer, conflict).getDescriptionIcon());
+        Conflict<Node> conflict = new Conflict<>(testData.existingNode, testData.existingNode2);
+        assertNotNull(new ConflictAddCommand(testData.layer.data, conflict).getDescriptionIcon());
     }