changeset 1745:df3029cbea31 8.0-b56

Fixed broken transformation tests.
author Martin Sladecek <martin.sladecek@oracle.com>
date Tue, 11 Sep 2012 14:47:38 +0200
parents fe2d63f8b003
children 49758b2a4097 570d081dd337 3546a0a8e2cd
files javafx-ui-common/test/unit/javafx/scene/transform/Affine_onInvalidate_Test.java javafx-ui-common/test/unit/javafx/scene/transform/Rotate_onInvalidate_Test.java javafx-ui-common/test/unit/javafx/scene/transform/Scale_onInvalidate_Test.java javafx-ui-common/test/unit/javafx/scene/transform/Shear_onInvalidate_Test.java javafx-ui-common/test/unit/javafx/scene/transform/Translate_onInvalidate_Test.java
diffstat 5 files changed, 27 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-common/test/unit/javafx/scene/transform/Affine_onInvalidate_Test.java	Tue Sep 11 09:36:06 2012 +0200
+++ b/javafx-ui-common/test/unit/javafx/scene/transform/Affine_onInvalidate_Test.java	Tue Sep 11 14:47:38 2012 +0200
@@ -45,16 +45,16 @@
     @Parameters
     public static Collection<Object[]> data() {
         Object[][] data = new Object[][] {
-            {new Configuration(Affine.class, "mxx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Affine.class, "mxy", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Affine.class, "mxz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Affine.class, "myx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Affine.class, "myz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Affine.class, "mzx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Affine.class, "mzy", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Affine.class, "tx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Affine.class, "ty", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Affine.class, "tz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })}
+            {new Configuration(Affine.class, "mxx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Affine.class, "mxy", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Affine.class, "mxz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Affine.class, "myx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Affine.class, "myz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Affine.class, "mzx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Affine.class, "mzy", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Affine.class, "tx", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Affine.class, "ty", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Affine.class, "tz", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
         };
         return Arrays.asList(data);
     }
--- a/javafx-ui-common/test/unit/javafx/scene/transform/Rotate_onInvalidate_Test.java	Tue Sep 11 09:36:06 2012 +0200
+++ b/javafx-ui-common/test/unit/javafx/scene/transform/Rotate_onInvalidate_Test.java	Tue Sep 11 14:47:38 2012 +0200
@@ -45,10 +45,10 @@
     @Parameters
     public static Collection<Object[]> data() {
         Object[][] data = new Object[][] {
-            {new Configuration(Rotate.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Rotate.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Rotate.class, "pivotZ", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Rotate.class, "angle", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })}
+            {new Configuration(Rotate.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Rotate.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Rotate.class, "pivotZ", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Rotate.class, "angle", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
         };
         return Arrays.asList(data);
     }
--- a/javafx-ui-common/test/unit/javafx/scene/transform/Scale_onInvalidate_Test.java	Tue Sep 11 09:36:06 2012 +0200
+++ b/javafx-ui-common/test/unit/javafx/scene/transform/Scale_onInvalidate_Test.java	Tue Sep 11 14:47:38 2012 +0200
@@ -45,12 +45,12 @@
     @Parameters
     public static Collection<Object[]> data() {
         Object[][] data = new Object[][] {
-            {new Configuration(Scale.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Scale.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Scale.class, "pivotZ", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Scale.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Scale.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Scale.class, "z", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })}
+            {new Configuration(Scale.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Scale.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Scale.class, "pivotZ", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Scale.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Scale.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Scale.class, "z", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
         };
         return Arrays.asList(data);
     }
--- a/javafx-ui-common/test/unit/javafx/scene/transform/Shear_onInvalidate_Test.java	Tue Sep 11 09:36:06 2012 +0200
+++ b/javafx-ui-common/test/unit/javafx/scene/transform/Shear_onInvalidate_Test.java	Tue Sep 11 14:47:38 2012 +0200
@@ -45,10 +45,10 @@
     @Parameters
     public static Collection<Object[]> data() {
         Object[][] data = new Object[][] {
-            {new Configuration(Shear.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Shear.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Shear.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Shear.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })}
+            {new Configuration(Shear.class, "pivotX", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Shear.class, "pivotY", 2.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Shear.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Shear.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
         };
         return Arrays.asList(data);
     }
--- a/javafx-ui-common/test/unit/javafx/scene/transform/Translate_onInvalidate_Test.java	Tue Sep 11 09:36:06 2012 +0200
+++ b/javafx-ui-common/test/unit/javafx/scene/transform/Translate_onInvalidate_Test.java	Tue Sep 11 14:47:38 2012 +0200
@@ -45,9 +45,9 @@
     @Parameters
     public static Collection<Object[]> data() {
         Object[][] data = new Object[][] {            
-            {new Configuration(Translate.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Translate.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })},
-            {new Configuration(Translate.class, "z", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_BOUNDS })}
+            {new Configuration(Translate.class, "x", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Translate.class, "y", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })},
+            {new Configuration(Translate.class, "z", 20.0, new DirtyBits[] {DirtyBits.NODE_TRANSFORM, DirtyBits.NODE_TRANSFORMED_BOUNDS })}
         };
         return Arrays.asList(data);
     }