changeset 2143:7eb6ab4e1510

Fix build failure due to unit test failures.
author jgiles
date Fri, 04 Jan 2013 18:15:15 +1300
parents 84c256cf9366
children e026e37b8c0b
files javafx-ui-controls/test/javafx/scene/control/PopupControlTest.java
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/test/javafx/scene/control/PopupControlTest.java	Fri Jan 04 17:35:58 2013 +1300
+++ b/javafx-ui-controls/test/javafx/scene/control/PopupControlTest.java	Fri Jan 04 18:15:15 2013 +1300
@@ -4,12 +4,12 @@
 
 package javafx.scene.control;
 
+import com.sun.javafx.scene.control.skin.TooltipSkin;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.DoublePropertyBase;
 import javafx.beans.property.SimpleStringProperty;
 
-import com.sun.javafx.scene.control.skin.PopupControlSkin;
-import com.sun.javafx.scene.control.skin.TooltipSkin;
+import javafx.scene.Node;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -21,12 +21,18 @@
  */
 public class PopupControlTest {
     private PopupControl popup;
+    
+    private static final class PopupControlSkin<C extends PopupControl> implements Skin<C>{
+        @Override public Node getNode()     { return null; }
+        @Override public void dispose()     { }
+        @Override public C getSkinnable()   { return null; }
+    }
 
     @Before public void setup() {
         popup = new PopupControl();
         // PopupControl normally gets its stylesheet from the owner scene.
         popup.getScene().getStylesheets().add(
-            PopupControlSkin.class.getResource("caspian/caspian.css").toExternalForm()
+            TooltipSkin.class.getResource("caspian/caspian.css").toExternalForm()
         );
     }
 
@@ -125,7 +131,7 @@
     }
 
     @Test public void setAndGetSpecifiedSkin() {
-        PopupControlSkin skin = new PopupControlSkin();
+        Skin skin = new PopupControlSkin();
         popup.setSkin(skin);
         assertEquals(skin, popup.getSkin());
     }