modules/graphics/src/test/java/com/sun/javafx/css/StyleManagerTest.java

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

@@ -23,13 +23,15 @@
  * questions.
  */
 
 package com.sun.javafx.css;
 
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.CascadingStyle;
+import javafx.css.CssParser;
 import javafx.css.StyleOrigin;
 import javafx.css.StyleableProperty;
+import javafx.css.Stylesheet;
 import javafx.scene.Group;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.SubScene;
 import javafx.scene.layout.Pane;

@@ -185,11 +187,11 @@
     public void testAddUserAgentStyleshseet_Stylesheet() {
 
         try {
             StyleManager sm = StyleManager.getInstance();
             URL ua0_url = StyleManagerTest.class.getResource("ua0.css");
-            Stylesheet stylesheet = CSSParser.getInstance().parse(ua0_url);
+            Stylesheet stylesheet = new CssParser().parse(ua0_url);
             sm.addUserAgentStylesheet(null,stylesheet);
 
             assertEquals(1, sm.platformUserAgentStylesheetContainers.size());
 
             int index = indexOf(sm.platformUserAgentStylesheetContainers,ua0_url.toExternalForm());

@@ -206,15 +208,15 @@
 
         try {
             StyleManager sm = StyleManager.getInstance();
 
             URL ua1_url = StyleManagerTest.class.getResource("ua1.css");
-            Stylesheet stylesheet = CSSParser.getInstance().parse(ua1_url);
+            Stylesheet stylesheet = new CssParser().parse(ua1_url);
             sm.addUserAgentStylesheet(null,stylesheet);
 
             URL ua0_url = StyleManagerTest.class.getResource("ua0.css");
-            stylesheet = CSSParser.getInstance().parse(ua0_url);
+            stylesheet = new CssParser().parse(ua0_url);
             sm.setDefaultUserAgentStylesheet(stylesheet);
 
             assertEquals(2, sm.platformUserAgentStylesheetContainers.size());
 
             int index = indexOf(sm.platformUserAgentStylesheetContainers,ua0_url.toExternalForm());

@@ -693,11 +695,11 @@
         assertTrue(styleMap.containsKey("-fx-fill"));
 
         List<CascadingStyle> styles = styleMap.get("-fx-fill");
         assertEquals(1, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.RED, obj);
     }
 
     @Test
     public void testFindMatchingStyles_defaultStyleSheet_sceneUserAgentStylesheet() {

@@ -719,11 +721,11 @@
         assertTrue(styleMap.containsKey("-fx-stroke"));
 
         List<CascadingStyle> styles = styleMap.get("-fx-stroke");
         assertEquals(1, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.YELLOW, obj);
     }
 
     @Test
     public void testFindMatchingStyles_defaultStyleSheet_sceneUserAgentStylesheet_sceneAuthorStylesheet() {

@@ -747,19 +749,19 @@
 
         // ua1.css and ua2.css have stroke
         List<CascadingStyle> styles = styleMap.get("-fx-stroke");
         assertEquals(2, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.GREEN, obj);
 
         // ua0.css and ua2.css have fill, but we shouldn't get anything from ua0
         // since we have a scene user-agent stylesheet
         styles = styleMap.get("-fx-fill");
         assertEquals(1, styles.size());
 
-        obj = styles.get(0).getParsedValueImpl().convert(null);
+        obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.BLUE, obj);
     }
 
     @Test
     public void testFindMatchingStyles_defaultStyleSheet_subSceneUserAgentStylesheet() {

@@ -783,11 +785,11 @@
         assertTrue(styleMap.containsKey("-fx-stroke"));
 
         List<CascadingStyle> styles = styleMap.get("-fx-stroke");
         assertEquals(1, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.YELLOW, obj);
     }
 
     @Test
     public void testFindMatchingStyles_defaultStyleSheet_subSceneUserAgentStylesheet_parentStylesheet() {

@@ -814,19 +816,19 @@
 
         // ua1.css and ua2.css have stroke
         List<CascadingStyle> styles = styleMap.get("-fx-stroke");
         assertEquals(2, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.GREEN, obj);
 
         // ua0.css and ua2.css have fill, but we shouldn't get anything from ua0
         // since we have a scene user-agent stylesheet
         styles = styleMap.get("-fx-fill");
         assertEquals(1, styles.size());
 
-        obj = styles.get(0).getParsedValueImpl().convert(null);
+        obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.BLUE, obj);
     }
 
     @Test
     public void testSwitchDefaultUserAgentStylesheets() {

@@ -850,11 +852,11 @@
         assertFalse(styleMap.containsKey("-fx-stroke"));
 
         List<CascadingStyle> styles = styleMap.get("-fx-fill");
         assertEquals(1, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.RED, obj);
 
         sm.setDefaultUserAgentStylesheet("/com/sun/javafx/css/ua1.css");
 
         matchingStyles = sm.findMatchingStyles(rect, subScene, null);

@@ -865,11 +867,11 @@
         assertFalse(styleMap.containsKey("-fx-fill"));
 
         styles = styleMap.get("-fx-stroke");
         assertEquals(1, styles.size());
 
-        obj = styles.get(0).getParsedValueImpl().convert(null);
+        obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.YELLOW, obj);
     }
 
     @Test
     public void testGetCacheContainer() {