modules/graphics/src/test/java/test/javafx/scene/ImageCursor_getCurrentFrame_Test.java

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

@@ -21,23 +21,26 @@
  * 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;
+package test.javafx.scene;
 
-import static javafx.scene.image.TestImages.TEST_ERROR_IMAGE;
+import static test.javafx.scene.image.TestImages.TEST_ERROR_IMAGE;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import javafx.scene.image.Image;
-import javafx.scene.image.TestImages;
+import test.javafx.scene.image.TestImages;
 
 import org.junit.Test;
 
-import com.sun.javafx.pgstub.StubToolkit;
+import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
+import javafx.scene.Cursor;
+import javafx.scene.CursorShim;
+import javafx.scene.ImageCursor;
 
 public final class ImageCursor_getCurrentFrame_Test {
     private final StubToolkit toolkit;
 
     public ImageCursor_getCurrentFrame_Test() {

@@ -45,17 +48,17 @@
     }
 
     @Test
     public void specialCasesTest() {
         final Object defaultCursorFrame =
-                Cursor.DEFAULT.getCurrentFrame();
+                CursorShim.getCurrentFrame(Cursor.DEFAULT);
 
         assertEquals(defaultCursorFrame,
-                     new ImageCursor(null).getCurrentFrame());
+                CursorShim.getCurrentFrame(new ImageCursor(null)));
 
         assertEquals(defaultCursorFrame,
-                     new ImageCursor(TEST_ERROR_IMAGE).getCurrentFrame());
+                CursorShim.getCurrentFrame(new ImageCursor(TEST_ERROR_IMAGE)));
     }
 
     @Test
     public void animatedCursorTest() {
         // reset time

@@ -69,37 +72,37 @@
         final ImageCursor animatedImageCursor = new ImageCursor(animatedImage);
 
         Object lastCursorFrame;
         Object currCursorFrame;
 
-        animatedImageCursor.activate();
+        CursorShim.activate(animatedImageCursor);
 
-        lastCursorFrame = animatedImageCursor.getCurrentFrame();
+        lastCursorFrame = CursorShim.getCurrentFrame(animatedImageCursor);
 
         toolkit.setAnimationTime(1000);
-        currCursorFrame = animatedImageCursor.getCurrentFrame();
+        currCursorFrame = CursorShim.getCurrentFrame(animatedImageCursor);
         assertSame(lastCursorFrame, currCursorFrame);
         
         lastCursorFrame = currCursorFrame;
 
         toolkit.setAnimationTime(2500);
-        currCursorFrame = animatedImageCursor.getCurrentFrame();
+        currCursorFrame = CursorShim.getCurrentFrame(animatedImageCursor);
         assertNotSame(lastCursorFrame, currCursorFrame);
         
         lastCursorFrame = currCursorFrame;
 
         toolkit.setAnimationTime(4500);
-        currCursorFrame = animatedImageCursor.getCurrentFrame();
+        currCursorFrame = CursorShim.getCurrentFrame(animatedImageCursor);
         assertNotSame(lastCursorFrame, currCursorFrame);
 
         lastCursorFrame = currCursorFrame;
 
         toolkit.setAnimationTime(7000);
-        currCursorFrame = animatedImageCursor.getCurrentFrame();
+        currCursorFrame = CursorShim.getCurrentFrame(animatedImageCursor);
         assertNotSame(lastCursorFrame, currCursorFrame);
 
-        animatedImageCursor.deactivate();
+        CursorShim.deactivate(animatedImageCursor);
 
         TestImages.disposeAnimatedImage(animatedImage);
     }
 
     @Test

@@ -112,36 +115,36 @@
                         0,               // loop count
                         2000, 1000, 3000 // frame delays
                 );
         final ImageCursor animatedImageCursor = new ImageCursor(animatedImage);
 
-        animatedImageCursor.activate();
+        CursorShim.activate(animatedImageCursor);
 
         toolkit.setAnimationTime(1000);
         final Object time1000CursorFrame =
-                animatedImageCursor.getCurrentFrame();
+                CursorShim.getCurrentFrame(animatedImageCursor);
 
         toolkit.setAnimationTime(2500);
         final Object time2500CursorFrame =
-                animatedImageCursor.getCurrentFrame();
+                CursorShim.getCurrentFrame(animatedImageCursor);
 
         toolkit.setAnimationTime(4500);
         final Object time4500CursorFrame =
-                animatedImageCursor.getCurrentFrame();
+                CursorShim.getCurrentFrame(animatedImageCursor);
 
         toolkit.setAnimationTime(6000 + 1000);
         assertSame(time1000CursorFrame,
-                   animatedImageCursor.getCurrentFrame());
+                   CursorShim.getCurrentFrame(animatedImageCursor));
 
         toolkit.setAnimationTime(6000 + 2500);
         assertSame(time2500CursorFrame,
-                   animatedImageCursor.getCurrentFrame());
+                   CursorShim.getCurrentFrame(animatedImageCursor));
 
         toolkit.setAnimationTime(6000 + 4500);
         assertSame(time4500CursorFrame,
-                   animatedImageCursor.getCurrentFrame());
+                   CursorShim.getCurrentFrame(animatedImageCursor));
 
-        animatedImageCursor.deactivate();
+        CursorShim.deactivate(animatedImageCursor);
 
         TestImages.disposeAnimatedImage(animatedImage);
     }
 }