Changeset 17310 in josm for trunk/test/unit

Timestamp:

2020-11-14T16:31:36+01:00 (4 years ago)

Author:

Don-vip

Message:

see #16567 - rewrite ImageDataTest to get rid of problematic JMockit annotation

File:

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

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

@@ -9 +9 @@
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
@@ -20 +22 @@
 import mockit.Mock;
 import mockit.MockUp;
-import mockit.Mocked;
-import mockit.Verifications;
 
 /**
@@ -28 +28 @@
 class ImageDataTest {
 
+    private static ImageEntry newImageEntry(String file, Date exifTime) {
+        ImageEntry entry = new ImageEntry(new File(file));
+        entry.setExifTime(exifTime);
+        return entry;
+    }
+
     private static List<ImageEntry> getOneImage() {
         ArrayList<ImageEntry> list = new ArrayList<>();
-        list.add(new ImageEntry(new File("test")));
+        list.add(newImageEntry("test", null));
         return list;
     }
@@ -58 +64 @@
 
     @Test
-    void testSortData(@Mocked Collections ignore) {
-        List<ImageEntry> list = getOneImage();
-
-        new ImageData(list);
-
-        new Verifications() {{
-            Collections.sort(list);
-        }};
+    void testSortData() {
+        ImageEntry entry1 = newImageEntry("test1", new Date(1_000_000));
+        ImageEntry entry2 = newImageEntry("test2", new Date(2_000_000));
+
+        ArrayList<ImageEntry> list = new ArrayList<>();
+        list.add(entry2);
+        list.add(entry1);
+
+        assertEquals(Arrays.asList(entry1, entry2), new ImageData(list).getImages());
     }