Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java (revision 18030) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java (revision 18035) @@ -2,22 +2,10 @@ package org.openstreetmap.josm.gui.layer.geoimage; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; - -import java.io.File; -import java.io.InputStream; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.gui.MainApplication; -import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer.Loader; -import org.openstreetmap.josm.io.GpxReader; import org.openstreetmap.josm.testutils.JOSMTestRules; @@ -36,29 +24,4 @@ /** - * Unit test of {@link Loader} class. - * @throws Exception if any error occurs - */ - @Test - void testLoader() throws Exception { - try (InputStream in = TestUtils.getRegressionDataStream(12255, "bobrava2.gpx")) { - GpxReader reader = new GpxReader(in); - assertTrue(reader.parse(true)); - GpxLayer gpxLayer = new GpxLayer(reader.getGpxData()); - MainApplication.getLayerManager().addLayer(gpxLayer); - assertEquals(1, MainApplication.getLayerManager().getLayers().size()); - new Loader( - Collections.singleton(new File(TestUtils.getRegressionDataFile(12255, "G0016941.JPG"))), - gpxLayer).run(); - assertEquals(2, MainApplication.getLayerManager().getLayers().size()); - GeoImageLayer layer = MainApplication.getLayerManager().getLayersOfType(GeoImageLayer.class).iterator().next(); - assertEquals(gpxLayer, layer.getGpxLayer()); - List images = layer.getImages(); - assertEquals(1, images.size()); - assertEquals("1 image loaded. 0 were found to be GPS tagged.", layer.getInfoComponent()); - assertEquals("1 image loaded. 0 were found to be GPS tagged.", layer.getToolTipText()); - } - } - - /** * Test that {@link GeoImageLayer#mergeFrom} throws IAE for invalid arguments */ Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImagesLoaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImagesLoaderTest.java (revision 18035) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImagesLoaderTest.java (revision 18035) @@ -0,0 +1,58 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.layer.geoimage; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.File; +import java.io.InputStream; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.openstreetmap.josm.TestUtils; +import org.openstreetmap.josm.gui.MainApplication; +import org.openstreetmap.josm.gui.layer.GpxLayer; +import org.openstreetmap.josm.io.GpxReader; +import org.openstreetmap.josm.testutils.JOSMTestRules; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + +/** + * Unit tests of {@link ImagesLoader} class. + */ +class ImagesLoaderTest { + + /** + * We need prefs for this. + */ + @RegisterExtension + @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") + public JOSMTestRules test = new JOSMTestRules().preferences(); + + /** + * Unit test of {@link ImagesLoader} class. + * @throws Exception if any error occurs + */ + @Test + void testLoader() throws Exception { + try (InputStream in = TestUtils.getRegressionDataStream(12255, "bobrava2.gpx")) { + GpxReader reader = new GpxReader(in); + assertTrue(reader.parse(true)); + GpxLayer gpxLayer = new GpxLayer(reader.getGpxData()); + MainApplication.getLayerManager().addLayer(gpxLayer); + assertEquals(1, MainApplication.getLayerManager().getLayers().size()); + new ImagesLoader( + Collections.singleton(new File(TestUtils.getRegressionDataFile(12255, "G0016941.JPG"))), + gpxLayer).run(); + assertEquals(2, MainApplication.getLayerManager().getLayers().size()); + GeoImageLayer layer = MainApplication.getLayerManager().getLayersOfType(GeoImageLayer.class).iterator().next(); + assertEquals(gpxLayer, layer.getGpxLayer()); + List images = layer.getImages(); + assertEquals(1, images.size()); + assertEquals("1 image loaded. 0 were found to be GPS tagged.", layer.getInfoComponent()); + assertEquals("1 image loaded. 0 were found to be GPS tagged.", layer.getToolTipText()); + } + } +}