Changeset 12718 in josm for trunk/test/unit/org/openstreetmap/josm/command

Timestamp:

2017-09-04T00:50:22+02:00 (7 years ago)

Author:

Don-vip

Message:

see #13036 - see #15229 - see #15182 - make Commands depends only on a DataSet, not a Layer. This removes a lot of GUI dependencies

File:

• trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.command;
 
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
@@ -50 +48 @@
 
     /**
-     * Test {@link Command#invalidBecauselayerRemoved(org.openstreetmap.josm.gui.layer.Layer)}
+     * Test {@link Command#getLayer()}
+     * @deprecated to be removed end of 2017
      */
     @Test
-    public void testInvalidBecauselayerRemoved() {
-        OsmDataLayer layer2 = new OsmDataLayer(new DataSet(), "test", null);
-
-        Command command = new NopCommand();
-        assertFalse(command.invalidBecauselayerRemoved(layer2));
-        assertTrue(command.invalidBecauselayerRemoved(testData.layer));
-
-        Command command2 = new NopCommand(layer2);
-        assertTrue(command2.invalidBecauselayerRemoved(layer2));
-        assertFalse(command2.invalidBecauselayerRemoved(testData.layer));
-    }
-
-    /**
-     * Test {@link Command#getLayer()}
-     */
-    @Test
+    @Deprecated
     public void testGetLayer() {
         OsmDataLayer layer2 = new OsmDataLayer(new DataSet(), "test", null);
         Command command = new NopCommand();
-        Command command2 = new NopCommand(layer2);
+        Command command2 = new NopCommand(layer2.data);
         assertSame(testData.layer, command.getLayer());
         assertSame(layer2, command2.getLayer());
@@ -98 +82 @@
         }
 
-        NopCommand(OsmDataLayer layer) {
-            super(layer);
+        NopCommand(DataSet dataset) {
+            super(dataset);
         }