functional/SceneGraphTests/test/test/scenegraph/functional/mix/HasTransformsTest.java

rev 338 : 8165224: [TEST BUG] Control for HasTransformsTest not generated
Summary: Refactored failing test.

@@ -1,7 +1,7 @@
 /*
- * 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation. Oracle designates this

@@ -30,177 +30,80 @@
 import org.jemmy.control.Wrap;
 import org.jemmy.fx.Lookups;
 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;
 import test.javaclient.shared.TestBase;
 import test.scenegraph.app.HasTransformsApp;
 
 /**
  *
  * @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);
-
-        check.mouse().click();
-
-        indicator.waitState(new State<String>() {
-
-            public String reached() {
-                return indicator.text();
+        for (CheckBoxWrap<CheckBox> wrap : boxes) {
+            wrap.selector().select(CheckBoxWrap.State.CHECKED);
             }
-        }, "false");
+        check.mouse().click();
+        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();
+    public void multipleTranformsTest() {
+        checkTransforms(translate, rotate, scale, shear);
             }
-        }, "false");
-    }
-
-    CheckBoxWrap<CheckBox> translate, rotate, scale, shear;
-    Wrap<? extends Button> check;
-    TextControlWrap<Label> indicator;
-    ComboBoxWrap<ComboBox> nodesCombo;
-
 }