modules/controls/src/test/java/javafx/scene/control/skin/ScrollPaneSkinTest.java

rev 9240 : 8076423: JEP 253: Prepare JavaFX UI Controls & CSS APIs for Modularization

@@ -21,18 +21,17 @@
  * 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;
+package javafx.scene.control.skin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import javafx.beans.value.ChangeListener;
+
 import javafx.beans.value.ObservableValue;
 import javafx.event.Event;
-import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;

@@ -40,29 +39,19 @@
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.input.*;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.sun.javafx.pgstub.StubScene;
-import javafx.event.EventHandler;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Stage;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
 
 /**
  * @author mickf
  */
 public class ScrollPaneSkinTest {

@@ -271,11 +260,11 @@
         rect.setOnScroll(event -> {
             scrolled = true;
         });
 
         final ScrollPane scrollPaneInner = new ScrollPane();
-        scrollPaneInner.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneInner));
+        scrollPaneInner.setSkin(new ScrollPaneSkin(scrollPaneInner));
         scrollPaneInner.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
         scrollPaneInner.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
         scrollPaneInner.setPrefWidth(100);
         scrollPaneInner.setPrefHeight(100);
         scrollPaneInner.setPannable(true);

@@ -285,11 +274,11 @@
         pOuter.setPrefWidth(600);
         pOuter.setPrefHeight(600);
         pOuter.getChildren().add(scrollPaneInner);
 
         final ScrollPane scrollPaneOuter = new ScrollPane();
-        scrollPaneOuter.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneOuter));
+        scrollPaneOuter.setSkin(new ScrollPaneSkin(scrollPaneOuter));
         scrollPaneOuter.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
         scrollPaneOuter.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
         scrollPaneOuter.setPrefWidth(500);
         scrollPaneOuter.setPrefHeight(500);
         scrollPaneOuter.setPannable(true);

@@ -328,11 +317,11 @@
     /*
     ** check if unconsumed MouseClicked events on a scrollPane reach it's parent.
     */
     @Test public void checkIfScrollPaneConsumesMouseClickedEvents() {
         ScrollPane scrollPaneInner = new ScrollPane();
-        scrollPaneInner.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneInner));
+        scrollPaneInner.setSkin(new ScrollPaneSkin(scrollPaneInner));
         scrollPaneInner.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
         scrollPaneInner.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
         scrollPaneInner.setTranslateX(70);
         scrollPaneInner.setTranslateY(30);
         scrollPaneInner.setPrefWidth(100);

@@ -647,11 +636,11 @@
         scrolled = false;
 
         Rectangle rect = new Rectangle(200, 200, 200, 200);
 
         final ScrollPane scrollPaneInner = new ScrollPane();
-        scrollPaneInner.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneInner));
+        scrollPaneInner.setSkin(new ScrollPaneSkin(scrollPaneInner));
         scrollPaneInner.setPrefWidth(100);
         scrollPaneInner.setPrefHeight(100);
         scrollPaneInner.setPannable(true);
         scrollPaneInner.setContent(rect);
         scrollPaneInner.setOnSwipeUp(event -> {

@@ -707,11 +696,11 @@
         scrolled = false;
 
         Rectangle rect = new Rectangle(200, 200, 200, 200);
 
         final ScrollPane scrollPaneInner = new ScrollPane();
-        scrollPaneInner.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneInner));
+        scrollPaneInner.setSkin(new ScrollPaneSkin(scrollPaneInner));
         scrollPaneInner.setPrefWidth(100);
         scrollPaneInner.setPrefHeight(100);
         scrollPaneInner.setPannable(true);
         scrollPaneInner.setContent(rect);
         scrollPaneInner.setOnSwipeUp(event -> {

@@ -764,14 +753,15 @@
         int propertyChangeCount = 0;
         public ScrollPaneSkinMock(ScrollPane scrollPane) {
             super(scrollPane);
         }
 
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
             propertyChanged = true;
             propertyChangeCount++;
+            });
         }
 
         boolean isHSBarVisible() {
             return hsb.isVisible();
         }