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

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

@@ -21,12 +21,15 @@
  * 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.Size;
+import javafx.css.SizeShim;
+import javafx.css.SizeUnits;
 import static org.junit.Assert.assertEquals;
 import javafx.scene.text.Font;
 
 import org.junit.Test;
 

@@ -48,52 +51,52 @@
         final double pixelSize = font.getSize();
         final double pointSize = pixelSize * (POINTS_PER_INCH / DOTS_PER_INCH);
 
         Size instance = new Size(12.0, SizeUnits.PX);
         double expResult = 12.0  * (POINTS_PER_INCH/DOTS_PER_INCH);
-        double result = instance.points(font);
+        double result = SizeShim.points(instance, font);
         assertEquals("px", expResult, result, 0.01);
 
         instance = new Size(12.0, SizeUnits.PT);
         expResult = 12.0; // PT is absolute
-        result = instance.points(font);
+        result = SizeShim.points(instance, font);
         assertEquals("pt", expResult, result, 0.01);
 
         instance = new Size(50.0, SizeUnits.PERCENT);
         expResult = 0.5 * pointSize;
-        result = instance.points(pointSize, font);
+        result = SizeShim.points(instance, pointSize, font);
         assertEquals("%", expResult, result, 0.01);
 
         instance = new Size(2, SizeUnits.EM);
         expResult = 2 * pointSize;
-        result = instance.points(font);
+        result = SizeShim.points(instance, font);
         assertEquals("em", expResult, result, 0.01);
 
         instance = new Size(1.0, SizeUnits.EX);
         expResult = 0.5 * pointSize;
-        result = instance.points(font);
+        result = SizeShim.points(instance, font);
         assertEquals("ex", expResult, result, 0.01);
 
 
         instance = new Size(1.0, SizeUnits.CM);
         expResult = POINTS_PER_INCH/2.54; // CM is absolute (pts per inch/cm per inch)
-        result = instance.points(font);
+        result = SizeShim.points(instance, font);
         assertEquals("cm", expResult, result, 0.01);
 
         instance = new Size(1.0, SizeUnits.MM);
         expResult = POINTS_PER_INCH/25.4; // MM is absolute (pts per inch/mm per inch)
-        result = instance.points(font);
+        result = SizeShim.points(instance, font);
         assertEquals("mm", expResult, result, 0.01);
 
         instance = new Size(1.0, SizeUnits.IN);
         expResult = POINTS_PER_INCH; // IN is absolute (pts per inch)
-        result = instance.points(font);
+        result = SizeShim.points(instance, font);
         assertEquals("in", expResult, result, 0.01);
 
         instance = new Size(1.0, SizeUnits.PC);
         expResult = 12.0; // PC is absolute (pts per pica)
-        result = instance.points(font);
+        result = SizeShim.points(instance, font);
         assertEquals("pc", expResult, result, 0.01);
 
     }
 
     /**