--- old/modules/graphics/src/test/java/javafx/scene/Node_effectiveOrientation_Css_Test.java	2015-09-11 21:26:18.201285711 -0400
+++ /dev/null	2015-09-11 11:06:08.592686920 -0400
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 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 com.sun.javafx.css.StyleManager;
-import javafx.css.Stylesheet;
-import javafx.css.CssParser;
-import com.sun.javafx.tk.Toolkit;
-import static javafx.geometry.NodeOrientation.*;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Stage;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.Before;
-
-/**
- * Test :dir functional pseudo-class 
- */
-@Ignore
-public class Node_effectiveOrientation_Css_Test {
-    
-    private Group root;
-    private Scene scene;
-    private Stage stage;
-
-    @Before
-    public void setUp() {
-        root = new Group();
-        scene = new Scene(root);
-        stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-        stage.requestFocus();
-    }
-
-    @After
-    public void tearDown() {
-        stage.hide();
-    }
-    
-    public Node_effectiveOrientation_Css_Test() {}
-    
-    @Test
-    public void test_SimpleSelector_dir_pseudoClass_with_scene_effective_orientation_ltr() {
-        Stylesheet stylesheet = new CssParser().parse(
-                ".rect:dir(rtl) { -fx-fill: #ff0000; }" +
-                ".rect:dir(ltr) { -fx-fill: #00ff00; }" +
-                ".rect { -fx-fill: #0000ff; }" 
-        );
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        Rectangle rect = new Rectangle();
-        rect.getStyleClass().add("rect");
-        root.getChildren().add(rect);
-
-        // CSS is applied on next pulse after child is added
-        root.applyCss();
-        
-        assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
-        assertEquals(Color.web("#00ff00"), rect.getFill());
-    }
-    
-    @Test
-    public void test_SimpleSelector_dir_pseudoClass_with_scene_effective_orientation_rtl() {
-        Stylesheet stylesheet = new CssParser().parse(
-                ".rect:dir(rtl) { -fx-fill: #ff0000; }" +
-                ".rect:dir(ltr) { -fx-fill: #00ff00; }" +
-                ".rect { -fx-fill: #0000ff; }" 
-        );
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        Rectangle rect = new Rectangle();
-        rect.getStyleClass().add("rect");
-        root.getChildren().add(rect);
-
-        scene.setNodeOrientation(RIGHT_TO_LEFT);
-        // CSS is applied on next pulse after child is added
-        root.applyCss();
-        
-        assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
-        assertEquals(Color.web("#ff0000"), rect.getFill());
-    }
-
-    @Test
-    public void test_CompounSelector_dir_pseudoClass_on_parent_with_scene_effective_orientation_ltr() {
-        Stylesheet stylesheet = new CssParser().parse(
-                ".root:dir(rtl) .rect { -fx-fill: #ff0000; }" +
-                ".root:dir(ltr) .rect { -fx-fill: #00ff00; }" +
-                ".root .rect { -fx-fill: #0000ff; }" 
-        );
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        Rectangle rect = new Rectangle();
-        rect.getStyleClass().add("rect");
-        root.getChildren().add(rect);
-
-        // CSS is applied on next pulse after child is added
-        root.applyCss();
-        
-        assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
-        assertEquals(Color.web("#00ff00"), rect.getFill());
-    }
-    
-    @Test
-    public void test_CompoundSelector_dir_pseudoClass_on_parent_with_scene_effective_orientation_rtl() {
-        Stylesheet stylesheet = new CssParser().parse(
-                ".root:dir(rtl) .rect { -fx-fill: #ff0000; }" +
-                ".root:dir(ltr) .rect { -fx-fill: #00ff00; }" +
-                ".root .rect { -fx-fill: #0000ff; }" 
-        );
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        Rectangle rect = new Rectangle();
-        rect.getStyleClass().add("rect");
-        root.getChildren().add(rect);
-
-        scene.setNodeOrientation(RIGHT_TO_LEFT);
-        // CSS is applied on next pulse after child is added
-        root.applyCss();
-        
-        assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
-        assertEquals(Color.web("#ff0000"), rect.getFill());
-    }
-
-    @Test
-    public void test_CompounSelector_dir_pseudoClass_on_child_with_scene_effective_orientation_ltr() {
-        Stylesheet stylesheet = new CssParser().parse(
-                ".root .rect:dir(rtl) { -fx-fill: #ff0000; }" +
-                ".root .rect:dir(ltr) { -fx-fill: #00ff00; }" +
-                ".root .rect { -fx-fill: #0000ff; }" 
-        );
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        Rectangle rect = new Rectangle();
-        rect.getStyleClass().add("rect");
-        root.getChildren().add(rect);
-
-        // CSS is applied on next pulse after child is added
-        root.applyCss();
-        
-        assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
-        assertEquals(Color.web("#00ff00"), rect.getFill());
-    }
-    
-    @Test
-    public void test_CompoundSelector_dir_pseudoClass_on_child_with_scene_effective_orientation_rtl() {
-        Stylesheet stylesheet = new CssParser().parse(
-                ".root .rect:dir(rtl) { -fx-fill: #ff0000; }" +
-                ".root .rect:dir(ltr) { -fx-fill: #00ff00; }" +
-                ".root .rect { -fx-fill: #0000ff; }" 
-        );
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        Rectangle rect = new Rectangle();
-        rect.getStyleClass().add("rect");
-        root.getChildren().add(rect);
-
-        scene.setNodeOrientation(RIGHT_TO_LEFT);
-        // CSS is applied on next pulse after child is added
-        root.applyCss();
-        
-        assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
-        assertEquals(Color.web("#ff0000"), rect.getFill());
-    }
-    
-    @Test
-    public void test_dir_pseudoClass_functions_on_scene_effective_orientation_not_node() {
-        Stylesheet stylesheet = new CssParser().parse(
-                ".rect:dir(rtl) { -fx-fill: #ff0000; }" +
-                ".rect:dir(ltr) { -fx-fill: #00ff00; }" +
-                ".rect { -fx-fill: #0000ff; }" 
-        );
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        Rectangle rect = new Rectangle();
-        rect.getStyleClass().add("rect");
-        root.getChildren().add(rect);
-        
-        rect.setNodeOrientation(RIGHT_TO_LEFT);
-
-        // CSS is applied on next pulse after child is added
-        root.applyCss();
-        
-        assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
-        assertEquals(rect.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
-        // :dir() pseudo-class functions on scene effective orientation, not node
-        assertEquals(Color.web("#00ff00"), rect.getFill());
-        
-        scene.setNodeOrientation(RIGHT_TO_LEFT);
-        rect.setNodeOrientation(LEFT_TO_RIGHT);
-        
-        root.applyCss();
-        
-        assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
-        assertEquals(rect.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
-        // :dir() pseudo-class functions on scene effective orientation, not node
-        assertEquals(Color.web("#ff0000"), rect.getFill());
-        
-    }
-    
-}
--- /dev/null	2015-09-11 11:06:08.592686920 -0400
+++ new/modules/graphics/src/test/java/test/javafx/scene/Node_effectiveOrientation_Css_Test.java	2015-09-11 21:26:17.989285713 -0400
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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 com.sun.javafx.css.StyleManager;
+import javafx.css.Stylesheet;
+import javafx.css.CssParser;
+import com.sun.javafx.tk.Toolkit;
+import static javafx.geometry.NodeOrientation.*;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.stage.Stage;
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.Before;
+
+/**
+ * Test :dir functional pseudo-class 
+ */
+@Ignore
+public class Node_effectiveOrientation_Css_Test {
+    
+    private Group root;
+    private Scene scene;
+    private Stage stage;
+
+    @Before
+    public void setUp() {
+        root = new Group();
+        scene = new Scene(root);
+        stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+        stage.requestFocus();
+    }
+
+    @After
+    public void tearDown() {
+        stage.hide();
+    }
+    
+    public Node_effectiveOrientation_Css_Test() {}
+    
+    @Test
+    public void test_SimpleSelector_dir_pseudoClass_with_scene_effective_orientation_ltr() {
+        Stylesheet stylesheet = new CssParser().parse(
+                ".rect:dir(rtl) { -fx-fill: #ff0000; }" +
+                ".rect:dir(ltr) { -fx-fill: #00ff00; }" +
+                ".rect { -fx-fill: #0000ff; }" 
+        );
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        Rectangle rect = new Rectangle();
+        rect.getStyleClass().add("rect");
+        root.getChildren().add(rect);
+
+        // CSS is applied on next pulse after child is added
+        root.applyCss();
+        
+        assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
+        assertEquals(Color.web("#00ff00"), rect.getFill());
+    }
+    
+    @Test
+    public void test_SimpleSelector_dir_pseudoClass_with_scene_effective_orientation_rtl() {
+        Stylesheet stylesheet = new CssParser().parse(
+                ".rect:dir(rtl) { -fx-fill: #ff0000; }" +
+                ".rect:dir(ltr) { -fx-fill: #00ff00; }" +
+                ".rect { -fx-fill: #0000ff; }" 
+        );
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        Rectangle rect = new Rectangle();
+        rect.getStyleClass().add("rect");
+        root.getChildren().add(rect);
+
+        scene.setNodeOrientation(RIGHT_TO_LEFT);
+        // CSS is applied on next pulse after child is added
+        root.applyCss();
+        
+        assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
+        assertEquals(Color.web("#ff0000"), rect.getFill());
+    }
+
+    @Test
+    public void test_CompounSelector_dir_pseudoClass_on_parent_with_scene_effective_orientation_ltr() {
+        Stylesheet stylesheet = new CssParser().parse(
+                ".root:dir(rtl) .rect { -fx-fill: #ff0000; }" +
+                ".root:dir(ltr) .rect { -fx-fill: #00ff00; }" +
+                ".root .rect { -fx-fill: #0000ff; }" 
+        );
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        Rectangle rect = new Rectangle();
+        rect.getStyleClass().add("rect");
+        root.getChildren().add(rect);
+
+        // CSS is applied on next pulse after child is added
+        root.applyCss();
+        
+        assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
+        assertEquals(Color.web("#00ff00"), rect.getFill());
+    }
+    
+    @Test
+    public void test_CompoundSelector_dir_pseudoClass_on_parent_with_scene_effective_orientation_rtl() {
+        Stylesheet stylesheet = new CssParser().parse(
+                ".root:dir(rtl) .rect { -fx-fill: #ff0000; }" +
+                ".root:dir(ltr) .rect { -fx-fill: #00ff00; }" +
+                ".root .rect { -fx-fill: #0000ff; }" 
+        );
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        Rectangle rect = new Rectangle();
+        rect.getStyleClass().add("rect");
+        root.getChildren().add(rect);
+
+        scene.setNodeOrientation(RIGHT_TO_LEFT);
+        // CSS is applied on next pulse after child is added
+        root.applyCss();
+        
+        assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
+        assertEquals(Color.web("#ff0000"), rect.getFill());
+    }
+
+    @Test
+    public void test_CompounSelector_dir_pseudoClass_on_child_with_scene_effective_orientation_ltr() {
+        Stylesheet stylesheet = new CssParser().parse(
+                ".root .rect:dir(rtl) { -fx-fill: #ff0000; }" +
+                ".root .rect:dir(ltr) { -fx-fill: #00ff00; }" +
+                ".root .rect { -fx-fill: #0000ff; }" 
+        );
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        Rectangle rect = new Rectangle();
+        rect.getStyleClass().add("rect");
+        root.getChildren().add(rect);
+
+        // CSS is applied on next pulse after child is added
+        root.applyCss();
+        
+        assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
+        assertEquals(Color.web("#00ff00"), rect.getFill());
+    }
+    
+    @Test
+    public void test_CompoundSelector_dir_pseudoClass_on_child_with_scene_effective_orientation_rtl() {
+        Stylesheet stylesheet = new CssParser().parse(
+                ".root .rect:dir(rtl) { -fx-fill: #ff0000; }" +
+                ".root .rect:dir(ltr) { -fx-fill: #00ff00; }" +
+                ".root .rect { -fx-fill: #0000ff; }" 
+        );
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        Rectangle rect = new Rectangle();
+        rect.getStyleClass().add("rect");
+        root.getChildren().add(rect);
+
+        scene.setNodeOrientation(RIGHT_TO_LEFT);
+        // CSS is applied on next pulse after child is added
+        root.applyCss();
+        
+        assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
+        assertEquals(Color.web("#ff0000"), rect.getFill());
+    }
+    
+    @Test
+    public void test_dir_pseudoClass_functions_on_scene_effective_orientation_not_node() {
+        Stylesheet stylesheet = new CssParser().parse(
+                ".rect:dir(rtl) { -fx-fill: #ff0000; }" +
+                ".rect:dir(ltr) { -fx-fill: #00ff00; }" +
+                ".rect { -fx-fill: #0000ff; }" 
+        );
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        Rectangle rect = new Rectangle();
+        rect.getStyleClass().add("rect");
+        root.getChildren().add(rect);
+        
+        rect.setNodeOrientation(RIGHT_TO_LEFT);
+
+        // CSS is applied on next pulse after child is added
+        root.applyCss();
+        
+        assertEquals(scene.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
+        assertEquals(rect.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
+        // :dir() pseudo-class functions on scene effective orientation, not node
+        assertEquals(Color.web("#00ff00"), rect.getFill());
+        
+        scene.setNodeOrientation(RIGHT_TO_LEFT);
+        rect.setNodeOrientation(LEFT_TO_RIGHT);
+        
+        root.applyCss();
+        
+        assertEquals(scene.getEffectiveNodeOrientation(), RIGHT_TO_LEFT);
+        assertEquals(rect.getEffectiveNodeOrientation(), LEFT_TO_RIGHT);
+        // :dir() pseudo-class functions on scene effective orientation, not node
+        assertEquals(Color.web("#ff0000"), rect.getFill());
+        
+    }
+    
+}