--- old/modules/graphics/src/test/java/javafx/scene/effect/BloomTest.java	2015-09-11 21:26:39.825285468 -0400
+++ /dev/null	2015-09-11 11:06:08.592686920 -0400
@@ -1,129 +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 javafx.scene.effect;
-
-import static com.sun.javafx.test.TestHelper.box;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class BloomTest extends EffectsTestBase {
-    private Bloom effect;
-
-    @Before
-    public void setUp() {
-        effect = new Bloom();
-        setupTest(effect);
-    }
-
-    @Test
-    public void testSetThreshold() {
-        // try setting correct value
-        effect.setThreshold(1.0f);
-        assertEquals(1.0f, (float) effect.getThreshold(), 1e-100);
-        pulse();
-        assertEquals(1.0f, (float) ((com.sun.scenario.effect.Bloom)effect.impl_getImpl()).getThreshold(), 1e-100);
-    }
-    
-    @Test
-    public void testDefaultThreshold() {
-        // default value should be 0.3
-        assertEquals(0.3f, (float) effect.getThreshold(), 1e-100);
-        assertEquals(0.3f, (float) effect.thresholdProperty().get(), 1e-100);
-        pulse();
-        assertEquals(0.3f, (float) ((com.sun.scenario.effect.Bloom)effect.impl_getImpl()).getThreshold(), 1e-100);
-    }
-    
-    @Test
-    public void testMinThreshold() {
-        // 0 should be ok
-        effect.setThreshold(0);
-        // try setting value smaller than minimal
-        effect.setThreshold(-0.1f);
-        assertEquals(-0.1f, (float) effect.getThreshold(), 1e-100);
-        pulse();
-        assertEquals(0.0f, (float) ((com.sun.scenario.effect.Bloom)effect.impl_getImpl()).getThreshold(), 1e-100);
-    }
-
-    @Test
-    public void testMaxThreshold() {
-        // 1 should be ok
-        effect.setThreshold(1);
-        // try setting value greater than maximal
-        effect.setThreshold(1.1f);
-        assertEquals(1.1f, (float) effect.getThreshold(), 1e-100);
-        pulse();
-        assertEquals(1.0f, (float) ((com.sun.scenario.effect.Bloom)effect.impl_getImpl()).getThreshold(), 1e-100);
-    }
-
-    @Test
-    public void testThresholdSynced() throws Exception {
-        checkDoublePropertySynced(
-                "javafx.scene.effect.Bloom", "threshold",
-                "com.sun.scenario.effect.Bloom", "threshold", 0.3);
-    }
-
-    @Test
-    public void testInputSynced() throws Exception {
-        BoxBlur blur = new BoxBlur();
-        checkEffectPropertySynced(
-                "javafx.scene.effect.Bloom", "input",
-                "com.sun.scenario.effect.Bloom", "input",
-                blur, (com.sun.scenario.effect.BoxBlur)blur.impl_getImpl());
-    }
-
-    @Test
-    public void testBounds() {
-        assertEquals(box(0, 0, 100, 100), n.getBoundsInLocal());
-    }
-
-    @Test
-    public void testBoundsWidthInput() {
-        assertEquals(box(0, 0, 100, 100), n.getBoundsInLocal());
-        BoxBlur blur = new BoxBlur();
-        effect.setInput(blur);
-        assertEquals(box(-2, -2, 104, 104), n.getBoundsInLocal());
-    }
-    
-    @Test
-    public void testCreateWithParams() {
-        effect = new Bloom(1);
-        setupTest(effect);
-        assertEquals(1, effect.getThreshold(), 1e-100);
-        pulse();
-        assertEquals(1.0f, ((com.sun.scenario.effect.Bloom) effect.impl_getImpl()).getThreshold(), 1e-100);
-    }
-        
-    @Test
-    public void testCreateWithDefaultParams() {
-        effect = new Bloom(0.3);
-        setupTest(effect);
-        assertEquals(0.3, effect.getThreshold(), 1e-100);
-        pulse();
-        assertEquals(0.3f, ((com.sun.scenario.effect.Bloom) effect.impl_getImpl()).getThreshold(), 1e-100);
-    }
-}
--- /dev/null	2015-09-11 11:06:08.592686920 -0400
+++ new/modules/graphics/src/test/java/test/javafx/scene/effect/BloomTest.java	2015-09-11 21:26:39.609285470 -0400
@@ -0,0 +1,140 @@
+/*
+ * 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 test.javafx.scene.effect;
+
+import javafx.scene.effect.Bloom;
+import javafx.scene.effect.BoxBlur;
+import javafx.scene.effect.EffectShim;
+import static test.com.sun.javafx.test.TestHelper.box;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+import test.javafx.scene.effect.EffectsTestBase;
+
+public class BloomTest extends EffectsTestBase {
+    private Bloom effect;
+
+    @Before
+    public void setUp() {
+        effect = new Bloom();
+        setupTest(effect);
+    }
+
+    @Test
+    public void testSetThreshold() {
+        // try setting correct value
+        effect.setThreshold(1.0f);
+        assertEquals(1.0f, (float) effect.getThreshold(), 1e-100);
+        pulse();
+        assertEquals(1.0f, (float) ((com.sun.scenario.effect.Bloom)
+                EffectShim.impl_getImpl(effect)).getThreshold(), 1e-100);
+    }
+    
+    @Test
+    public void testDefaultThreshold() {
+        // default value should be 0.3
+        assertEquals(0.3f, (float) effect.getThreshold(), 1e-100);
+        assertEquals(0.3f, (float) effect.thresholdProperty().get(), 1e-100);
+        pulse();
+        assertEquals(0.3f, (float) ((com.sun.scenario.effect.Bloom)
+                EffectShim.impl_getImpl(effect)).getThreshold(), 1e-100);
+    }
+    
+    @Test
+    public void testMinThreshold() {
+        // 0 should be ok
+        effect.setThreshold(0);
+        // try setting value smaller than minimal
+        effect.setThreshold(-0.1f);
+        assertEquals(-0.1f, (float) effect.getThreshold(), 1e-100);
+        pulse();
+        assertEquals(0.0f, (float) ((com.sun.scenario.effect.Bloom)
+                EffectShim.impl_getImpl(effect)).getThreshold(), 1e-100);
+    }
+
+    @Test
+    public void testMaxThreshold() {
+        // 1 should be ok
+        effect.setThreshold(1);
+        // try setting value greater than maximal
+        effect.setThreshold(1.1f);
+        assertEquals(1.1f, (float) effect.getThreshold(), 1e-100);
+        pulse();
+        assertEquals(1.0f, (float) ((com.sun.scenario.effect.Bloom)
+                EffectShim.impl_getImpl(effect)).getThreshold(), 1e-100);
+    }
+
+    @Test
+    public void testThresholdSynced() throws Exception {
+        checkDoublePropertySynced(
+                "javafx.scene.effect.Bloom", "threshold",
+                "com.sun.scenario.effect.Bloom", "threshold", 0.3);
+    }
+
+    @Test
+    public void testInputSynced() throws Exception {
+        BoxBlur blur = new BoxBlur();
+        checkEffectPropertySynced(
+                "javafx.scene.effect.Bloom", "input",
+                "com.sun.scenario.effect.Bloom", "input",
+                blur, 
+                (com.sun.scenario.effect.BoxBlur) EffectShim.impl_getImpl(blur));
+    }
+
+    @Test
+    public void testBounds() {
+        assertEquals(box(0, 0, 100, 100), n.getBoundsInLocal());
+    }
+
+    @Test
+    public void testBoundsWidthInput() {
+        assertEquals(box(0, 0, 100, 100), n.getBoundsInLocal());
+        BoxBlur blur = new BoxBlur();
+        effect.setInput(blur);
+        assertEquals(box(-2, -2, 104, 104), n.getBoundsInLocal());
+    }
+    
+    @Test
+    public void testCreateWithParams() {
+        effect = new Bloom(1);
+        setupTest(effect);
+        assertEquals(1, effect.getThreshold(), 1e-100);
+        pulse();
+        assertEquals(1.0f, ((com.sun.scenario.effect.Bloom)
+                EffectShim.impl_getImpl(effect)).getThreshold(), 1e-100);
+    }
+        
+    @Test
+    public void testCreateWithDefaultParams() {
+        effect = new Bloom(0.3);
+        setupTest(effect);
+        assertEquals(0.3, effect.getThreshold(), 1e-100);
+        pulse();
+        assertEquals(0.3f, ((com.sun.scenario.effect.Bloom)
+                EffectShim.impl_getImpl(effect)).getThreshold(), 1e-100);
+    }
+}