Changeset 17144 in josm for trunk/test

Timestamp:

2020-10-10T18:41:23+02:00 (4 years ago)

Author:

simon04

Message:

fix #19751 - MapImage.rescale: use original SVG instead of rastered version

Location:

trunk/test

Files:

• data/ImageProviderTest-java8/housenumber_small-AUTO-08x08.png (modified) ( previous)
• data/ImageProviderTest-java8/housenumber_small-AUTO-16x16.png (modified) ( previous)
• data/ImageProviderTest-java8/housenumber_small-AUTO-24x24.png (modified) ( previous)
• data/ImageProviderTest-java8/housenumber_small-BOUNDED-16x16.png (modified) ( previous)
• data/ImageProviderTest-java8/housenumber_small-BOUNDED-24x24.png (modified) ( previous)
• data/ImageProviderTest/housenumber_small-AUTO-08x08.png (modified) ( previous)
• data/ImageProviderTest/housenumber_small-AUTO-16x16.png (modified) ( previous)
• data/ImageProviderTest/housenumber_small-AUTO-24x24.png (modified) ( previous)
• data/ImageProviderTest/housenumber_small-BOUNDED-16x16.png (modified) ( previous)
• data/ImageProviderTest/housenumber_small-BOUNDED-24x24.png (modified) ( previous)
• data/renderer/area-icon/reference-java8.png (modified) ( previous)
• data/renderer/area-icon/reference.png (modified) ( previous)
• data/renderer/eval/reference-java8.png (modified) ( previous)
• data/renderer/node-text2/reference-java8.png (modified) ( previous)
• data/renderer/way-repeat-image-clamp/reference-java8.png (modified) ( previous)
• data/renderer/way-repeat-image-clamp/reference.png (modified) ( previous)
• data/renderer/way-repeat-image/reference-java8.png (modified) ( previous)
• data/renderer/way-repeat-image/reference.png (modified) ( previous)
• data/renderer/way-text/reference-java8.png (modified) ( previous)
• functional/org/openstreetmap/josm/tools/ImageProviderTest.java (modified) (2 diffs)
• unit/org/openstreetmap/josm/tools/ImageResizeModeTest.java (modified) (1 diff)

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

@@ -171 +171 @@
         testImage(12, 9, "housenumber_small-AUTO-null", resource.getImageIcon());
         testImage(12, 9, "housenumber_small-AUTO-default", resource.getImageIcon(ImageResource.DEFAULT_DIMENSION));
-        testImage(8, 8, "housenumber_small-AUTO-08x08", resource.getImageIcon(new Dimension(8, 8)));
-        testImage(16, 16, "housenumber_small-AUTO-16x16", resource.getImageIcon(new Dimension(16, 16)));
-        testImage(24, 24, "housenumber_small-AUTO-24x24", resource.getImageIcon(new Dimension(24, 24)));
+        testImage(8, 6, "housenumber_small-AUTO-08x08", resource.getImageIcon(new Dimension(8, 8)));
+        testImage(16, 12, "housenumber_small-AUTO-16x16", resource.getImageIcon(new Dimension(16, 16)));
+        testImage(24, 18, "housenumber_small-AUTO-24x24", resource.getImageIcon(new Dimension(24, 24)));
         testImage(36, 27, "housenumber_small-AUTO-36x27", resource.getImageIcon(new Dimension(36, 27)));
     }
@@ -185 +185 @@
         ImageResource resource = new ImageProvider("presets/misc/housenumber_small").getResource();
         testImage(8, 6, "housenumber_small-BOUNDED-08x08", resource.getImageIconBounded(new Dimension(8, 8)));
-        testImage(16, 12, "housenumber_small-BOUNDED-16x16", resource.getImageIconBounded(new Dimension(16, 16)));
-        testImage(24, 18, "housenumber_small-BOUNDED-24x24", resource.getImageIconBounded(new Dimension(24, 24)));
+        testImage(12, 9, "housenumber_small-BOUNDED-16x16", resource.getImageIconBounded(new Dimension(16, 16)));
+        testImage(12, 9, "housenumber_small-BOUNDED-24x24", resource.getImageIconBounded(new Dimension(24, 24)));
     }
 

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

@@ -40 +40 @@
         assertEquals(new Dimension(32, 24), ImageResizeMode.AUTO.computeDimension(new Dimension(32, -1), image));
         assertEquals(new Dimension(21, 16), ImageResizeMode.AUTO.computeDimension(new Dimension(-1, 16), image));
-        assertEquals(new Dimension(24, 32), ImageResizeMode.AUTO.computeDimension(new Dimension(24, 32), image));
+        assertEquals(new Dimension(24, 18), ImageResizeMode.AUTO.computeDimension(new Dimension(24, 32), image));
     }