modules/graphics/src/test/java/test/com/sun/javafx/iio/bmp/BMPImageLoaderTest.java

rev 9250 : 8134762: Refactor Javafx graphics module tests for clear separation of tests
Reviewed-by:

@@ -21,18 +21,18 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package com.sun.javafx.iio.bmp;
+package test.com.sun.javafx.iio.bmp;
 
 import com.sun.javafx.iio.ImageFrame;
 import com.sun.javafx.iio.ImageLoader;
 import com.sun.javafx.iio.ImageLoaderFactory;
-import com.sun.javafx.iio.ImageTestHelper;
-import static com.sun.javafx.iio.bmp.BMPImageLoader.checkDisjointMasks;
-import static com.sun.javafx.iio.bmp.BMPImageLoader.isPow2Minus1;
+import com.sun.javafx.iio.bmp.BMPImageLoaderFactory;
+import com.sun.javafx.iio.bmp.BMPImageLoaderShim;
+import test.com.sun.javafx.iio.ImageTestHelper;
 import com.sun.prism.Image;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBuffer;
 import java.awt.image.IndexColorModel;
 import java.io.ByteArrayInputStream;

@@ -219,17 +219,17 @@
         testImageType(BufferedImage.TYPE_USHORT_565_RGB, "out16bit565.bmp", "BI_BITFIELDS");
     }
 
     @Test
     public void testMasks() {
-        assertTrue(checkDisjointMasks(1, 2, 4));
-        assertTrue(checkDisjointMasks(0x00F, 0x0F0, 0xF00));
-        assertFalse(checkDisjointMasks(1, 2, 5));
-        assertFalse(checkDisjointMasks(2, 1, 6));
-
-        assertTrue(isPow2Minus1(1));
-        assertTrue(isPow2Minus1(3));
-        assertTrue(isPow2Minus1(7));
-        assertFalse(isPow2Minus1(2));
-        assertFalse(isPow2Minus1(11));
+        assertTrue(BMPImageLoaderShim.checkDisjointMasks(1, 2, 4));
+        assertTrue(BMPImageLoaderShim.checkDisjointMasks(0x00F, 0x0F0, 0xF00));
+        assertFalse(BMPImageLoaderShim.checkDisjointMasks(1, 2, 5));
+        assertFalse(BMPImageLoaderShim.checkDisjointMasks(2, 1, 6));
+
+        assertTrue(BMPImageLoaderShim.isPow2Minus1(1));
+        assertTrue(BMPImageLoaderShim.isPow2Minus1(3));
+        assertTrue(BMPImageLoaderShim.isPow2Minus1(7));
+        assertFalse(BMPImageLoaderShim.isPow2Minus1(2));
+        assertFalse(BMPImageLoaderShim.isPow2Minus1(11));
     }
 }