Changeset 18049 in josm for trunk/test

Timestamp:

2021-07-17T16:24:05+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20796 - Delete image file from disk : only remove images from geoimage layer after successful deletion

File:

• trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java

@@ -55 +55 @@
         assertFalse(data.hasNextImage());
         assertFalse(data.hasPreviousImage());
-        data.removeSelectedImage();
+        data.removeSelectedImages();
     }
 
@@ -182 +182 @@
 
     @Test
-    void testRemoveSelectedImage() {
-        List<ImageEntry> list = getOneImage();
-        ImageData data = new ImageData(list);
-        data.selectFirstImage();
-        data.removeSelectedImage();
+    void testRemoveSelectedImages() {
+        List<ImageEntry> list = getOneImage();
+        list.add(new ImageEntry());
+
+        ImageData data = new ImageData(list);
+        data.selectFirstImage();
+        data.addImageToSelection(list.get(1));
+        data.removeSelectedImages();
         assertEquals(0, data.getImages().size());
         assertEquals(0, data.getSelectedImages().size());
@@ -192 +195 @@
 
     @Test
-    void testRemoveSelectedImages() {
-        List<ImageEntry> list = getOneImage();
-        list.add(new ImageEntry());
-
-        ImageData data = new ImageData(list);
-        data.selectFirstImage();
-        data.addImageToSelection(list.get(1));
-        data.removeSelectedImages();
-        assertEquals(0, data.getImages().size());
-        assertEquals(0, data.getSelectedImages().size());
-    }
-
-    @Test
     void testRemoveSelectedImagesWithRemainingImages() {
         List<ImageEntry> list = getOneImage();
@@ -261 +251 @@
         data.addImageDataUpdateListener(listener);
         data.selectFirstImage();
-        data.removeSelectedImage();
+        data.removeSelectedImages();
     }