modules/graphics/src/test/java/test/javafx/css/StylesheetTest.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 javafx.css.StyleConverter.StringStore;
 import javafx.css.converter.EnumConverter;
 import javafx.css.converter.StringConverter;
 

@@ -39,10 +39,22 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import javafx.css.CssParser;
+import javafx.css.Declaration;
+import javafx.css.ParsedValue;
+import javafx.css.Rule;
+import javafx.css.RuleShim;
+import javafx.css.Selector;
+import javafx.css.SimpleSelector;
+import javafx.css.StyleConverter;
+import javafx.css.StyleOrigin;
+import javafx.css.StyleableProperty;
+import javafx.css.Stylesheet;
+import javafx.css.StylesheetShim;
 
 import javafx.geometry.NodeOrientation;
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;

@@ -73,26 +85,26 @@
     /**
      * Test of getUrl method, of class Stylesheet.
      */
     @Test
     public void testGetUrl() {
-        Stylesheet instance = new Stylesheet();
+        Stylesheet instance = new StylesheetShim();
         URL expResult = null;
         String result = instance.getUrl();
         assertEquals(expResult, result);
         
-        instance = new Stylesheet(testURL);
+        instance = new StylesheetShim(testURL);
         result = instance.getUrl();
         assertEquals(testURL, result);
     }
 
     /**
      * Test of getSource method, of class Stylesheet.
      */
     @Test
     public void testGetStylesheetSourceGetterAndSetter() {
-        Stylesheet instance = new Stylesheet();
+        Stylesheet instance = new StylesheetShim();
         StyleOrigin expResult = StyleOrigin.AUTHOR;
         StyleOrigin result = instance.getOrigin();
         assertEquals(expResult, result);
         
         instance.setOrigin(StyleOrigin.INLINE);

@@ -114,12 +126,12 @@
     /**
      * Test of addRule method, of class Stylesheet.
      */
     @Test
     public void testStylesheetAddAndGetRule() {
-        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet instance = new Stylesheet();
+        Rule rule = RuleShim.getRule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet instance = new StylesheetShim();
         instance.getRules().add(rule);
         instance.getRules().add(rule);
         instance.getRules().add(rule);
         instance.getRules().add(rule);
         instance.getRules().add(rule);

@@ -128,49 +140,49 @@
         for(Rule r : rules) assertEquals(r, rule);
     }
     
     @Test
     public void testAddingRuleSetsStylesheetOnRule() {
-        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet instance = new Stylesheet();
+        Rule rule = RuleShim.getRule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet instance = new StylesheetShim();
         instance.getRules().add(rule);
         assert(rule.getStylesheet() == instance);        
     }
 
     @Test
     public void testRemovingRuleSetsStylesheetNullOnRule() {
-        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet instance = new Stylesheet();
+        Rule rule = RuleShim.getRule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet instance = new StylesheetShim();
         instance.getRules().add(rule);
         instance.getRules().remove(rule);
         assertNull(rule.getStylesheet());
     }
     
     /**
      * Test of equals method, of class Stylesheet.
      */
     @Test
     public void testStylesheetEquals() {
-        Object obj = new Stylesheet();
-        Stylesheet instance = new Stylesheet();
+        Object obj = new StylesheetShim();
+        Stylesheet instance = new StylesheetShim();
         boolean expResult = true;
         boolean result = instance.equals(obj);
         assertEquals(expResult, result);
 
-        obj = new Stylesheet(testURL);
-        instance = new Stylesheet(testURL);
+        obj = new StylesheetShim(testURL);
+        instance = new StylesheetShim(testURL);
         expResult = true;
         result = instance.equals(obj);
         assertEquals(expResult, result);
 
-        obj = new Stylesheet();
-        instance = new Stylesheet(testURL);
+        obj = new StylesheetShim();
+        instance = new StylesheetShim(testURL);
         expResult = false;
         result = instance.equals(obj);
         assertEquals(expResult, result);
         
-        obj = instance = new Stylesheet(testURL);
+        obj = instance = new StylesheetShim(testURL);
         expResult = true;
         result = instance.equals(obj);
         assertEquals(expResult, result);
         
     }

@@ -178,22 +190,22 @@
     /**
      * Test of toString method, of class Stylesheet.
      */
     @Test
     public void testStylesheetToString() {
-        Stylesheet instance = new Stylesheet();
+        Stylesheet instance = new StylesheetShim();
         String expResult = "/*  */";
         String result = instance.toString();
         assertEquals(expResult, result);
 
-        instance = new Stylesheet(testURL);
+        instance = new StylesheetShim(testURL);
         expResult = "/* " + testURL + " */";
         result = instance.toString();
         assertEquals(expResult, result);
 
-        instance = new Stylesheet(testURL);
-        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        instance = new StylesheetShim(testURL);
+        Rule rule = RuleShim.getRule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
         instance.getRules().add(rule);
         expResult = "/* " + testURL + " */\n{\n}\n";
         result = instance.toString();
         assertEquals(expResult, result);
     }

@@ -202,11 +214,11 @@
      * Test of writeBinary method, of class Stylesheet.
     @Test
     public void testWriteAndReadBinary() throws Exception {
         DataOutputStream os = null;
         StringStore stringStore = null;
-        Stylesheet instance = new Stylesheet(testURL);
+        Stylesheet instance = new StylesheetShim(testURL);
         instance.writeBinary(os, stringStore);
     }
      */
 
     /**

@@ -234,29 +246,31 @@
             Stylesheet stylesheet = new CssParser().parse(data);
 
             StringStore stringStore = new StringStore();
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             DataOutputStream dos = new DataOutputStream(baos);
-            stylesheet.writeBinary(dos, stringStore);
+            StylesheetShim.writeBinary(stylesheet, dos, stringStore);
             dos.flush();
             dos.close();
 
             ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
             DataInputStream dis = new DataInputStream(bais);
 
-            Stylesheet restored = new Stylesheet();
-            restored.readBinary(Stylesheet.BINARY_CSS_VERSION, dis, stringStore.strings.toArray(new String[stringStore.strings.size()]));
+            Stylesheet restored = new StylesheetShim();
+            StylesheetShim.readBinary(restored, StylesheetShim.BINARY_CSS_VERSION, dis, stringStore.strings.toArray(new String[stringStore.strings.size()]));
 
             List<Rule> cssRules = stylesheet.getRules();
             List<Rule> bssRules = restored.getRules();
 
             // Rule does not have an equals method
             assert(cssRules.size() == bssRules.size());
             for (int n=0; n<cssRules.size(); n++) {
                 Rule expected = cssRules.get(n);
                 Rule actual = bssRules.get(n);
-                assertEquals(Integer.toString(n), expected.getUnobservedDeclarationList(), actual.getUnobservedDeclarationList());
+                assertEquals(Integer.toString(n), 
+                        RuleShim.getUnobservedDeclarationList(expected),
+                        RuleShim.getUnobservedDeclarationList(actual));
             }
 
         } catch (IOException ioe) {
             fail(ioe.toString());
         }

@@ -573,11 +587,11 @@
         }
 
     }
 
     private int checkFontFace(Stylesheet stylesheet) {
-        return javafx.css.CssParserTest.checkFontFace(stylesheet);
+        return test.javafx.css.CssParserTest.checkFontFace(stylesheet);
     }
 
    @Test
    public void testRT_37122() {
        try {