modules/graphics/src/test/java/javafx/css/CssMetaDataTest.java

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

@@ -21,11 +21,11 @@
  * 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.css;
+package javafx.css;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

@@ -34,29 +34,26 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import com.sun.javafx.css.ParsedValueImpl;
+import com.sun.javafx.css.PseudoClassState;
+import com.sun.javafx.css.StyleManager;
+import com.sun.javafx.css.TestNode;
+import com.sun.javafx.css.TestNodeBase;
 import com.sun.javafx.sg.prism.NGNode;
 import javafx.beans.value.WritableValue;
-import javafx.css.CssMetaData;
-import javafx.css.FontCssMetaData;
-import javafx.css.PseudoClass;
-import javafx.css.StyleConverter;
-import javafx.css.StyleOrigin;
-import javafx.css.Styleable;
-import javafx.css.StyleableProperty;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.converter.BooleanConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.jmx.MXNodeAlgorithm;
 import com.sun.javafx.jmx.MXNodeAlgorithmContext;
 import org.junit.Test;

@@ -269,11 +266,11 @@
         List<String> rootStyleClass = new ArrayList<String>();
         rootStyleClass.add("root");
 
         Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
         Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
 
         ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
         Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
 

@@ -292,11 +289,11 @@
         List<String> rectStyleClass = new ArrayList<String>();
         rectStyleClass.add("rect");
 
         Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
 
         selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, rect);
 

@@ -374,11 +371,11 @@
         List<String> rootStyleClass = new ArrayList<String>();
         rootStyleClass.add("root");
 
         Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
         Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
 
         ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
         Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
 

@@ -397,11 +394,11 @@
         List<String> rectStyleClass = new ArrayList<String>();
         rectStyleClass.add("rect");
 
         Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
 
         selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, rect);
 

@@ -497,11 +494,11 @@
         List<String> rootStyleClass = new ArrayList<String>();
         rootStyleClass.add("root");
 
         Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
         Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
 
         ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
         Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
 

@@ -520,11 +517,11 @@
         List<String> rectStyleClass = new ArrayList<String>();
         rectStyleClass.add("rect");
 
         Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
 
         selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, rect);
 

@@ -620,11 +617,11 @@
         List<String> rootStyleClass = new ArrayList<String>();
         rootStyleClass.add("root");
 
         Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
         Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
 
         ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
         Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
 

@@ -643,11 +640,11 @@
         List<String> rectStyleClass = new ArrayList<String>();
         rectStyleClass.add("rect");
 
         Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
 
         selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, rect);
 

@@ -747,11 +744,11 @@
         List<String> rootStyleClass = new ArrayList<String>();
         rootStyleClass.add("root");
 
         Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
         Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
 
         ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
         Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
 

@@ -773,11 +770,11 @@
         List<String> rectStyleClass = new ArrayList<String>();
         rectStyleClass.add("rect");
 
         Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
 
         selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, rect);
 

@@ -858,11 +855,11 @@
         //
         // .root { -fx-base: red; -fx-color: -fx-base; }
         //
         Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
         Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
 
         ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
         Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
 

@@ -881,11 +878,11 @@
         //
         // .rect { -fx-fill: -fx-color; }
         //
         Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
 
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
         Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
 
         selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, rect);
 

@@ -961,11 +958,11 @@
         List<String> rootStyleClass = new ArrayList<String>();
         rootStyleClass.add("root");
 
         Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
-        ParsedValueImpl<Color,Color> fxFontShouldInheritValue = CSSParser.getInstance().parseExpr("-fx-font", "12px system");
+        ParsedValue<Color,Color> fxFontShouldInheritValue = new CssParser().parseExpr("-fx-font", "12px system");
         Declaration fxFontShouldInherit = new Declaration("-fx-font", fxFontShouldInheritValue, false);
 
         List<Selector> selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, root);
 

@@ -981,11 +978,11 @@
         List<String> textStyleClass = new ArrayList<String>();
         textStyleClass.add("text");
 
         Selector textSelector = new SimpleSelector("*", textStyleClass, null, null);
 
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "red");
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "red");
         Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
 
         selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, textSelector);
 

@@ -1041,11 +1038,11 @@
         List<String> rootStyleClass = new ArrayList<String>();
         rootStyleClass.add("root");
 
         Selector root = new SimpleSelector("*", rootStyleClass, null, null);
 
-        ParsedValueImpl<Color,Color> fxFontShouldInheritValue = CSSParser.getInstance().parseExpr("-fx-font", "12px system");
+        ParsedValue<Color,Color> fxFontShouldInheritValue = new CssParser().parseExpr("-fx-font", "12px system");
         Declaration fxFontShouldInherit = new Declaration("-fx-font", fxFontShouldInheritValue, false);
 
         List<Selector> selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, root);
 

@@ -1061,14 +1058,14 @@
         List<String> rectStyleClass = new ArrayList<String>();
         rectStyleClass.add("text");
 
         Selector textSelector = new SimpleSelector("*", rectStyleClass, null, null);
 
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "red");
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "red");
         Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
 
-        ParsedValueImpl fxFontFamilyValue = CSSParser.getInstance().parseExpr("-fx-font-family", "arial");
+        ParsedValue fxFontFamilyValue = new CssParser().parseExpr("-fx-font-family", "arial");
         Declaration fxFontFamily = new Declaration("-fx-font-family", fxFontFamilyValue, false);
 
         selectors = new ArrayList<Selector>();
         Collections.addAll(selectors, textSelector);
 

@@ -1254,11 +1251,11 @@
 
 
     @Test  @org.junit.Ignore
     public void testRT_24606() {
 
-        final Stylesheet stylesheet = CSSParser.getInstance().parse(
+        final Stylesheet stylesheet = new CssParser().parse(
                 ".root { -fx-base: red; }" +
                         ".group { -fx-color: -fx-base; }" +
                         ".text { -fx-fill: -fx-color; }"
         );
         stylesheet.setOrigin(StyleOrigin.USER_AGENT);