Changeset 15348 in josm for trunk/test/unit/org/openstreetmap/josm/data/ImageDataTest.java

Timestamp:

2019-09-12T23:23:47+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18119 - Deselect and remove multiple images in the ImageViewerDialog (patch by francois2)

File:

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

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

@@ -183 +183 @@
 
     @Test
-    public void testRemoveSelectedWithImageTriggerListener() {
+    public 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
+    public void testRemoveSelectedImageTriggerListener() {
         List<ImageEntry> list = getOneImage();
         list.add(new ImageEntry());
@@ -200 +213 @@
         data.selectFirstImage();
         data.removeSelectedImage();
+    }
+
+    @Test
+    public void testRemoveSelectedImagesTriggerListener() {
+        List<ImageEntry> list = getOneImage();
+        list.add(new ImageEntry());
+        ImageData data = new ImageData(list);
+        ImageDataUpdateListener listener = new ImageDataUpdateListener() {
+            @Override
+            public void selectedImageChanged(ImageData data) {}
+
+            @Override
+            public void imageDataUpdated(ImageData data) {}
+        };
+        new Expectations(listener) {{
+            listener.selectedImageChanged(data); times = 2;
+        }};
+        data.addImageDataUpdateListener(listener);
+        data.selectFirstImage();
+        data.removeSelectedImages();
     }