diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java index b383ab729..33a1eebb1 100644 --- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java +++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java @@ -228,7 +228,8 @@ public class TaggingPreset extends AbstractAction implements ActiveLayerChangeLi } File arch = TaggingPresetReader.getZipIcons(); final Collection s = Config.getPref().getList("taggingpreset.icon.sources", null); - this.iconFuture = new ImageProvider(iconName) + this.iconFuture = new CompletableFuture<>(); + new ImageProvider(iconName) .setDirs(s) .setId("presets") .setArchive(arch) @@ -241,6 +242,8 @@ public class TaggingPreset extends AbstractAction implements ActiveLayerChangeLi } catch (IllegalArgumentException e) { Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName); Logging.warn(e); + } finally { + iconFuture.complete(null); } }); } else { diff --git a/test/unit/org/openstreetmap/josm/TestUtils.java b/test/unit/org/openstreetmap/josm/TestUtils.java index 464ab7d32..3729284ad 100644 --- a/test/unit/org/openstreetmap/josm/TestUtils.java +++ b/test/unit/org/openstreetmap/josm/TestUtils.java @@ -29,6 +29,8 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -47,12 +49,14 @@ import org.openstreetmap.josm.gui.progress.AbstractProgressMonitor; import org.openstreetmap.josm.gui.progress.CancelHandler; import org.openstreetmap.josm.gui.progress.ProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressTaskId; +import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset; import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.io.Compression; import org.openstreetmap.josm.testutils.FakeGraphics; import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker; import org.openstreetmap.josm.testutils.mockers.WindowMocker; import org.openstreetmap.josm.tools.JosmRuntimeException; +import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.ReflectionUtils; import org.openstreetmap.josm.tools.Utils; import org.openstreetmap.josm.tools.WikiReader; @@ -602,4 +606,15 @@ public final class TestUtils { .map(s -> s.substring(s.indexOf("{{{") + 3, s.indexOf("}}}"))) .collect(Collectors.toList()); } + + public static void waitForIconLoading(Collection presets) { + // wait for asynchronous icon loading + presets.parallelStream().map(TaggingPreset::getIconLoadingTask).filter(Objects::nonNull).forEach(t -> { + try { + t.get(30, TimeUnit.SECONDS); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + Logging.error(e); + } + }); + } } diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java b/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java index c2263a558..a391d0d4f 100644 --- a/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java +++ b/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java @@ -12,11 +12,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Locale; -import java.util.Objects; import java.util.Set; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import org.junit.BeforeClass; import org.junit.ClassRule; @@ -115,14 +111,7 @@ public class TaggingPresetPreferenceTestIT extends AbstractExtendedSourceEntryTe private void testPresets(Set messages, ExtendedSourceEntry source) throws SAXException, IOException { Collection presets = TaggingPresetReader.readAll(source.url, true); assertFalse(presets.isEmpty()); - // wait for asynchronous icon loading - presets.parallelStream().map(TaggingPreset::getIconLoadingTask).filter(Objects::nonNull).forEach(t -> { - try { - t.get(30, TimeUnit.SECONDS); - } catch (InterruptedException | ExecutionException | TimeoutException e) { - Logging.error(e); - } - }); + TestUtils.waitForIconLoading(presets); // check that links are correct and not redirections presets.parallelStream().flatMap(x -> x.data.stream().filter(i -> i instanceof Link).map(i -> ((Link) i).getUrl())).forEach(u -> { try { diff --git a/test/unit/org/openstreetmap/josm/tools/ImageProviderGetPaddedTest.java b/test/unit/org/openstreetmap/josm/tools/ImageProviderGetPaddedTest.java new file mode 100644 index 000000000..c3bdc5ccb --- /dev/null +++ b/test/unit/org/openstreetmap/josm/tools/ImageProviderGetPaddedTest.java @@ -0,0 +1,62 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.tools; + +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.openstreetmap.josm.JOSMFixture; +import org.openstreetmap.josm.TestUtils; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmUtils; +import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; +import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.tools.ImageProvider.GetPaddedOptions; + +import java.awt.Dimension; +import java.util.EnumSet; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +/** + * Unit tests of getPadded method of the {@link ImageProvider} class. + * This unit test is separated because it is the only one that needs a slow initialization. + */ +public class ImageProviderGetPaddedTest { + + /** + * Setup test. + */ + @Rule + @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") + public JOSMTestRules test = new JOSMTestRules().mapStyles().presets(); + + /** + * Setup test. + */ + @BeforeClass + public static void setUp() { + JOSMFixture.createUnitTestFixture().init(); + } + + /** + * Unit test of {@link ImageProvider#getPadded}. + */ + @Test + public void testGetPadded() { + TestUtils.waitForIconLoading(TaggingPresets.getTaggingPresets()); + + final EnumSet noDefault = EnumSet.of(GetPaddedOptions.NO_DEFAULT); + final Dimension iconSize = new Dimension(16, 16); + + assertNull(ImageProvider.getPadded(new Node(), new Dimension(0, 0))); + assertNotNull(ImageProvider.getPadded(new Node(), iconSize)); + assertNull(ImageProvider.getPadded(new Node(), iconSize, noDefault)); + assertNotNull(ImageProvider.getPadded(OsmUtils.createPrimitive("node amenity=restaurant"), iconSize, noDefault)); + assertNull(ImageProvider.getPadded(OsmUtils.createPrimitive("node barrier=hedge"), iconSize, + EnumSet.of(GetPaddedOptions.NO_DEFAULT, GetPaddedOptions.NO_DEPRECATED))); + assertNotNull(ImageProvider.getPadded(OsmUtils.createPrimitive("way waterway=stream"), iconSize, noDefault)); + assertNotNull(ImageProvider.getPadded(OsmUtils.createPrimitive("relation type=route route=railway"), iconSize, noDefault)); + } +} diff --git a/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java b/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java index bdf0ae0e8..84dfe2e2d 100644 --- a/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java +++ b/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java @@ -5,7 +5,6 @@ import static java.awt.image.BufferedImage.TYPE_INT_ARGB; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.awt.Color; @@ -22,7 +21,6 @@ import java.awt.event.MouseListener; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.util.EnumSet; import java.util.List; import java.util.logging.Handler; import java.util.logging.LogRecord; @@ -39,10 +37,7 @@ import org.junit.Rule; import org.junit.Test; import org.openstreetmap.josm.JOSMFixture; import org.openstreetmap.josm.TestUtils; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmUtils; import org.openstreetmap.josm.testutils.JOSMTestRules; -import org.openstreetmap.josm.tools.ImageProvider.GetPaddedOptions; import com.kitfox.svg.SVGConst; @@ -58,7 +53,7 @@ public class ImageProviderTest { */ @Rule @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") - public JOSMTestRules test = new JOSMTestRules().mapStyles().presets(); + public JOSMTestRules test = new JOSMTestRules(); private static final class LogHandler14319 extends Handler { boolean failed; @@ -152,24 +147,6 @@ public class ImageProviderTest { "//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==")); } - /** - * Unit test of {@link ImageProvider#getPadded}. - */ - @Test - public void testGetPadded() { - final EnumSet noDefault = EnumSet.of(GetPaddedOptions.NO_DEFAULT); - final Dimension iconSize = new Dimension(16, 16); - - assertNull(ImageProvider.getPadded(new Node(), new Dimension(0, 0))); - assertNotNull(ImageProvider.getPadded(new Node(), iconSize)); - assertNull(ImageProvider.getPadded(new Node(), iconSize, noDefault)); - assertNotNull(ImageProvider.getPadded(OsmUtils.createPrimitive("node amenity=restaurant"), iconSize, noDefault)); - assertNull(ImageProvider.getPadded(OsmUtils.createPrimitive("node barrier=hedge"), iconSize, - EnumSet.of(GetPaddedOptions.NO_DEFAULT, GetPaddedOptions.NO_DEPRECATED))); - assertNotNull(ImageProvider.getPadded(OsmUtils.createPrimitive("way waterway=stream"), iconSize, noDefault)); - assertNotNull(ImageProvider.getPadded(OsmUtils.createPrimitive("relation type=route route=railway"), iconSize, noDefault)); - } - /** * Test getting a bounded icon given some UI scaling configured. */