Changeset 16838 in josm for trunk/test

Timestamp:

2020-08-03T22:06:40+02:00 (4 years ago)

Author:

simon04

Message:

see #19622 - Extract OsmPrimitiveImageProvider

Location:

trunk/test/unit/org/openstreetmap/josm/tools

Files:

• ImageProviderTest.java (modified) (1 diff)
• OsmPrimitiveImageProviderTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderGetPaddedTest.java ) (3 diffs)

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

@@ -156 +156 @@
         Node node = new Node(LatLon.ZERO);
         node.put("amenity", "fuel");
-        assertDoesNotThrow(() -> ImageProvider.getPadded(node, ImageProvider.ImageSizes.MAP.getImageDimension(), Collections.emptyList()));
+        assertDoesNotThrow(() -> OsmPrimitiveImageProvider.getResource(node, Collections.emptyList()));
     }
 

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

@@ -12 +12 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetsTest;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.tools.ImageProvider.GetPaddedOptions;
+import org.openstreetmap.josm.tools.OsmPrimitiveImageProvider.Options;
 
 import java.awt.Dimension;
@@ -21 +21 @@
 
 /**
- * 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.
+ * Unit tests of {@link OsmPrimitiveImageProvider}
  */
-public class ImageProviderGetPaddedTest {
+public class OsmPrimitiveImageProviderTest {
 
     /**
@@ -42 +41 @@
 
     /**
-     * Unit test of {@link ImageProvider#getPadded}.
+     * Unit test of {@link OsmPrimitiveImageProvider#getResource}.
      */
     @Test
-    public void testGetPadded() {
+    public void testGetResource() {
         TaggingPresetsTest.waitForIconLoading(TaggingPresets.getTaggingPresets());
 
-        final EnumSet<GetPaddedOptions> noDefault = EnumSet.of(GetPaddedOptions.NO_DEFAULT);
+        final EnumSet<Options> noDefault = EnumSet.of(Options.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));
+        assertNull(OsmPrimitiveImageProvider.getResource(new Node(), noDefault));
+        assertNotNull(OsmPrimitiveImageProvider.getResource(OsmUtils.createPrimitive("node amenity=restaurant"), noDefault));
+        assertNull(OsmPrimitiveImageProvider.getResource(OsmUtils.createPrimitive("node barrier=hedge"),
+                EnumSet.of(Options.NO_DEFAULT, Options.NO_DEPRECATED)));
+        assertNotNull(OsmPrimitiveImageProvider.getResource(OsmUtils.createPrimitive("way waterway=stream"), noDefault));
+        assertNotNull(OsmPrimitiveImageProvider.getResource(OsmUtils.createPrimitive("relation type=route route=railway"), noDefault));
     }
 }