modules/graphics/src/test/java/test/javafx/scene/transform/AffineOperationsTest.java

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

*** 21,31 ****
   * 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.scene.transform;
  
  //import java.awt.geom.AffineTransform;
  //import com.sun.javafx.geom.transform.Affine3D;
  import java.util.Collection;
  import javafx.beans.Observable;
--- 21,31 ----
   * 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 test.javafx.scene.transform;
  
  //import java.awt.geom.AffineTransform;
  //import com.sun.javafx.geom.transform.Affine3D;
  import java.util.Collection;
  import javafx.beans.Observable;
*** 33,46 ****
  import org.junit.runners.Parameterized;
  import java.util.Arrays;
  import javafx.geometry.Point3D;
  import org.junit.Test;
  import org.junit.runner.RunWith;
! import com.sun.javafx.test.TransformHelper;
  import javafx.beans.InvalidationListener;
  import javafx.event.EventHandler;
  import javafx.geometry.Point2D;
  import static org.junit.Assert.*;
  
  @RunWith(Parameterized.class)
  public class AffineOperationsTest {
  
--- 33,56 ----
  import org.junit.runners.Parameterized;
  import java.util.Arrays;
  import javafx.geometry.Point3D;
  import org.junit.Test;
  import org.junit.runner.RunWith;
! import test.com.sun.javafx.test.TransformHelper;
  import javafx.beans.InvalidationListener;
  import javafx.event.EventHandler;
  import javafx.geometry.Point2D;
+ import javafx.scene.transform.Affine;
+ import javafx.scene.transform.AffineShim;
+ import javafx.scene.transform.MatrixType;
+ import javafx.scene.transform.NonInvertibleTransformException;
+ import javafx.scene.transform.Rotate;
+ import javafx.scene.transform.Scale;
+ import javafx.scene.transform.Shear;
+ import javafx.scene.transform.Transform;
+ import javafx.scene.transform.TransformShim;
+ import javafx.scene.transform.Translate;
  import static org.junit.Assert.*;
  
  @RunWith(Parameterized.class)
  public class AffineOperationsTest {
  
*** 198,212 ****
          TransformHelper.assertMatrix(message, a, expected);
          assertStateOk(message, a);
      }
  
      private void assertStateOk(Affine a) {
!         TransformHelper.assertStateOk(a, a.getState3d(), a.getState2d());
      }
  
      private void assertStateOk(String message, Affine a) {
!         TransformHelper.assertStateOk(message, a, a.getState3d(), a.getState2d());
      }
  
      private void testOperationIsAtomic(Affine a,
              final Runnable op, final Runnable check) {
  
--- 208,222 ----
          TransformHelper.assertMatrix(message, a, expected);
          assertStateOk(message, a);
      }
  
      private void assertStateOk(Affine a) {
!         TransformHelper.assertStateOk(a, AffineShim.getState3d(a), AffineShim.getState2d(a));
      }
  
      private void assertStateOk(String message, Affine a) {
!         TransformHelper.assertStateOk(message, a, AffineShim.getState3d(a), AffineShim.getState2d(a));
      }
  
      private void testOperationIsAtomic(Affine a,
              final Runnable op, final Runnable check) {
  
*** 233,243 ****
          op.run();
  
          assertTrue(listener1Counter == (memMyx == a.getMyx() ? 0 : 1));
          assertTrue(listener2Counter == (memTy == a.getTy() ? 0 : 1));
          assertEquals(1, eventCounter);
!         assertFalse(a.atomicChangeRuns());
      }
  
      @Test
      public void SetToTransformShouldBeAtomic() {
          final Affine a = affine.clone();
--- 243,253 ----
          op.run();
  
          assertTrue(listener1Counter == (memMyx == a.getMyx() ? 0 : 1));
          assertTrue(listener2Counter == (memTy == a.getTy() ? 0 : 1));
          assertEquals(1, eventCounter);
!         assertFalse(AffineShim.atomicChangeRuns(a));
      }
  
      @Test
      public void SetToTransformShouldBeAtomic() {
          final Affine a = affine.clone();
*** 2356,2366 ****
      }
  
      @Test
      public void testSetElement() {
          Affine a = affine.clone();
!         boolean is2d = affine.computeIs2D();
  
          assertSetElement(a, MatrixType.MT_2D_2x3, 0, 0, a.getMxx(), !is2d, false);
          assertSetElement(a, MatrixType.MT_2D_2x3, 0, 1, a.getMxy(), !is2d, false);
          assertSetElement(a, MatrixType.MT_2D_2x3, 0, 2, a.getTx(), !is2d, false);
          assertSetElement(a, MatrixType.MT_2D_2x3, 1, 0, a.getMyx(), !is2d, false);
--- 2366,2376 ----
      }
  
      @Test
      public void testSetElement() {
          Affine a = affine.clone();
!         boolean is2d = TransformShim.computeIs2D(affine);
  
          assertSetElement(a, MatrixType.MT_2D_2x3, 0, 0, a.getMxx(), !is2d, false);
          assertSetElement(a, MatrixType.MT_2D_2x3, 0, 1, a.getMxy(), !is2d, false);
          assertSetElement(a, MatrixType.MT_2D_2x3, 0, 2, a.getTx(), !is2d, false);
          assertSetElement(a, MatrixType.MT_2D_2x3, 1, 0, a.getMyx(), !is2d, false);