Changeset 17275 in josm for trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

File:

• trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java (modified) (14 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.openstreetmap.josm.gui.mappaint.MapCSSRendererTest.assertImageEquals;
 
@@ -48 +48 @@
  * Unit tests of {@link ImageProvider} class.
  */
-public class ImageProviderTest {
+class ImageProviderTest {
 
     /**
@@ -94 +94 @@
      */
     @Test
-    public void testTicket9984() throws IOException {
+    void testTicket9984() throws IOException {
         File file = new File(TestUtils.getRegressionDataFile(9984, "tile.png"));
         assertEquals(Transparency.TRANSLUCENT, ImageProvider.read(file, true, true).getTransparency());
@@ -108 +108 @@
      */
     @Test
-    public void testTicket10030() throws IOException {
+    void testTicket10030() throws IOException {
         File file = new File(TestUtils.getRegressionDataFile(10030, "tile.jpg"));
         BufferedImage img = ImageProvider.read(file, true, true);
@@ -120 +120 @@
     @Test
     @SuppressFBWarnings(value = "LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE")
-    public void testTicket14319() throws IOException {
+    void testTicket14319() throws IOException {
         LogHandler14319 handler = new LogHandler14319();
         Logger.getLogger(SVGConst.SVG_LOGGER).addHandler(handler);
@@ -134 +134 @@
      */
     @Test
-    public void testTicket19551() throws SAXException {
+    void testTicket19551() throws SAXException {
         TaggingPreset badPreset = new TaggingPreset();
         badPreset.setType("node,way,relation,closedway");
@@ -155 +155 @@
      */
     @Test
-    public void testDataUrl() {
+    void testDataUrl() {
         // Red dot image, taken from https://en.wikipedia.org/wiki/Data_URI_scheme#HTML
         assertNotNull(ImageProvider.get("data:image/png;base64," +
@@ -167 +167 @@
      */
     @Test
-    public void testImageIcon() throws IOException {
+    void testImageIcon() throws IOException {
         ImageResource resource = new ImageProvider("presets/misc/housenumber_small").getResource();
         testImage(12, 9, "housenumber_small-AUTO-null", resource.getImageIcon());
@@ -182 +182 @@
      */
     @Test
-    public void testImageIconBounded() throws IOException {
+    void testImageIconBounded() throws IOException {
         ImageResource resource = new ImageProvider("presets/misc/housenumber_small").getResource();
         testImage(8, 6, "housenumber_small-BOUNDED-08x08", resource.getImageIconBounded(new Dimension(8, 8)));
@@ -194 +194 @@
      */
     @Test
-    public void testImageIconPadded() throws IOException {
+    void testImageIconPadded() throws IOException {
         ImageResource resource = new ImageProvider("presets/misc/housenumber_small").getResource();
         testImage(8, 8, "housenumber_small-PADDED-08x08", resource.getPaddedIcon(new Dimension(8, 8)));
@@ -204 +204 @@
         final BufferedImage image = (BufferedImage) icon.getImage();
         final File referenceFile = getReferenceFile(reference);
-        assertEquals("width", width, image.getWidth(null));
-        assertEquals("height", height, image.getHeight(null));
+        assertEquals(width, image.getWidth(null), "width");
+        assertEquals(height, image.getHeight(null), "height");
         assertImageEquals(reference, referenceFile, image, 0, 0, null);
     }
@@ -219 +219 @@
      */
     @Test
-    public void testGetImageIconBounded() {
+    void testGetImageIconBounded() {
         int scale = 2;
         GuiSizesHelper.setPixelDensity(scale);
@@ -240 +240 @@
     /**
      * Test getting an image for a crosshair cursor.
+     * @param guiScale coefficient of monitor pixel density to be set
+     * @throws IOException in case of I/O error
      */
     @ParameterizedTest
     @ValueSource(floats = {1.0f, 1.5f, 3.0f})
-    public void testGetCursorImageForCrosshair(float guiScale) throws IOException {
+    void testGetCursorImageForCrosshair(float guiScale) throws IOException {
         GuiSizesHelper.setPixelDensity(guiScale);
         Point hotSpot = new Point();
@@ -255 +257 @@
     /**
      * Test getting an image for a custom cursor with overlay.
+     * @param guiScale coefficient of monitor pixel density to be set
+     * @throws IOException in case of I/O error
      */
     @ParameterizedTest
     @ValueSource(floats = {1.0f, 1.5f, 3.0f})
-    public void testGetCursorImageWithOverlay(float guiScale) throws IOException {
+    void testGetCursorImageWithOverlay(float guiScale) throws IOException {
         GuiSizesHelper.setPixelDensity(guiScale);
         Point hotSpot = new Point();