changeset 1130:0281f5247d73

[TEST-ONLY] fix LabeledImplTest unit test for RT-21617
author David Grieve<david.grieve@oracle.com>
date Wed, 23 May 2012 16:57:25 -0400
parents fb5d0895b78a
children cb74862c833d
files javafx-ui-controls/src/com/sun/javafx/scene/control/skin/LabeledImpl.java javafx-ui-controls/test/com/sun/javafx/scene/control/skin/LabeledImplTest.java
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/LabeledImpl.java	Wed May 23 16:51:43 2012 -0400
+++ b/javafx-ui-controls/src/com/sun/javafx/scene/control/skin/LabeledImpl.java	Wed May 23 16:57:25 2012 -0400
@@ -117,9 +117,10 @@
         }
     }
 
-    private static class StyleableProperties {
+    /** Protected for unit test purposes */
+    static final class StyleableProperties {
 
-        private static final List<StyleableProperty> STYLEABLES_TO_MIRROR;
+        static final List<StyleableProperty> STYLEABLES_TO_MIRROR;
         static {
             //
             // We do this as we only want to mirror the Labeled's keys,
--- a/javafx-ui-controls/test/com/sun/javafx/scene/control/skin/LabeledImplTest.java	Wed May 23 16:51:43 2012 -0400
+++ b/javafx-ui-controls/test/com/sun/javafx/scene/control/skin/LabeledImplTest.java	Wed May 23 16:57:25 2012 -0400
@@ -128,7 +128,7 @@
 
         Collection<Configuration[]> data = new ArrayList<Configuration[]>();
         
-        List<StyleableProperty> styleables = LabeledImpl.impl_CSS_STYLEABLES();
+        List<StyleableProperty> styleables = LabeledImpl.StyleableProperties.STYLEABLES_TO_MIRROR;
         for(StyleableProperty styleable : styleables) {
             
             // LabeledImpl doesn't track -fx-skin since the Labeled