# HG changeset patch
# User arusakov
# Date 1472721588 -10800
#      Thu Sep 01 12:19:48 2016 +0300
# Node ID 079e557cdf68a9369c502b50308b2a6287f1bab5
# Parent  3c17dfa835667fe40dfbe4ddc46bcae699ab9657
8165224: [TEST BUG] Control for HasTransformsTest not generated
Summary: Refactored failing test.

diff --git a/functional/SceneGraphTests/src/test/scenegraph/app/HasTransformsApp.java b/functional/SceneGraphTests/src/test/scenegraph/app/HasTransformsApp.java
--- a/functional/SceneGraphTests/src/test/scenegraph/app/HasTransformsApp.java
+++ b/functional/SceneGraphTests/src/test/scenegraph/app/HasTransformsApp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,7 @@
  */
 package test.scenegraph.app;
 
-import java.util.LinkedList;
-import java.util.List;
 import javafx.collections.FXCollections;
-import javafx.event.ActionEvent;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
@@ -45,51 +42,42 @@
  *
  * @author Aleksandr Sakharuk
  */
-public class HasTransformsApp extends InteroperabilityApp
-{
+public class HasTransformsApp extends InteroperabilityApp {
 
-    public static void main(String[] args)
-    {
-         Utils.launch(HasTransformsApp.class, args);
+    private Node node;
+    private final Translate translate = new Translate(20, 20);
+    private final Rotate rotate = new Rotate(45);
+    private final Scale scale = new Scale(1.5, 1.5);
+    private final Shear shear = new Shear(0.1, 0.1);
+
+    public static void main(String[] args) {
+        Utils.launch(HasTransformsApp.class, args);
     }
 
     @Override
-    protected Scene getScene()
-    {
+    protected Scene getScene() {
         return new Scene(new HasTransformRoot(), 300, 300);
     }
 
-    public class HasTransformRoot extends BorderPane
-    {
+    public class HasTransformRoot extends BorderPane {
 
-        public HasTransformRoot()
-        {
+        public HasTransformRoot() {
             CheckBox translateBox = CheckBoxBuilder.create().text("Translate").id("translate").build();
             CheckBox rotateBox = CheckBoxBuilder.create().text("Rotate").id("rotate").build();
             CheckBox scaleBox = CheckBoxBuilder.create().text("Scale").id("scale").build();
             CheckBox shearBox = CheckBoxBuilder.create().text("Shear").id("shear").build();
-
             Button checkTransforms = ButtonBuilder.create().text("Check tranforms").id("check_tranforms").build();
             final Label hasTransforms = LabelBuilder.create().id("has_transforms").text("     ").build();
-
-            final ComboBox<Nodes> nodesCombo = new ComboBox<Nodes>(FXCollections.observableArrayList(Nodes.values()));
+            final ComboBox<Nodes> nodesCombo = new ComboBox<>(FXCollections.observableArrayList(Nodes.values()));
             nodesCombo.setId("nodes_combo");
 
-            nodesCombo.setOnAction(new EventHandler<ActionEvent>() {
-
-                public void handle(ActionEvent arg0) {
-                    node = nodesCombo.getValue().getNode();
-                    setCenter(node);
-                }
+            nodesCombo.valueProperty().addListener((obs) -> {
+                node = nodesCombo.getValue().getNode();
+                setCenter(node);
             });
             nodesCombo.setValue(Nodes.values()[0]);
-
-            checkTransforms.setOnAction(new EventHandler<ActionEvent>() {
-
-                public void handle(ActionEvent arg0) {
-                    hasTransforms.setText(String.valueOf(node.impl_hasTransforms()));
-                }
-            });
+            checkTransforms.setOnAction((event)
+                    -> hasTransforms.setText(String.valueOf(node.impl_hasTransforms())));
 
             translateBox.addEventHandler(MouseEvent.MOUSE_CLICKED, new TransformBoxHandler(translateBox, translate));
             rotateBox.addEventHandler(MouseEvent.MOUSE_CLICKED, new TransformBoxHandler(rotateBox, rotate));
@@ -103,59 +91,39 @@
 
     }
 
-    private List<Transform> transforms = new LinkedList<Transform>();
-    private Node node;
-    private Translate translate = new Translate(20, 20);
-    private Rotate rotate = new Rotate(45);
-    private Scale scale = new Scale(1.5, 1.5);
-    private Shear shear = new Shear(0.1, 0.1);
+    private class TransformBoxHandler implements EventHandler<Event> {
 
-    private class TransformBoxHandler implements EventHandler<Event>
-    {
+        private final Transform transform;
+        private final CheckBox checkBox;
 
-        public TransformBoxHandler(CheckBox checkBox, Transform transform)
-        {
+        public TransformBoxHandler(CheckBox checkBox, Transform transform) {
             this.checkBox = checkBox;
             this.transform = transform;
         }
 
-        public void handle(Event arg0)
-        {
-            if(checkBox.isSelected())
-            {
+        @Override
+        public void handle(Event arg0) {
+            if (checkBox.isSelected()) {
                 node.getTransforms().add(transform);
-                transforms.add(transform);
-            }
-            else
-            {
+            } else {
                 node.getTransforms().remove(transform);
-                transforms.remove(transform);
             }
         }
-
-        private Transform transform;
-        private CheckBox checkBox;
-
     }
 
 }
 
-enum Nodes
-{
+enum Nodes {
 
-    BUTTON(ButtonBuilder.create().text("Button").alignment(Pos.CENTER).build())
-    ;
+    BUTTON(ButtonBuilder.create().text("Button").alignment(Pos.CENTER).build());
 
-    private Nodes(Node node)
-    {
+    private final Node node;
+
+    private Nodes(Node node) {
         this.node = node;
     }
 
-    public Node getNode()
-    {
+    public Node getNode() {
         return node;
     }
-
-    private Node node;
-
 }
diff --git a/functional/SceneGraphTests/test/test/scenegraph/functional/mix/HasTransformsTest.java b/functional/SceneGraphTests/test/test/scenegraph/functional/mix/HasTransformsTest.java
--- a/functional/SceneGraphTests/test/test/scenegraph/functional/mix/HasTransformsTest.java
+++ b/functional/SceneGraphTests/test/test/scenegraph/functional/mix/HasTransformsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
 import org.jemmy.fx.control.CheckBoxWrap;
 import org.jemmy.fx.control.ComboBoxWrap;
 import org.jemmy.fx.control.TextControlWrap;
-import org.jemmy.timing.State;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -43,164 +42,68 @@
  *
  * @author Aleksandr Sakharuk
  */
-public class HasTransformsTest extends TestBase
-{
+public class HasTransformsTest extends TestBase {
+
+    private CheckBoxWrap<CheckBox> translate, rotate, scale, shear;
+    private Wrap<? extends Button> check;
+    private TextControlWrap<Label> indicator;
 
     @BeforeClass
-    public static void RunUI()
-    {
+    public static void RunUI() {
         HasTransformsApp.main(null);
     }
 
     @Before
     @Override
-    public void before()
-    {
+    public void before() {
         super.before();
-
         translate = Lookups.byID(getScene(), "translate", CheckBox.class).as(CheckBoxWrap.class);
         rotate = Lookups.byID(getScene(), "rotate", CheckBox.class).as(CheckBoxWrap.class);
         scale = Lookups.byID(getScene(), "scale", CheckBox.class).as(CheckBoxWrap.class);
         shear = Lookups.byID(getScene(), "shear", CheckBox.class).as(CheckBoxWrap.class);
-
         check = Lookups.byID(getScene(), "check_tranforms", Button.class);
-
         indicator = Lookups.byID(getScene(), "has_transforms", Label.class).as(TextControlWrap.class);
-
-        nodesCombo = Lookups.byID(getScene(), "nodes_combo", ComboBox.class).as(ComboBoxWrap.class);
     }
 
-    @Test
-    public void noTranfomsTest() // Passing only if run at first
-    {
+    private void checkTransforms(CheckBoxWrap<CheckBox>... boxes) {
         translate.selector().select(CheckBoxWrap.State.UNCHECKED);
         rotate.selector().select(CheckBoxWrap.State.UNCHECKED);
         scale.selector().select(CheckBoxWrap.State.UNCHECKED);
         shear.selector().select(CheckBoxWrap.State.UNCHECKED);
-
+        for (CheckBoxWrap<CheckBox> wrap : boxes) {
+            wrap.selector().select(CheckBoxWrap.State.CHECKED);
+        }
         check.mouse().click();
-
-        indicator.waitState(new State<String>() {
-
-            public String reached() {
-                return indicator.text();
-            }
-        }, "false");
+        indicator.waitState(indicator::text, boxes.length == 0 ? "false" : "true");
     }
 
     @Test
-    public void translateTransformTest()
-    {
-        translate.selector().select(CheckBoxWrap.State.CHECKED);
-        rotate.selector().select(CheckBoxWrap.State.UNCHECKED);
-        scale.selector().select(CheckBoxWrap.State.UNCHECKED);
-        shear.selector().select(CheckBoxWrap.State.UNCHECKED);
-
-        check.mouse().click();
-
-        indicator.waitState(new State<String>() {
-
-            public String reached() {
-                return indicator.text();
-            }
-        }, "true");
+    public void noTranfomsTest() {
+        checkTransforms();
     }
 
     @Test
-    public void rotateTransformTest()
-    {
-        translate.selector().select(CheckBoxWrap.State.UNCHECKED);
-        rotate.selector().select(CheckBoxWrap.State.CHECKED);
-        scale.selector().select(CheckBoxWrap.State.UNCHECKED);
-        shear.selector().select(CheckBoxWrap.State.UNCHECKED);
-
-        check.mouse().click();
-
-        indicator.waitState(new State<String>() {
-
-            public String reached() {
-                return indicator.text();
-            }
-        }, "true");
+    public void translateTransformTest() {
+        checkTransforms(translate);
     }
 
     @Test
-    public void scaleTransformTest()
-    {
-        translate.selector().select(CheckBoxWrap.State.UNCHECKED);
-        rotate.selector().select(CheckBoxWrap.State.UNCHECKED);
-        scale.selector().select(CheckBoxWrap.State.CHECKED);
-        shear.selector().select(CheckBoxWrap.State.UNCHECKED);
-
-        check.mouse().click();
-
-        indicator.waitState(new State<String>() {
-
-            public String reached() {
-                return indicator.text();
-            }
-        }, "true");
+    public void rotateTransformTest() {
+        checkTransforms(rotate);
     }
 
     @Test
-    public void shearTransformTest()
-    {
-        translate.selector().select(CheckBoxWrap.State.UNCHECKED);
-        rotate.selector().select(CheckBoxWrap.State.UNCHECKED);
-        scale.selector().select(CheckBoxWrap.State.UNCHECKED);
-        shear.selector().select(CheckBoxWrap.State.CHECKED);
-
-        check.mouse().click();
-
-        indicator.waitState(new State<String>() {
-
-            public String reached() {
-                return indicator.text();
-            }
-        }, "true");
+    public void scaleTransformTest() {
+        checkTransforms(scale);
     }
 
     @Test
-    public void multipleTranformsTest()
-    {
-        translate.selector().select(CheckBoxWrap.State.CHECKED);
-        rotate.selector().select(CheckBoxWrap.State.CHECKED);
-        scale.selector().select(CheckBoxWrap.State.CHECKED);
-        shear.selector().select(CheckBoxWrap.State.CHECKED);
-
-        check.mouse().click();
-
-        indicator.waitState(new State<String>() {
-
-            public String reached() {
-                return indicator.text();
-            }
-        }, "true");
+    public void shearTransformTest() {
+        checkTransforms(shear);
     }
 
     @Test
-    public void cleanupTransformsTest()
-    {
-        translate.selector().select(CheckBoxWrap.State.UNCHECKED);
-        rotate.selector().select(CheckBoxWrap.State.UNCHECKED);
-        scale.selector().select(CheckBoxWrap.State.UNCHECKED);
-        shear.selector().select(CheckBoxWrap.State.CHECKED);
-
-        shear.selector().select(CheckBoxWrap.State.UNCHECKED);
-
-        check.mouse().click();
-
-        indicator.waitState(new State<String>() {
-
-            public String reached() {
-                return indicator.text();
-            }
-        }, "false");
+    public void multipleTranformsTest() {
+        checkTransforms(translate, rotate, scale, shear);
     }
-
-    CheckBoxWrap<CheckBox> translate, rotate, scale, shear;
-    Wrap<? extends Button> check;
-    TextControlWrap<Label> indicator;
-    ComboBoxWrap<ComboBox> nodesCombo;
-
 }