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

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

*** 21,64 ****
   * 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;
  
! import com.sun.javafx.css.converters.EnumConverter;
! import com.sun.javafx.css.converters.StringConverter;
! import com.sun.javafx.css.parser.CSSParser;
! import javafx.css.ParsedValue;
! import javafx.css.StyleConverter;
! import javafx.css.StyleOrigin;
  
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
  import java.io.DataInputStream;
  import java.io.DataOutputStream;
  import java.io.File;
  import java.io.FileWriter;
  import java.io.IOException;
- import java.io.OutputStreamWriter;
  import java.net.URISyntaxException;
  import java.net.URL;
  import java.util.Collections;
  import java.util.List;
  import java.util.Locale;
- import java.util.Map;
  
- import javafx.css.StyleableProperty;
  import javafx.geometry.NodeOrientation;
  import javafx.geometry.Orientation;
  import javafx.geometry.Pos;
  import javafx.geometry.VPos;
  import javafx.scene.Group;
  import javafx.scene.Scene;
  import javafx.scene.layout.StackPane;
  import javafx.scene.paint.Color;
- import javafx.scene.paint.LinearGradient;
  import javafx.scene.paint.Paint;
  import javafx.scene.paint.RadialGradient;
  import javafx.scene.shape.Rectangle;
  import javafx.scene.text.Font;
  import javafx.scene.text.FontSmoothingType;
--- 21,57 ----
   * 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;
  
! import javafx.css.StyleConverter.StringStore;
! import javafx.css.converter.EnumConverter;
! import javafx.css.converter.StringConverter;
  
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
  import java.io.DataInputStream;
  import java.io.DataOutputStream;
  import java.io.File;
  import java.io.FileWriter;
  import java.io.IOException;
  import java.net.URISyntaxException;
  import java.net.URL;
  import java.util.Collections;
  import java.util.List;
  import java.util.Locale;
  
  import javafx.geometry.NodeOrientation;
  import javafx.geometry.Orientation;
  import javafx.geometry.Pos;
  import javafx.geometry.VPos;
  import javafx.scene.Group;
  import javafx.scene.Scene;
  import javafx.scene.layout.StackPane;
  import javafx.scene.paint.Color;
  import javafx.scene.paint.Paint;
  import javafx.scene.paint.RadialGradient;
  import javafx.scene.shape.Rectangle;
  import javafx.scene.text.Font;
  import javafx.scene.text.FontSmoothingType;
*** 236,246 ****
                  + "-fx-background-repeat: repeat, no-repeat;"
                  + "-fx-border-image-repeat: repeat, no-repeat;"
                  + "}";
  
          try {
!             Stylesheet stylesheet = CSSParser.getInstance().parse(data);
  
              StringStore stringStore = new StringStore();
              ByteArrayOutputStream baos = new ByteArrayOutputStream();
              DataOutputStream dos = new DataOutputStream(baos);
              stylesheet.writeBinary(dos, stringStore);
--- 229,239 ----
                  + "-fx-background-repeat: repeat, no-repeat;"
                  + "-fx-border-image-repeat: repeat, no-repeat;"
                  + "}";
  
          try {
!             Stylesheet stylesheet = new CssParser().parse(data);
  
              StringStore stringStore = new StringStore();
              ByteArrayOutputStream baos = new ByteArrayOutputStream();
              DataOutputStream dos = new DataOutputStream(baos);
              stylesheet.writeBinary(dos, stringStore);
*** 449,459 ****
              URL url = StylesheetTest.class.getResource("RT-30953.css");
              if (url == null) {
                  fail("Can't find RT-30953.css");
              }
  
!             Stylesheet ss = CSSParser.getInstance().parse(url);
              int nFontFaceSrcs = checkFontFace(ss);
              assertEquals(3, nFontFaceSrcs);
              checkConvert(ss);
  
          } catch (Exception e) {
--- 442,452 ----
              URL url = StylesheetTest.class.getResource("RT-30953.css");
              if (url == null) {
                  fail("Can't find RT-30953.css");
              }
  
!             Stylesheet ss = new CssParser().parse(url);
              int nFontFaceSrcs = checkFontFace(ss);
              assertEquals(3, nFontFaceSrcs);
              checkConvert(ss);
  
          } catch (Exception e) {
*** 580,590 ****
          }
  
      }
  
      private int checkFontFace(Stylesheet stylesheet) {
!         return com.sun.javafx.css.parser.CSSParserTest.checkFontFace(stylesheet);
      }
  
     @Test
     public void testRT_37122() {
         try {
--- 573,583 ----
          }
  
      }
  
      private int checkFontFace(Stylesheet stylesheet) {
!         return javafx.css.CssParserTest.checkFontFace(stylesheet);
      }
  
     @Test
     public void testRT_37122() {
         try {