Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (revision 16767) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (revision 16768) @@ -229,5 +229,6 @@ 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") @@ -242,8 +243,11 @@ Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName); Logging.warn(e); + } finally { + iconFuture.complete(null); } }); } else { Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName); + iconFuture.complete(null); } }); Index: trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java (revision 16767) +++ trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java (revision 16768) @@ -13,9 +13,5 @@ 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; @@ -29,4 +25,5 @@ import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset; import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader; +import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetsTest; import org.openstreetmap.josm.gui.tagging.presets.items.Link; import org.openstreetmap.josm.spi.preferences.Config; @@ -116,12 +113,5 @@ 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); - } - }); + TaggingPresetsTest.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 -> { Index: trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetsTest.java (revision 16767) +++ trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetsTest.java (revision 16768) @@ -1,8 +1,15 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.gui.tagging.presets; + +import java.util.Collection; +import java.util.Objects; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import org.junit.Rule; import org.junit.Test; import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.tools.Logging; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -29,3 +36,17 @@ UtilityClassTestUtil.assertUtilityClassWellDefined(TaggingPresets.class); } + + /** + * Wait for asynchronous icon loading + * @param presets presets collection + */ + public static void waitForIconLoading(Collection presets) { + presets.parallelStream().map(TaggingPreset::getIconLoadingTask).filter(Objects::nonNull).forEach(t -> { + try { + t.get(30, TimeUnit.SECONDS); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + Logging.error(e); + } + }); + } } Index: trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderGetPaddedTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderGetPaddedTest.java (revision 16768) +++ trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderGetPaddedTest.java (revision 16768) @@ -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.data.osm.Node; +import org.openstreetmap.josm.data.osm.OsmUtils; +import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets; +import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetsTest; +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() { + TaggingPresetsTest.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)); + } +} Index: trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java (revision 16767) +++ trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java (revision 16768) @@ -6,5 +6,4 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -23,5 +22,4 @@ import java.io.File; import java.io.IOException; -import java.util.EnumSet; import java.util.List; import java.util.logging.Handler; @@ -40,8 +38,5 @@ 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; @@ -59,5 +54,5 @@ @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 { @@ -151,22 +146,4 @@ "iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4"+ "//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)); }