--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ChoiceBoxSkinTest.java	2015-09-03 15:27:13.347416700 -0700
+++ /dev/null	2015-09-03 15:27:14.000000000 -0700
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2011, 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.sun.javafx.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Insets;
-import javafx.scene.control.ChoiceBox;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This fails with IllegalStateException because of the toolkit's check for the FX application thread
- */
-public class ChoiceBoxSkinTest {
-    private ChoiceBox choicebox;
-    private ChoiceBoxSkinMock skin;
-
-    @Before public void setup() {
-        choicebox = new ChoiceBox();
-        skin = new ChoiceBoxSkinMock(choicebox);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        choicebox.setPadding(new Insets(10, 10, 10, 10));
-        choicebox.setSkin(skin);
-    }
-
-    @Test public void maxWidthTracksPreferred() {
-        choicebox.setPrefWidth(500);
-        assertEquals(500, choicebox.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        choicebox.setPrefHeight(500);
-        assertEquals(500, choicebox.maxHeight(-1), 0);
-    }
-    
-    public static final class ChoiceBoxSkinMock extends ChoiceBoxSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public ChoiceBoxSkinMock(ChoiceBox choicebox) {
-            super(choicebox);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:27:14.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ChoiceBoxSkinTest.java	2015-09-03 15:27:12.572372400 -0700
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2011, 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.scene.control.ChoiceBox;
+
+import javafx.scene.control.skin.ChoiceBoxSkin;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This fails with IllegalStateException because of the toolkit's check for the FX application thread
+ */
+public class ChoiceBoxSkinTest {
+    private ChoiceBox choicebox;
+    private ChoiceBoxSkinMock skin;
+
+    @Before public void setup() {
+        choicebox = new ChoiceBox();
+        skin = new ChoiceBoxSkinMock(choicebox);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        choicebox.setPadding(new Insets(10, 10, 10, 10));
+        choicebox.setSkin(skin);
+    }
+
+    @Test public void maxWidthTracksPreferred() {
+        choicebox.setPrefWidth(500);
+        assertEquals(500, choicebox.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        choicebox.setPrefHeight(500);
+        assertEquals(500, choicebox.maxHeight(-1), 0);
+    }
+    
+    public static final class ChoiceBoxSkinMock extends ChoiceBoxSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public ChoiceBoxSkinMock(ChoiceBox choicebox) {
+            super(choicebox);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}