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

rev 6167 : RT-35330 [Monocle] Remove StubToolkit and replace it with headless glass implementation

@@ -23,19 +23,23 @@
  * questions.
  */
 
 package javafx.scene;
 
+import com.sun.javafx.FXUnit;
 import com.sun.javafx.cursor.CursorFrame;
 import com.sun.javafx.event.EventHandlerManager;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.concurrent.atomic.AtomicReference;
+
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.paint.Color;
 
+import org.junit.Rule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 import com.sun.javafx.test.PropertiesTestBase;

@@ -44,12 +48,18 @@
 import com.sun.javafx.test.objects.TestStage;
 import javafx.scene.layout.Pane;
 
 @RunWith(Parameterized.class)
 public final class Scene_properties_Test extends PropertiesTestBase {
+
+    @Rule
+    public FXUnit fx = new FXUnit();
+
     @Parameters
     public static Collection data() {
+        AtomicReference<Collection> ref = new AtomicReference<>();
+        new FXUnit().invokeAndWait(() -> {
         final TestScene testScene = new TestScene(new Group());
 
         final TestStage testStage1 = new TestStage("STAGE_1");
         final TestStage testStage2 = new TestStage("STAGE_2");
         

@@ -64,16 +74,16 @@
             new Configuration(testScene,
                               "_window", testStage1, testStage2,
                               "window", testStage1, testStage2);
         windowCfg.setAllowMultipleNotifications(true);
 
-        return Arrays.asList(new Object[] {
+            ref.set(Arrays.asList(new Object[] {
             config(windowCfg),
-//            config(testScene, "x", , ),
-//            config(testScene, "y", , ),
-//            config(testScene, "width", , ),
-//            config(testScene, "height", , ),
+    //            config(testScene, "x", , ),
+    //            config(testScene, "y", , ),
+    //            config(testScene, "width", , ),
+    //            config(testScene, "height", , ),
             config(testScene, "camera", null, new ParallelCamera()),
             config(testScene, "fill", Color.WHITE, Color.BLACK),
             config(testScene, "fill", null, Color.TRANSPARENT),
             config(testScene, "root", new Group(), new Pane()),
             config(testScene, "cursor", null, new Cursor("TestCursor") {

@@ -135,11 +145,13 @@
             config(testScene,
                    "nodeOrientation", NodeOrientation.INHERIT,
                                       NodeOrientation.RIGHT_TO_LEFT,
                    "effectiveNodeOrientation", NodeOrientation.LEFT_TO_RIGHT,
                                                NodeOrientation.RIGHT_TO_LEFT)
+            }));
         });
+        return ref.get();
     }
 
     public Scene_properties_Test(final Configuration configuration) {
         super(configuration);
     }