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

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

*** 21,36 ****
   * 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.FontConverter;
- import com.sun.javafx.css.converters.SizeConverter;
- import com.sun.javafx.css.parser.CSSParser;
- import javafx.css.ParsedValue;
  import javafx.scene.Group;
  import javafx.scene.Scene;
  import javafx.scene.text.Font;
  import javafx.scene.text.FontPosture;
  import javafx.scene.text.FontWeight;
--- 21,36 ----
   * 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 com.sun.javafx.css.ParsedValueImpl;
! import javafx.css.converter.FontConverter;
! import javafx.css.converter.SizeConverter;
  
  import javafx.scene.Group;
  import javafx.scene.Scene;
  import javafx.scene.text.Font;
  import javafx.scene.text.FontPosture;
  import javafx.scene.text.FontWeight;
*** 112,149 ****
          
      }
  
      @Test public void test_RT_21960_Bold_Italic() {
          
!         ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-font", "italic bold 24 Amble");
          Font f = (Font)pv.convert(null);
          assertEquals("Bold Italic", f.getStyle());
          assertEquals("Amble", f.getFamily());
          assertEquals(24, f.getSize(),0);
      }
      
      @Test public void test_RT_21960_Bold() {
          
!         ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-font", "bold 24 Amble");
          Font f = (Font)pv.convert(null);
          assertEquals("Bold", f.getStyle());
          assertEquals("Amble", f.getFamily());
          assertEquals(24, f.getSize(),0);
      }
  
      @Test public void test_RT_21960_Italic() {
          
!         ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-font", "italic 24 Amble");
          Font f = (Font)pv.convert(null);
          assertEquals("Italic", f.getStyle());
          assertEquals("Amble", f.getFamily());
          assertEquals(24, f.getSize(),0);
      }
  
      @Test public void test_RT_21960_Neither_Bold_Nor_Italic() {
          
!         ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-font", "24 Amble");
          Font f = (Font)pv.convert(null);
          assertEquals("Regular", f.getStyle());
          assertEquals("Amble", f.getFamily());
          assertEquals(24, f.getSize(),0);
      }
--- 112,149 ----
          
      }
  
      @Test public void test_RT_21960_Bold_Italic() {
          
!         ParsedValue pv = new CssParser().parseExpr("-fx-font", "italic bold 24 Amble");
          Font f = (Font)pv.convert(null);
          assertEquals("Bold Italic", f.getStyle());
          assertEquals("Amble", f.getFamily());
          assertEquals(24, f.getSize(),0);
      }
      
      @Test public void test_RT_21960_Bold() {
          
!         ParsedValue pv = new CssParser().parseExpr("-fx-font", "bold 24 Amble");
          Font f = (Font)pv.convert(null);
          assertEquals("Bold", f.getStyle());
          assertEquals("Amble", f.getFamily());
          assertEquals(24, f.getSize(),0);
      }
  
      @Test public void test_RT_21960_Italic() {
          
!         ParsedValue pv = new CssParser().parseExpr("-fx-font", "italic 24 Amble");
          Font f = (Font)pv.convert(null);
          assertEquals("Italic", f.getStyle());
          assertEquals("Amble", f.getFamily());
          assertEquals(24, f.getSize(),0);
      }
  
      @Test public void test_RT_21960_Neither_Bold_Nor_Italic() {
          
!         ParsedValue pv = new CssParser().parseExpr("-fx-font", "24 Amble");
          Font f = (Font)pv.convert(null);
          assertEquals("Regular", f.getStyle());
          assertEquals("Amble", f.getFamily());
          assertEquals(24, f.getSize(),0);
      }