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

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

*** 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; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.concurrent.Task; import javafx.scene.layout.StackPane; --- 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 test.javafx.scene; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.concurrent.Task; import javafx.scene.layout.StackPane;
*** 34,47 **** import javafx.scene.shape.Rectangle; import javafx.scene.transform.Scale; import javafx.stage.PopupWindow; import javafx.stage.Stage; ! import com.sun.javafx.pgstub.StubScene; ! import com.sun.javafx.pgstub.StubToolkit; import com.sun.javafx.sg.prism.NGCamera; ! import com.sun.javafx.test.MouseEventGenerator; import com.sun.javafx.tk.Toolkit; import javafx.application.Platform; import javafx.beans.InvalidationListener; import javafx.beans.Observable; --- 34,47 ---- import javafx.scene.shape.Rectangle; import javafx.scene.transform.Scale; import javafx.stage.PopupWindow; import javafx.stage.Stage; ! import test.com.sun.javafx.pgstub.StubScene; ! import test.com.sun.javafx.pgstub.StubToolkit; import com.sun.javafx.sg.prism.NGCamera; ! import test.com.sun.javafx.test.MouseEventGenerator; import com.sun.javafx.tk.Toolkit; import javafx.application.Platform; import javafx.beans.InvalidationListener; import javafx.beans.Observable;
*** 50,59 **** --- 50,70 ---- import org.junit.After; import org.junit.Before; import org.junit.Test; import java.util.concurrent.ExecutionException; + import javafx.scene.Camera; + import javafx.scene.Cursor; + import javafx.scene.CursorShim; + import javafx.scene.Group; + import javafx.scene.Node; + import javafx.scene.ParallelCamera; + import javafx.scene.Parent; + import javafx.scene.PerspectiveCamera; + import javafx.scene.Scene; + import javafx.scene.SceneShim; + import javafx.scene.SubScene; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import static org.junit.Assert.*;
*** 726,736 **** @Test public void testDefaultCameraUpdatesPG() { Scene scene = new Scene(new Group(), 300, 200); stage.setScene(scene); Toolkit.getToolkit().firePulse(); ! Camera cam = scene.getEffectiveCamera(); cam.setNearClip(20); Toolkit.getToolkit().firePulse(); NGCamera camera = ((StubScene)scene.impl_getPeer()).getCamera(); assertEquals(20, camera.getNearClip(), 0.00001); --- 737,747 ---- @Test public void testDefaultCameraUpdatesPG() { Scene scene = new Scene(new Group(), 300, 200); stage.setScene(scene); Toolkit.getToolkit().firePulse(); ! Camera cam = SceneShim.getEffectiveCamera(scene); cam.setNearClip(20); Toolkit.getToolkit().firePulse(); NGCamera camera = ((StubScene)scene.impl_getPeer()).getCamera(); assertEquals(20, camera.getNearClip(), 0.00001);
*** 794,804 **** scene.setCursor(Cursor.TEXT); assertTrue(toolkit.isPulseRequested()); toolkit.firePulse(); ! assertSame(Cursor.TEXT.getCurrentFrame(), ((StubScene) scene.impl_getPeer()).getCursor()); } @Test public void testNodeCursorChangePropagatesToScenePeer() { --- 805,815 ---- scene.setCursor(Cursor.TEXT); assertTrue(toolkit.isPulseRequested()); toolkit.firePulse(); ! assertSame(CursorShim.getCurrentFrame(Cursor.TEXT), ((StubScene) scene.impl_getPeer()).getCursor()); } @Test public void testNodeCursorChangePropagatesToScenePeer() {
*** 815,825 **** root.setCursor(Cursor.TEXT); assertTrue(toolkit.isPulseRequested()); toolkit.firePulse(); ! assertSame(Cursor.TEXT.getCurrentFrame(), ((StubScene) scene.impl_getPeer()).getCursor()); } @Test public void testProperties() { final Scene scene = new Scene(new Group(), 300, 200); --- 826,836 ---- root.setCursor(Cursor.TEXT); assertTrue(toolkit.isPulseRequested()); toolkit.firePulse(); ! assertSame(CursorShim.getCurrentFrame(Cursor.TEXT), ((StubScene) scene.impl_getPeer()).getCursor()); } @Test public void testProperties() { final Scene scene = new Scene(new Group(), 300, 200);