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

rev 9250 : 8134762: Refactor Javafx graphics module tests for clear separation of tests
Reviewed-by:

@@ -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 javafx.css;
+package test.javafx.css;
 
 import com.sun.javafx.css.*;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

@@ -33,12 +33,19 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import javafx.css.CssParser;
+import javafx.css.Declaration;
+import javafx.css.FontFace;
 
 import javafx.css.ParsedValue;
+import javafx.css.ParsedValue;
+import javafx.css.Rule;
+import javafx.css.RuleShim;
+import javafx.css.Stylesheet;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.LinearGradient;
 import javafx.scene.paint.Paint;
 import javafx.scene.paint.Stop;
 import javafx.scene.text.Font;

@@ -68,11 +75,11 @@
         );
         
         assertNotNull(ss);
         List<Rule> rules = ss.getRules();
         assertEquals(1,rules.size(),0);
-        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
+        List<Declaration> decls = RuleShim.getUnobservedDeclarationList(ss.getRules().get(0));
         assertTrue(decls.size()==1);
         Declaration decl = decls.get(0);
         ParsedValue value = decl.getParsedValue();
         assertTrue(value != null);
         

@@ -111,11 +118,11 @@
         Stylesheet ss = instance.parse(stylesheetText);
         
         assertNotNull(ss);
         List<Rule> rules = ss.getRules();
         assertEquals(1,rules.size(),0);
-        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
+        List<Declaration> decls = RuleShim.getUnobservedDeclarationList(ss.getRules().get(0));
         assertTrue(decls.size()==1);
         Declaration decl = decls.get(0);
         ParsedValue value = decl.getParsedValue();
         assertTrue(value != null);
         

@@ -151,11 +158,11 @@
         );
         
         assertNotNull(ss);
         List<Rule> rules = ss.getRules();
         assertEquals(1,rules.size(),0);
-        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
+        List<Declaration> decls = RuleShim.getUnobservedDeclarationList(ss.getRules().get(0));
         assertTrue(decls.size()==1);
         Declaration decl = decls.get(0);
         ParsedValue value = decl.getParsedValue();
         assertTrue(value != null);
         

@@ -174,11 +181,11 @@
         Stylesheet ss = instance.parse(".rt17830 {-fx-fill: red;; -fx-stroke: yellow; }");
         
         assertNotNull(ss);
         List<Rule> rules = ss.getRules();
         assertEquals(1,rules.size(),0);
-        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
+        List<Declaration> decls = RuleShim.getUnobservedDeclarationList(ss.getRules().get(0));
         assertEquals(2,decls.size(),0);
         
         Declaration decl = decls.get(0);
         ParsedValue value = decl.getParsedValue();
         assertTrue(value != null);