Changeset 12727 in josm for trunk/test/unit/org

Timestamp:

2017-09-05T00:03:28+02:00 (7 years ago)

Author:

Don-vip

Message:

see #13036 - forgot two unit tests

Location:

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

Files:

• DeleteCommandTest.java (modified) (11 diffs)
• PurgeCommandTest.java (modified) (5 diffs)

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

@@ -103 +103 @@
     @Test
     public void testReferredDelete() {
-        DeleteCommand.deleteWithReferences(testData.layer, Arrays.asList(testData.existingNode), true).executeCommand();
+        DeleteCommand.deleteWithReferences(Arrays.asList(testData.existingNode), true).executeCommand();
 
         assertTrue(testData.existingNode.isDeleted());
@@ -206 +206 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Way with only 1 segment
      */
@@ -213 +213 @@
         Way way1 = testData.createWay(100, testData.createNode(101), testData.createNode(102));
         WaySegment ws = new WaySegment(way1, 0);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 
@@ -220 +220 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Delete end of way
      */
@@ -228 +228 @@
                 testData.createNode(204));
         WaySegment ws = new WaySegment(way, 2);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 
@@ -238 +238 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Delete start of way
      */
@@ -246 +246 @@
                 testData.createNode(104));
         WaySegment ws = new WaySegment(way, 0);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 
@@ -256 +256 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Delete start of way
      */
@@ -265 +265 @@
         Way way = testData.createWay(100, testData.createNode(101), testData.createNode(102), node103, node104);
         WaySegment ws = new WaySegment(way, 1);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 
@@ -280 +280 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Delete start of way
      */
@@ -289 +289 @@
                 testData.createNode(104), n);
         WaySegment ws = new WaySegment(way, 2);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 

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

@@ -62 +62 @@
         // to check that algorithm ignores it:
         Relation relationParent3 = testData.createRelation(102, new RelationMember("child", testData.existingRelation));
-        PurgeCommand command = new PurgeCommand(testData.layer,
+        PurgeCommand command = new PurgeCommand(testData.layer.data,
                 Arrays.<OsmPrimitive>asList(testData.existingNode, testData.existingNode2, testData.existingWay,
                         testData.existingRelation, relationParent, relationParent2),
@@ -83 +83 @@
     @Test
     public void testUndo() {
-        PurgeCommand command = new PurgeCommand(testData.layer,
+        PurgeCommand command = new PurgeCommand(testData.layer.data,
                 Arrays.<OsmPrimitive>asList(testData.existingNode, testData.existingWay),
                 Arrays.<OsmPrimitive>asList(testData.existingWay));
@@ -107 +107 @@
         ArrayList<OsmPrimitive> deleted = new ArrayList<>();
         ArrayList<OsmPrimitive> added = new ArrayList<>();
-        PurgeCommand command = new PurgeCommand(testData.layer, Arrays.<OsmPrimitive>asList(testData.existingNode),
+        PurgeCommand command = new PurgeCommand(testData.layer.data, Arrays.<OsmPrimitive>asList(testData.existingNode),
                 Arrays.<OsmPrimitive>asList(testData.existingRelation));
         command.fillModifiedData(modified, deleted, added);
@@ -121 +121 @@
     @Test
     public void testGetParticipatingPrimitives() {
-        PurgeCommand command = new PurgeCommand(testData.layer, Arrays.<OsmPrimitive>asList(testData.existingNode),
+        PurgeCommand command = new PurgeCommand(testData.layer.data, Arrays.<OsmPrimitive>asList(testData.existingNode),
                 Arrays.<OsmPrimitive>asList(testData.existingRelation));
         assertArrayEquals(new Object[] {testData.existingNode }, command.getParticipatingPrimitives().toArray());
@@ -132 +132 @@
     public void testDescription() {
         List<OsmPrimitive> shortList = Arrays.<OsmPrimitive>asList(testData.existingWay);
-        assertTrue(new PurgeCommand(testData.layer, shortList, Arrays.<OsmPrimitive>asList()).getDescriptionText()
+        assertTrue(new PurgeCommand(testData.layer.data, shortList, Arrays.<OsmPrimitive>asList()).getDescriptionText()
                 .matches("Purged 1 object"));
         List<OsmPrimitive> longList = Arrays.<OsmPrimitive>asList(testData.existingNode, testData.existingNode2,
                 testData.existingWay);
-        assertTrue(new PurgeCommand(testData.layer, longList, Arrays.<OsmPrimitive>asList()).getDescriptionText()
+        assertTrue(new PurgeCommand(testData.layer.data, longList, Arrays.<OsmPrimitive>asList()).getDescriptionText()
                 .matches("Purged 3 objects"));
     }