Changeset 36228 in osm for applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideDataTest.java

Timestamp:

2024-03-14T16:34:12+01:00 (14 months ago)

Author:

taylor.smock

Message:

StreetSide: Update to official API

This also moves the plugin to Java 21 (mostly for virtual threads), reformats the
code to match the JOSM standard (4 spaces), and fixes a bunch of lint issues.

Additionally, a lot of cruft from when this plugin was copied from Mapillary was
removed. That was largely related to image import, uploading, and login.

File:

• applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideDataTest.java (modified) (4 diffs)

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideDataTest.java

@@ -12 +12 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.plugins.streetside.utils.TestUtil;
 import org.openstreetmap.josm.testutils.annotations.Main;
 
@@ -31 +31 @@
 
     /**
-     * Creates a sample {@link StreetsideData} objects, 4 {@link StreetsideImage}
-     * objects and a {@link StreetsideSequence} object.
+     * Creates a sample {@link StreetsideData} object and 4 {@link StreetsideImage}
+     * objects.
      */
     @BeforeEach
     public void setUp() {
-        img1 = new StreetsideImage("id1__________________", new LatLon(0.1, 0.1), 90);
-        img2 = new StreetsideImage("id2__________________", new LatLon(0.2, 0.2), 90);
-        img3 = new StreetsideImage("id3__________________", new LatLon(0.3, 0.3), 90);
-        img4 = new StreetsideImage("id4__________________", new LatLon(0.4, 0.4), 90);
-        final StreetsideSequence seq = new StreetsideSequence();
-
-        seq.add(Arrays.asList(img1, img2, img3, img4));
+        img1 = TestUtil.generateImage("1", 0.1, 0.1);
+        img2 = TestUtil.generateImage("2", 0.2, 0.2);
+        img3 = TestUtil.generateImage("3", 0.3, 0.3);
+        img4 = TestUtil.generateImage("4", 0.4, 0.4);
 
         data = new StreetsideData();
-        data.addAll(new ConcurrentSkipListSet<>(seq.getImages()));
+        data.addAll(Arrays.asList(img1, img2, img3, img4));
     }
 
@@ -72 +69 @@
     void testSize() {
         assertEquals(4, data.getImages().size());
-        data.add(new StreetsideImage("id5__________________", new LatLon(0.1, 0.1), 90));
+        data.add(TestUtil.generateImage("5", 0.1, 0.1));
         assertEquals(5, data.getImages().size());
     }
 
     /**
-     * Test the {@link StreetsideData#setHighlightedImage(StreetsideAbstractImage)}
+     * Test the {@link StreetsideData#setHighlightedImage(StreetsideImage)}
      * and {@link StreetsideData#getHighlightedImage()} methods.
      */
@@ -137 +134 @@
         assertThrows(IllegalStateException.class, data::selectPrevious);
     }
-
-    /**
-     * Test the multiselection of images. When a new image is selected, the
-     * multiselected List should reset.
-     */
-    @Disabled("The imgs have non-int identifiers while the code expects the identifiers to be int in string form")
-    @Test
-    void testMultiSelect() {
-        assertEquals(0, data.getMultiSelectedImages().size());
-        data.setSelectedImage(img1);
-        assertEquals(1, data.getMultiSelectedImages().size());
-        data.addMultiSelectedImage(img2);
-        assertEquals(2, data.getMultiSelectedImages().size());
-        data.setSelectedImage(img1);
-        assertEquals(1, data.getMultiSelectedImages().size());
-    }
 }