Changeset 13823 in josm for trunk/test/unit

Timestamp:

2018-05-23T20:22:13+02:00 (6 years ago)

Author:

Don-vip

Message:

see #9984, see #16047 - Java 11 handles transparent PNG out of the box, disable JOSM mechanisms to force transparency on this version

File:

• trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java (modified) (1 diff)

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

@@ -64 +64 @@
         assertEquals(Transparency.TRANSLUCENT, ImageProvider.read(file, true, true).getTransparency());
         assertEquals(Transparency.TRANSLUCENT, ImageProvider.read(file, false, true).getTransparency());
-        assertEquals(Transparency.OPAQUE, ImageProvider.read(file, false, false).getTransparency());
-        assertEquals(Transparency.OPAQUE, ImageProvider.read(file, true, false).getTransparency());
+        long expectedTransparency = Utils.getJavaVersion() < 11 ? Transparency.OPAQUE : Transparency.TRANSLUCENT;
+        assertEquals(expectedTransparency, ImageProvider.read(file, false, false).getTransparency());
+        assertEquals(expectedTransparency, ImageProvider.read(file, true, false).getTransparency());
     }