Changeset 16810 in josm for trunk

Timestamp:

2020-07-29T21:19:37+02:00 (4 years ago)

Author:

simon04

Message:

fix #19551 - Add ImageProviderTest.testTicket19551 (patch by taylor.smock)

File:

• trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java

@@ -7 +7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Graphics;
 import java.awt.GraphicsEnvironment;
 import java.awt.GridLayout;
-import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.Point;
@@ -22 +23 @@
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.logging.Handler;
@@ -38 +41 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
+import org.openstreetmap.josm.gui.tagging.presets.items.Key;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.xml.sax.SAXException;
 
 import com.kitfox.svg.SVGConst;
@@ -48 +57 @@
  */
 public class ImageProviderTest {
-    
+
     /**
      * Setup test.
@@ -126 +135 @@
         assertNotNull(img);
         assertFalse(handler.failed);
+    }
+
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/19551">#19551</a>
+     * @throws SAXException If the type cannot be set (shouldn't throw)
+     */
+    @Test
+    public void testTicket19551() throws SAXException {
+        TaggingPreset badPreset = new TaggingPreset();
+        badPreset.setType("node,way,relation,closedway");
+        Key key = new Key();
+        key.key = "amenity";
+        key.value = "fuel";
+        badPreset.data.add(key);
+        TaggingPreset goodPreset = new TaggingPreset();
+        goodPreset.setType("node,way,relation,closedway");
+        goodPreset.data.add(key);
+        goodPreset.iconName = "stop";
+        TaggingPresets.addTaggingPresets(Arrays.asList(goodPreset, badPreset));
+        Node node = new Node(LatLon.ZERO);
+        node.put("amenity", "fuel");
+        assertDoesNotThrow(() -> ImageProvider.getPadded(node, ImageProvider.ImageSizes.MAP.getImageDimension(), Collections.emptyList()));
     }