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

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

@@ -21,47 +21,43 @@
  * 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.pgstub.StubImageLoaderFactory;
 import com.sun.javafx.pgstub.StubPlatformImageInfo;
 import com.sun.javafx.pgstub.StubToolkit;
+import com.sun.javafx.scene.control.LabeledImpl;
+import com.sun.javafx.scene.control.skin.FXVK;
 import com.sun.javafx.tk.Toolkit;
-import javafx.css.StyleConverter;
 import javafx.css.CssMetaData;
 import java.util.ArrayList;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import javafx.beans.value.WritableValue;
 import javafx.css.Styleable;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Cursor;
-import javafx.scene.Node;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Label;
 import javafx.scene.control.Labeled;
 import javafx.scene.control.OverrunStyle;
 import javafx.scene.effect.BlendMode;
 import javafx.scene.effect.ColorAdjust;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
-import javax.swing.GroupLayout;
 
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)
 public class LabeledImplTest {

@@ -69,11 +65,11 @@
     @BeforeClass
     public static void configureImageLoaderFactory() {
         final StubImageLoaderFactory imageLoaderFactory =
                 ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory();
         imageLoaderFactory.reset();
-        imageLoaderFactory.registerImage(LabeledImpl.class.getResource("caspian/center-btn.png").toExternalForm(),
+        imageLoaderFactory.registerImage(FXVK.class.getResource("caspian/center-btn.png").toExternalForm(),
                 new StubPlatformImageInfo(32, 32));
     }
 
     private static final Labeled LABELED = new Label("label");
     private static final LabeledImpl LABELED_IMPL = new LabeledImpl(LABELED);

@@ -132,11 +128,13 @@
             } else if ("-fx-text-overrun".equals(prop)) {
                 value = OverrunStyle.LEADING_WORD_ELLIPSIS;
             } else if ("-fx-wrap-text".equals(prop)) {
                 value = Boolean.TRUE;
             } else if ("-fx-graphic".equals(prop)) {
-                value = LabeledImpl.class.getResource("caspian/center-btn.png").toExternalForm();
+                // FXVK is used here as it is located within com.sun.javafx.scene.control.skin,
+                // which is useful when trying to load caspian / modena resources.
+                value = FXVK.class.getResource("caspian/center-btn.png").toExternalForm();
             } else if ("-fx-underline".equals(prop)) {
                 value = Boolean.TRUE;
             } else if ("-fx-content-display".equals(prop)) {
                 value = ContentDisplay.GRAPHIC_ONLY;
             } else if ("-fx-label-padding".equals(prop)) {