--- old/modules/javafx.jmx/src/test/java/com/oracle/javafx/jmx/SGMXBean_bounds_Test.java	2016-11-02 13:32:14.051685812 -0400
+++ /dev/null	2016-10-31 09:37:02.128008072 -0400
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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 com.oracle.javafx.jmx;
-
-
-import com.oracle.javafx.jmx.json.JSONDocument;
-import javafx.geometry.Bounds;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Stage;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class SGMXBean_bounds_Test {
-
-    private final SGMXBean mxBean = new SGMXBeanImpl();
-
-    private static Group root;
-
-    @BeforeClass
-    public static void setUp() {
-        Stage stage = new Stage();
-        root = new Group();
-        Scene scene = new Scene(root);
-        stage.setScene(scene);
-        stage.show();
-    }
-
-    @Test
-    public void boundsEqualTest() {
-        Node node = new Rectangle(10, 20, 100, 50);
-        this.testNode(node);
-    }
-
-    @Test
-    public void transformedNodeBoundsEqualTest() {
-        Node node = new Rectangle(0, 0, 100, 50);
-        node.setTranslateX(50);
-        node.setTranslateY(80);
-        node.setScaleX(0.8);
-        node.setScaleX(1.2);
-        node.setRotate(10);
-        this.testNode(node);
-    }
-
-    @Test
-    public void transformedRootBoundsEqualTest() {
-        Node node = new Rectangle(10, 10, 100, 50);
-        node.setTranslateX(10);
-        node.setTranslateY(100);
-        node.setScaleX(1.5);
-        node.setScaleX(1.5);
-        node.setRotate(45);
-        root.setTranslateX(50);
-        root.setTranslateY(80);
-        root.setScaleX(0.8);
-        root.setScaleX(1.2);
-        root.setRotate(10);
-        this.testNode(node);
-    }
-
-    @Test
-    public void transformedRootNodeBoundsEqualTest() {
-        Node node = new Rectangle(10, 10, 100, 50);
-        root.setTranslateX(50);
-        root.setTranslateY(80);
-        root.setScaleX(0.8);
-        root.setScaleX(1.2);
-        root.setRotate(10);
-        this.testNode(node);
-    }
-
-    private void testNode(Node node) {
-        root.getChildren().clear();
-        root.getChildren().add(node);
-
-        Bounds bounds = node.localToScene(node.getBoundsInLocal());
-
-        mxBean.pause();
-
-        JSONDocument jwindows = TestUtils.getJSONDocument(mxBean.getWindows());
-        int[] windowIDs = TestUtils.getWindowIDs(jwindows);
-        assertTrue(windowIDs.length > 0);
-        JSONDocument jsceneGraph = TestUtils.getJSONDocument(mxBean.getSGTree(windowIDs[0]));
-        assertTrue(jsceneGraph.isObject());
-        JSONDocument jchildren = jsceneGraph.get("children");
-        assertTrue(jchildren.isArray());
-        assertTrue(jchildren.array().size() > 0);
-        JSONDocument jnode = (JSONDocument)jchildren.array().get(0);
-        int nodeId = jnode.getNumber("id").intValue();
-        JSONDocument jbounds = TestUtils.getJSONDocument(mxBean.getBounds(nodeId));
-
-        assertEquals(bounds.getMinX(), jbounds.getNumber("x"));
-        assertEquals(bounds.getMinY(), jbounds.getNumber("y"));
-        assertEquals(bounds.getWidth(), jbounds.getNumber("w"));
-        assertEquals(bounds.getHeight(), jbounds.getNumber("h"));
-    }
-}
--- /dev/null	2016-10-31 09:37:02.128008072 -0400
+++ new/modules/javafx.jmx/src/shims/java/com/oracle/javafx/jmx/SGMXBean_bounds_Test.java	2016-11-02 13:32:13.895689356 -0400
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2010, 2013, 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 com.oracle.javafx.jmx;
+
+
+import com.oracle.javafx.jmx.json.JSONDocument;
+import javafx.geometry.Bounds;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.shape.Rectangle;
+import javafx.stage.Stage;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class SGMXBean_bounds_Test {
+
+    private final SGMXBean mxBean = new SGMXBeanImpl();
+
+    private static Group root;
+
+    @BeforeClass
+    public static void setUp() {
+        Stage stage = new Stage();
+        root = new Group();
+        Scene scene = new Scene(root);
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    @Test
+    public void boundsEqualTest() {
+        Node node = new Rectangle(10, 20, 100, 50);
+        this.testNode(node);
+    }
+
+    @Test
+    public void transformedNodeBoundsEqualTest() {
+        Node node = new Rectangle(0, 0, 100, 50);
+        node.setTranslateX(50);
+        node.setTranslateY(80);
+        node.setScaleX(0.8);
+        node.setScaleX(1.2);
+        node.setRotate(10);
+        this.testNode(node);
+    }
+
+    @Test
+    public void transformedRootBoundsEqualTest() {
+        Node node = new Rectangle(10, 10, 100, 50);
+        node.setTranslateX(10);
+        node.setTranslateY(100);
+        node.setScaleX(1.5);
+        node.setScaleX(1.5);
+        node.setRotate(45);
+        root.setTranslateX(50);
+        root.setTranslateY(80);
+        root.setScaleX(0.8);
+        root.setScaleX(1.2);
+        root.setRotate(10);
+        this.testNode(node);
+    }
+
+    @Test
+    public void transformedRootNodeBoundsEqualTest() {
+        Node node = new Rectangle(10, 10, 100, 50);
+        root.setTranslateX(50);
+        root.setTranslateY(80);
+        root.setScaleX(0.8);
+        root.setScaleX(1.2);
+        root.setRotate(10);
+        this.testNode(node);
+    }
+
+    private void testNode(Node node) {
+        root.getChildren().clear();
+        root.getChildren().add(node);
+
+        Bounds bounds = node.localToScene(node.getBoundsInLocal());
+
+        mxBean.pause();
+
+        JSONDocument jwindows = TestUtils.getJSONDocument(mxBean.getWindows());
+        int[] windowIDs = TestUtils.getWindowIDs(jwindows);
+        assertTrue(windowIDs.length > 0);
+        JSONDocument jsceneGraph = TestUtils.getJSONDocument(mxBean.getSGTree(windowIDs[0]));
+        assertTrue(jsceneGraph.isObject());
+        JSONDocument jchildren = jsceneGraph.get("children");
+        assertTrue(jchildren.isArray());
+        assertTrue(jchildren.array().size() > 0);
+        JSONDocument jnode = (JSONDocument)jchildren.array().get(0);
+        int nodeId = jnode.getNumber("id").intValue();
+        JSONDocument jbounds = TestUtils.getJSONDocument(mxBean.getBounds(nodeId));
+
+        assertEquals(bounds.getMinX(), jbounds.getNumber("x"));
+        assertEquals(bounds.getMinY(), jbounds.getNumber("y"));
+        assertEquals(bounds.getWidth(), jbounds.getNumber("w"));
+        assertEquals(bounds.getHeight(), jbounds.getNumber("h"));
+    }
+}