modules/controls/src/test/java/com/sun/javafx/scene/control/LabeledTextTest.java

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

@@ -21,18 +21,21 @@
  * 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 com.sun.javafx.scene.control;
 
+import com.sun.javafx.scene.control.LabeledText;
 import javafx.css.CssMetaData;
-import com.sun.javafx.css.Stylesheet;
+import javafx.css.Stylesheet;
 import javafx.scene.Cursor;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.control.Label;
+import javafx.scene.control.skin.LabelSkinBaseRetriever;
+import javafx.scene.control.skin.LabeledSkinBase;
 import javafx.scene.effect.BlendMode;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;

@@ -61,11 +64,11 @@
                 + "but it was no match for me at kick boxing.\" Emo Philips");
         stage = new Stage();
         stage.setScene(scene = new Scene(label));
         scene.getStylesheets().add(LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm());
         label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
+        labeledText = LabelSkinBaseRetriever.getText(label);
     }
 
     @Test
     public void testLabeledTextAlignmentStyleAffectsLabeledText() {
         

@@ -311,11 +314,11 @@
                 };
         label.setTextFill(Color.YELLOW);
         stage.setScene(scene = new Scene(label));
         stage.show();
 //        label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
+        labeledText = LabelSkinBaseRetriever.getText(label);
         assertEquals(Color.YELLOW, labeledText.getFill());
     }
     
     @Test
     public void testLabeledSetFontNotOverridenByUAStyleOnLabeledText() {

@@ -329,11 +332,11 @@
         Font font = Font.font("Amble", 30);
         label.setFont(font);
         stage.setScene(scene = new Scene(label));
         stage.show();
 //        label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
+        labeledText = LabelSkinBaseRetriever.getText(label);
         assertEquals(font, labeledText.getFont());
     }
     
     @Test
     public void testLabeledSetTextAlignmentNotOverridenByUAStyleOnLabeledText() {

@@ -346,11 +349,11 @@
                 };
         label.setTextAlignment(TextAlignment.JUSTIFY);
         stage.setScene(scene = new Scene(label));
         stage.show();
 //        label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
+        labeledText = LabelSkinBaseRetriever.getText(label);
         assertEquals(TextAlignment.JUSTIFY, labeledText.getTextAlignment());
     }
     
     @Test
     public void testLabeledSetUnderlineNotOverridenByUAStyleOnLabeledText() {

@@ -363,11 +366,11 @@
                 };
         label.setUnderline(true);
         stage.setScene(scene = new Scene(label));
         stage.show();
 //        label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
+        labeledText = LabelSkinBaseRetriever.getText(label);
         assertTrue(labeledText.isUnderline());
     }
 
 
     @Test public void test_RT_37787() {