modules/graphics/src/test/java/test/javafx/scene/image/ImageTest.java

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

@@ -21,24 +21,31 @@
  * 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 javafx.scene.image;
+package test.javafx.scene.image;
 
-import com.sun.javafx.pgstub.*;
-import com.sun.javafx.test.PropertyInvalidationCounter;
+import test.com.sun.javafx.pgstub.StubPlatformImageInfo;
+import test.com.sun.javafx.pgstub.StubPlatformImage;
+import test.com.sun.javafx.pgstub.StubImageLoader;
+import test.com.sun.javafx.pgstub.StubAsyncImageLoader;
+import test.com.sun.javafx.pgstub.StubImageLoaderFactory;
+import test.com.sun.javafx.pgstub.StubToolkit;
+import test.com.sun.javafx.test.PropertyInvalidationCounter;
 import com.sun.javafx.tk.Toolkit;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.LinkedList;
 import java.util.Queue;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageShim;
 
 import static org.junit.Assert.*;
 
 public final class ImageTest {
     private final StubToolkit toolkit;

@@ -88,22 +95,22 @@
         final InputStream is = new ByteArrayInputStream(new byte[0]);
         registerImage(is, 100, 200);
 
         final Image image = new Image(is);
 
-        assertEquals(is, image.getImpl_source());
+        assertEquals(is, ImageShim.getImpl_source(image));
         verifyLoadedImage(image, 0, 0, false, false, 100, 200);
     }
 
     @Test
     public void loadImageFromStreamScaledTest() {
         final InputStream is = new ByteArrayInputStream(new byte[0]);
         registerImage(is, 300, 100);
 
         final Image image = new Image(is, 200, 400, true, true);
 
-        assertEquals(is, image.getImpl_source());
+        assertEquals(is, ImageShim.getImpl_source(image));
         verifyLoadedImage(image, 200, 400, true, true, 300, 100);
     }
 
     @Test
     public void fromPlatformImageTest() {

@@ -479,11 +486,11 @@
         return lastAsyncImageLoader;
     }
 
     @Test
     public void createImageFromClasspathTest() {
-        final String url = "javafx/scene/image/test.png";
+        final String url = "test/javafx/scene/image/test.png";
         final String resolvedUrl = Thread.currentThread().getContextClassLoader().getResource(url).toString();
         registerImage(resolvedUrl, 100, 200);
         
         final Image image = new Image(url);
 

@@ -491,11 +498,11 @@
         verifyLoadedImage(image, 0, 0, false, false, 100, 200);
     }
     
     @Test
     public void createImageFromClasspathTest_withLeadingSlash() {
-        final String url = "/javafx/scene/image/test.png";
+        final String url = "/test/javafx/scene/image/test.png";
         final String resolvedUrl = Thread.currentThread().getContextClassLoader().getResource(url.substring(1)).toString();
         registerImage(resolvedUrl, 100, 200);
         
         final Image image = new Image(url);