changeset 10855:75647ec072e9

8198587: Increase test timeout values to make test suite more stable Reviewed-by: kcr
author mbilla
date Thu, 01 Mar 2018 12:01:23 +0530
parents 577f335418f4
children 8e8647461811
files tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java tests/system/src/test/java/test/com/sun/marlin/QPathTest.java tests/system/src/test/java/test/com/sun/prism/impl/PNTMeshVertexBufferLengthTest.java tests/system/src/test/java/test/launchertest/JarLauncherTest.java tests/system/src/test/java/test/launchertest/MainLauncherTest.java tests/system/src/test/java/test/launchertest/ModuleLauncherTest.java tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java tests/system/src/test/java/test/robot/helloworld/RectangleTest.java tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java tests/system/src/test/java/test/robot/javafx/scene/JDK8183100Test.java tests/system/src/test/java/test/robot/javafx/scene/layout/LayoutTest.java tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java tests/system/src/test/java/test/robot/scenegraph/ViewOrderTest.java tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java tests/system/src/test/java/test/robot/test3d/RT35019Test.java tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java tests/system/src/test/java/test/sandbox/SandboxAppTest.java tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java tests/system/src/test/java/test/util/Util.java
diffstat 28 files changed, 244 insertions(+), 244 deletions(-) [+]
line wrap: on
line diff
--- a/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -88,7 +88,7 @@
         Platform.exit();
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void TestBug() {
         Label label = new Label();
         label.setStyle(" -fx-border-style:dashed; -fx-border-width:0; ");
--- a/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/com/sun/marlin/QPathTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -161,7 +161,7 @@
         Platform.exit();
     }
 
-    @Test(timeout = 10000)
+    @Test(timeout = 15000)
     public void TestBug() {
         Platform.runLater(() -> {
             SVGPath path = new SVGPath();
--- a/tests/system/src/test/java/test/com/sun/prism/impl/PNTMeshVertexBufferLengthTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/com/sun/prism/impl/PNTMeshVertexBufferLengthTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -289,7 +289,7 @@
     }
 
     // ========================== TEST CASES ==========================
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testMeshWithZeroDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
@@ -306,7 +306,7 @@
         assertTrue(BaseMeshShim.test_isVertexBufferNull(baseMesh));
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testMeshWithOneDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
@@ -325,7 +325,7 @@
         assertEquals(10 * VERTEX_SIZE, BaseMeshShim.test_getVertexBufferLength(baseMesh));
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testMeshWithTwoDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
@@ -344,7 +344,7 @@
         assertEquals(27 * VERTEX_SIZE, BaseMeshShim.test_getVertexBufferLength(baseMesh));
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testMeshWithThreeDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
@@ -364,7 +364,7 @@
         assertEquals(325 * VERTEX_SIZE, BaseMeshShim.test_getVertexBufferLength(baseMesh));
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testMeshWithFiveDiv() throws InterruptedException {
         Util.runAndWait(() -> {
             Scene scene = myApp.primaryStage.getScene();
--- a/tests/system/src/test/java/test/launchertest/JarLauncherTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/launchertest/JarLauncherTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -40,7 +40,7 @@
     private final String testAppName = System.getProperty("launchertest.testapp1.jar");
     private final int testExitCode = ERROR_NONE;
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testJarLauncher() throws Exception {
         assertNotNull(testAppName);
         final ArrayList<String> cmd =
--- a/tests/system/src/test/java/test/launchertest/MainLauncherTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/launchertest/MainLauncherTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -125,7 +125,7 @@
         this.testExitCode = testData.exitCode;
     }
 
-    @Test (timeout=5000)
+    @Test (timeout = 15000)
     public void testMainLauncher() throws Exception {
         if (headless) {
             // Headless tests currently only run on Linux
--- a/tests/system/src/test/java/test/launchertest/ModuleLauncherTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/launchertest/ModuleLauncherTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -100,167 +100,167 @@
     }
 
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testLaunchModule() throws Exception {
         doTestLaunchModule(modulePath2, "testapp.TestApp");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testLaunchModuleNoMain() throws Exception {
         doTestLaunchModule(modulePath2, "testapp.TestAppNoMain");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testLaunchModuleNotApplication() throws Exception {
         doTestLaunchModule(modulePath2, "testapp.TestNotApplication");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTableViewUnexported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewUnexported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTableViewExported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTableViewQualExported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewQualExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTableViewOpened() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTableViewQualOpened() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTableViewQualOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTreeTableViewUnexported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewUnexported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTreeTableViewExported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTreeTableViewQualExported() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewQualExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTreeTableViewOpened() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleTreeTableViewQualOpened() throws Exception {
         doTestLaunchModule(modulePath3, "myapp3.AppTreeTableViewQualOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBeansUnexported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansUnexported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBeansExported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBeansQualExported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansQualExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBeansOpened() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBeansQualOpened() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBeansQualOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBindingsUnexported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsUnexported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBindingsExported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBindingsQualExported() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsQualExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBindingsOpened() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleBindingsQualOpened() throws Exception {
         doTestLaunchModule(modulePath4, "myapp4.AppBindingsQualOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleJSCallbackUnexported() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackUnexported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleJSCallbackExported() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleJSCallbackQualExported() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackQualExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleJSCallbackOpened() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleJSCallbackQualOpened() throws Exception {
         doTestLaunchModule(modulePath5, "myapp5.AppJSCallbackQualOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleFXMLUnexported() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLUnexported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleFXMLExported() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleFXMLQualExported() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLQualExported");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleFXMLOpened() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLOpened");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testModuleFXMLQualOpened() throws Exception {
         doTestLaunchModule(modulePath6, "myapp6.AppFXMLQualOpened");
     }
--- a/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -226,62 +226,62 @@
         }
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testOnTopNoSecurityManager() {
         doTestOnTopCommon(null, true);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testOnTopPermissiveSecurityManager() {
         doTestOnTopCommon(new MySecurityManager(true), true);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testOnTopRestrictiveSecurityManager() {
         doTestOnTopCommon(new MySecurityManager(false), false);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testFullScreenInitNoSecurityManager() {
         doTestFullScreenCommon(null, true, true);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testFullScreenInitPermissiveSecurityManager() {
         doTestFullScreenCommon(new MySecurityManager(true), true, true);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testFullScreenInitRestrictiveSecurityManager() {
         doTestFullScreenCommon(new MySecurityManager(false), true, false);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testFullScreenAfterNoSecurityManager() {
         doTestFullScreenCommon(null, false, true);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testFullScreenAfterPermissiveSecurityManager() {
         doTestFullScreenCommon(new MySecurityManager(true), false, true);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testFullScreenAfterRestrictiveSecurityManager() {
         doTestFullScreenCommon(new MySecurityManager(false), false, false);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testRobotNoSecurityManager() {
         doTestRobotCommon(null, true);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testRobotPermissiveSecurityManager() {
         doTestRobotCommon(new MySecurityManager(true), true);
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testRobotRestrictiveSecurityManager() {
         doTestRobotCommon(new MySecurityManager(false), false);
     }
--- a/tests/system/src/test/java/test/robot/helloworld/RectangleTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/helloworld/RectangleTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -43,7 +43,7 @@
 
     private static final double TOLERANCE = 0.07;
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testSceneDefaultFill() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
@@ -61,7 +61,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testSceneFillColor() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
@@ -80,7 +80,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testFillRect() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
@@ -112,7 +112,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testAddFillRect() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java	Thu Mar 01 12:01:23 2018 +0530
@@ -36,7 +36,7 @@
  */
 public class RT30650Test {
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void test() {
         assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8196606
         Assert.assertTrue(RT30650GUI.test());
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -59,7 +59,7 @@
     private volatile boolean popped;
 
     @Ignore("JDK-8153542")
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void test() throws Exception {
         runAndWait(() -> {
             swingNode = new SwingNode();
--- a/tests/system/src/test/java/test/robot/javafx/scene/JDK8183100Test.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/javafx/scene/JDK8183100Test.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -78,7 +78,7 @@
         }
     }
 
-    @Test(timeout=15000)
+    @Test(timeout = 15000)
     public void stackPaneColorTest() {
         final int WIDTH = 200;
         final int HEIGHT = 100;
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/LayoutTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/LayoutTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -72,7 +72,7 @@
     private Stage testStage;
     private Scene testScene;
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testRequestLayout() {
     final Label l1 = new Label("1 2");
     final Ellipse e1 = new Ellipse(20, 30);
@@ -152,7 +152,7 @@
 
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testStackPane() {
     final Label l1 = new Label("1 2");
     final Ellipse e1 = new Ellipse(20, 30);
@@ -223,7 +223,7 @@
 
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testVBox() {
     final Label l1 = new Label("1 2");
     final Ellipse e1 = new Ellipse(20, 30);
@@ -294,7 +294,7 @@
 
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testHBox() {
     final Label l1 = new Label("1 2");
     final Ellipse e1 = new Ellipse(20, 30);
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -43,13 +43,13 @@
      *                                                                        *
      *************************************************************************/
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill() {
         setStyle("-fx-background-color: red;");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void translucentFill() {
         setStyle("-fx-background-color: rgba(255, 0, 0, .2);");
         // multiply through the alpha
@@ -57,7 +57,7 @@
                 region.getBackground().getFills().get(0), Color.rgb(255, 204, 204), SCENE_FILL);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_Insets1() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -65,7 +65,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_Insets2() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -73,7 +73,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_Insets3() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -81,7 +81,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_Insets4() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -89,7 +89,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_NegativeInsets1() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -97,7 +97,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_NegativeInsets2() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -105,7 +105,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_NegativeInsets3() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -113,7 +113,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_NegativeInsets4() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -121,7 +121,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_MixedInsets() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -129,7 +129,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_Radius1() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -138,7 +138,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_Radius2() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -147,7 +147,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_Radius3() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -156,7 +156,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_Radius4() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -179,7 +179,7 @@
 //                "-fx-background-radius: 10 20 30 40 50 60 70 80");
 //    }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_RadiusAndInsets() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -190,7 +190,7 @@
     }
 
     // NOTE: A negative radius from CSS is treated as 0.
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_NegativeRadius1() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -199,7 +199,7 @@
     }
 
     // NOTE: A negative radius from CSS is treated as 0.
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_NegativeRadius2() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -208,7 +208,7 @@
     }
 
     // NOTE: A negative radius from CSS is treated as 0.
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_NegativeRadius3() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -217,7 +217,7 @@
     }
 
     // NOTE: A negative radius from CSS is treated as 0.
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void basicFill_NegativeRadius4() {
         setStyle(
                 "-fx-background-color: red;" +
@@ -235,13 +235,13 @@
     // I actually could predict the color under a point, rather than just asserting it isn't
     // the Scene's fill.
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void imageFill() {
         setStyle("-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void imageFill_MixedInsets() {
         setStyle(
                 "-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -249,7 +249,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void imageFill_Radius4() {
         setStyle(
                 "-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -257,7 +257,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void imageFill_MissingImage() {
         setStyle(
                 "-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/missing.png');" +
@@ -265,43 +265,43 @@
         assertColorEquals(SCENE_FILL, WIDTH / 2, HEIGHT / 2, TOLERANCE);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void imageFill_Stretched() {
         setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png');");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void imageFill_Stretched2() {
         setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png', 0, 0, 1, 1);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void imageFill_Stretched3() {
         setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png', 0, 0, 1, 1, true);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void imageFill_Tiled() {
         setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png', 0, 0, 40, 40, false);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void linearFill() {
         setStyle("-fx-background-color: linear-gradient(to bottom, red 0%, blue 100%);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void linearFill2() {
         setStyle("-fx-background-color: linear-gradient(to right, red 0%, blue 100%);");
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void linearFill_MixedInsets() {
         setStyle(
                 "-fx-background-color: linear-gradient(to bottom, red 0%, blue 100%);" +
@@ -309,7 +309,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void linearFill_Radius4() {
         setStyle(
                 "-fx-background-color: linear-gradient(to bottom, red 0%, blue 100%);" +
@@ -325,7 +325,7 @@
      *                                                                        *
      *************************************************************************/
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testScenario1() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -336,7 +336,7 @@
         checkRegionCornersAndBoundariesForFills();
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testScenario2() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -372,7 +372,7 @@
         checkRegionCornersAndBoundariesOfBackgroundFill(grey, Color.BLUE);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testScenario3() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -408,7 +408,7 @@
         checkRegionCornersAndBoundariesOfBackgroundFill(grey, Color.BLUE);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testScenario4() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -444,7 +444,7 @@
 //        checkRegionCornersAndBoundariesOfBackgroundFill(image, Color.BLUE);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testScenario5() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -480,7 +480,7 @@
 //        checkRegionCornersAndBoundariesOfBackgroundFill(blue, Color.BLUE, null);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testExample1() {
         setStyle(
                 "-fx-background-color: red, green, blue;" +
@@ -496,7 +496,7 @@
      *                                                                        *
      *************************************************************************/
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testOnePixelTopInset() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -525,7 +525,7 @@
         checkRegionBottomLeftCorner(yellow, Color.YELLOW, SCENE_FILL, 0, .2);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testOnePixelRightInset() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -554,7 +554,7 @@
         checkRegionBottomLeftCorner(yellow, Color.YELLOW, SCENE_FILL, 0, .2);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testOnePixelBottomInset() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -583,7 +583,7 @@
         checkRegionBottomLeftCorner(yellow, Color.YELLOW, SCENE_FILL, 0, .2);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testOnePixelLeftInset() {
         assumeTrue(checkIntegralUIScale());
         setStyle(
@@ -613,7 +613,7 @@
     }
 
     @Ignore("RT-33446")
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testHalfPixelTopInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -643,7 +643,7 @@
     }
 
     @Ignore("RT-33446")
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testHalfPixelRightInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -673,7 +673,7 @@
     }
 
     @Ignore("RT-33446")
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testHalfPixelBottomInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -703,7 +703,7 @@
     }
 
     @Ignore("RT-33446")
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testHalfPixelLeftInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -733,7 +733,7 @@
     }
 
     @Ignore("RT-33446")
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testHalfPixelTopLeftInset() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -766,7 +766,7 @@
         checkRegionBottomLeftCorner(yellow, blended, SCENE_FILL, 0, .2);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testNoInsets() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
@@ -778,7 +778,7 @@
         checkRegionCornersAndBoundariesOfBackgroundFill(yellow, SCENE_FILL);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void testYellowOnRed() {
         setStyle(
                 "-fx-background-color: red, yellow;" +
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -41,7 +41,7 @@
      *                                                                        *
      *************************************************************************/
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');");
@@ -49,7 +49,7 @@
         checkCompletelyFilled(20);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_RepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -58,7 +58,7 @@
         checkHorizontalStripAlongTop(20, LEFT);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_RepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -67,7 +67,7 @@
         checkVerticalStripAlongLeft(20, TOP);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_Space() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -76,7 +76,7 @@
         checkCompletelyFilled(20);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_Round() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -85,7 +85,7 @@
         checkCompletelyFilled(20);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_RoundSpace() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -94,7 +94,7 @@
         checkCompletelyFilled(20);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenter() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -104,7 +104,7 @@
         checkNonRepeating(20, WIDTH / 2, HEIGHT / 2, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterFiftyPercent() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -114,7 +114,7 @@
         checkNonRepeating(20, WIDTH / 2, HEIGHT / 2, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterLeft() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -127,7 +127,7 @@
         assertColorEquals(SCENE_FILL, centerX - 11, HEIGHT / 2, TOLERANCE);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -140,7 +140,7 @@
         assertColorEquals(SCENE_FILL, centerX + 10, HEIGHT / 2, TOLERANCE);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterTop() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -153,7 +153,7 @@
         assertColorEquals(SCENE_FILL, WIDTH / 2, centerY - 11, TOLERANCE);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterBottom() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -166,7 +166,7 @@
         assertColorEquals(SCENE_FILL, WIDTH / 2, centerY + 10, TOLERANCE);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionBottomRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -182,7 +182,7 @@
         assertColorEquals(SCENE_FILL, centerX, centerY + 10, TOLERANCE);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -192,7 +192,7 @@
         checkHorizontalStripAlongCenter(20, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterFiftyPercentRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -202,7 +202,7 @@
         checkHorizontalStripAlongCenter(20, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterLeftRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -212,7 +212,7 @@
         checkHorizontalStripAlongCenter(20, LEFT);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterRightRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -221,7 +221,7 @@
         checkHorizontalStripAlongCenter(20, LEFT);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterTopRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -231,7 +231,7 @@
         checkHorizontalStripAlongTop(20, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterBottomRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -241,7 +241,7 @@
         checkHorizontalStripAlongBottom(20, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionBottomRightRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -251,7 +251,7 @@
         checkHorizontalStripAlongBottom(20, LEFT);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -261,7 +261,7 @@
         checkVerticalStripAlongCenter(20, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterFiftyPercentRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -271,7 +271,7 @@
         checkVerticalStripAlongCenter(20, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterLeftRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -281,7 +281,7 @@
         checkVerticalStripAlongLeft(20, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterRightRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -291,7 +291,7 @@
         checkVerticalStripAlongRight(20, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterTopRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -301,7 +301,7 @@
         checkVerticalStripAlongCenter(20, TOP);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionCenterBottomRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -311,7 +311,7 @@
         checkVerticalStripAlongCenter(20, TOP);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_PositionBottomRightRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -321,7 +321,7 @@
         checkVerticalStripAlongRight(20, TOP);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_Position25PercentLeft() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -334,7 +334,7 @@
                 (REGION_TOP +  (int) (.5 * REGION_HEIGHT)), true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_Position25PercentRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -350,7 +350,7 @@
     // TODO should do from the top & bottom
 
     // TODO should test that cover causes other properties to be ignored
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_Cover() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -361,7 +361,7 @@
     }
 
     // TODO should test that contain causes other properties to be ignored
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_Contain() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -372,7 +372,7 @@
         checkNonRepeating(200, REGION_LEFT + 300, REGION_TOP + 100, false);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void alignedImage_ContainNoRepeat() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" +
@@ -382,14 +382,14 @@
         checkNonRepeating(200, REGION_LEFT + 100, REGION_TOP + 100, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');");
         checkCompletelyFilled(48);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_RepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -398,7 +398,7 @@
         checkHorizontalStripAlongTop(48, LEFT);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_RepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -408,7 +408,7 @@
     }
 
     @Ignore("RT-33411: Doesn't work at present because of Prism bug where the gaps between rows are inconsistent")
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_Space() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -417,7 +417,7 @@
         checkEvenlyFilled(48);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_Round() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -427,7 +427,7 @@
     }
 
     @Ignore("RT-33411: Doesn't work at present because of Prism bug where the gaps between rows are inconsistent")
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_RoundSpace() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -437,7 +437,7 @@
         // even in one dimension and spaced in the other
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenter() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -446,7 +446,7 @@
         checkNonRepeating(48, WIDTH / 2, HEIGHT / 2, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterFiftyPercent() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -455,7 +455,7 @@
         checkNonRepeating(48, WIDTH / 2, HEIGHT / 2, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterLeft() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -464,7 +464,7 @@
         checkNonRepeating(48, REGION_LEFT + 24, HEIGHT / 2, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -473,7 +473,7 @@
         checkNonRepeating(48, REGION_RIGHT - 24, HEIGHT / 2, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterTop() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -482,7 +482,7 @@
         checkNonRepeating(48, WIDTH / 2, REGION_TOP + 24, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterBottom() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -491,7 +491,7 @@
         checkNonRepeating(48, WIDTH / 2, REGION_BOTTOM - 24, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionBottomRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -500,7 +500,7 @@
         checkNonRepeating(48, REGION_RIGHT - 24, REGION_BOTTOM - 24, true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -510,7 +510,7 @@
         checkHorizontalStripAlongCenter(48, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterFiftyPercentRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -520,7 +520,7 @@
         checkHorizontalStripAlongCenter(48, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterLeftRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -530,7 +530,7 @@
         checkHorizontalStripAlongCenter(48, LEFT);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterRightRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -540,7 +540,7 @@
         checkHorizontalStripAlongCenter(48, RIGHT);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterTopRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -550,7 +550,7 @@
         checkHorizontalStripAlongTop(48, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterBottomRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -560,7 +560,7 @@
         checkHorizontalStripAlongBottom(48, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionBottomRightRepeatX() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -570,7 +570,7 @@
         checkHorizontalStripAlongBottom(48, RIGHT);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -580,7 +580,7 @@
         checkVerticalStripAlongCenter(48, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterFiftyPercentRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -590,7 +590,7 @@
         checkVerticalStripAlongCenter(48, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterLeftRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -600,7 +600,7 @@
         checkVerticalStripAlongLeft(48, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterRightRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -610,7 +610,7 @@
         checkVerticalStripAlongRight(48, CENTER);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterTopRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -620,7 +620,7 @@
         checkVerticalStripAlongCenter(48, TOP);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionCenterBottomRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -630,7 +630,7 @@
         checkVerticalStripAlongCenter(48, BOTTOM);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_PositionBottomRightRepeatY() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -640,7 +640,7 @@
         checkVerticalStripAlongRight(48, BOTTOM);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_Position25PercentLeft() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -653,7 +653,7 @@
                 (REGION_TOP +  (int) (.5 * REGION_HEIGHT)), true);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_Position25PercentRight() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -670,7 +670,7 @@
 
     // TODO should test that cover causes other properties to be ignored
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_Cover() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -681,7 +681,7 @@
     }
 
     // TODO should test that contain causes other properties to be ignored
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_Contain() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
@@ -692,7 +692,7 @@
         checkNonRepeating(200, REGION_LEFT + 300, REGION_TOP + 100, false);
     }
 
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void unalignedImage_ContainNoRepeat() {
         setStyle("-fx-background-color: black;" +
                 "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" +
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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,7 @@
     @Test public void dummy() {
 
     }
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void test() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
@@ -43,7 +43,7 @@
 //        System.out.println("WHAT");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void test2() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
@@ -54,7 +54,7 @@
 //        System.out.println("WHAT");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void test3() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/border-uneven.png');" +
@@ -65,7 +65,7 @@
 //        System.out.println("WHAT");
 //    }
 //
-    @Test(timeout=20000)
+    @Test(timeout = 20000)
     public void test4() {
         setStyle(
                 "-fx-border-image-source: url('test/robot/javafx/scene/layout/border-stretch.png');" +
@@ -76,7 +76,7 @@
         System.out.println("WHAT");
     }
 
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void differentSliceAndWidths() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
@@ -86,7 +86,7 @@
 //                "-fx-border-image-width: 10 15 20 25;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void repeatX() {
 //        setStyle("-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
 //                        "-fx-border-image-repeat: repeat-x;" +
@@ -94,7 +94,7 @@
 //                        "-fx-border-image-width: 28;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void repeatY() {
 //        setStyle("-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
 //                        "-fx-border-image-repeat: repeat-y;" +
@@ -102,7 +102,7 @@
 //                        "-fx-border-image-width: 28;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void testWider() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
@@ -111,7 +111,7 @@
 //                "-fx-border-image-repeat: round;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void testWider2() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
@@ -120,7 +120,7 @@
 //                "-fx-border-image-repeat: repeat;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void testWider3() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
@@ -129,7 +129,7 @@
 //                "-fx-border-image-repeat: space;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void testWider4() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
@@ -138,7 +138,7 @@
 //                "-fx-border-image-repeat: stretch;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void repeatXWider() {
 //        setStyle("-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
 //                        "-fx-border-image-repeat: repeat-x;" +
@@ -146,7 +146,7 @@
 //                        "-fx-border-image-width: 40;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void repeatYWider() {
 //        setStyle("-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" +
 //                        "-fx-border-image-repeat: repeat-y;" +
@@ -154,7 +154,7 @@
 //                        "-fx-border-image-width: 40;");
 //    }
 
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void withInsets() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/popover-no-arrow-empty.png');" +
@@ -162,7 +162,7 @@
 //                "-fx-border-image-width: 78 50 60 50;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void withInsets2() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/popover-no-arrow-empty.png');" +
@@ -171,7 +171,7 @@
 //                "-fx-border-image-insets: -27 -37 -47 -37;");
 //    }
 //
-//    @Test(timeout=20000)
+//    @Test(timeout = 20000)
 //    public void button() {
 //        setStyle(
 //                "-fx-border-image-source: url('test/robot/javafx/scene/layout/BlackButton.png');" +
--- a/tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, 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
@@ -112,12 +112,12 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testSeparateImagePaint() {
         doTestImagePaint(true);
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testSameImagePaint() {
         doTestImagePaint(false);
     }
--- a/tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, 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
@@ -50,7 +50,7 @@
 
     private static final double TOLERANCE = 0.07;
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testEmptyShapes() {
         final int WIDTH = 800;
         final int HEIGHT = 400;
--- a/tests/system/src/test/java/test/robot/scenegraph/ViewOrderTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/scenegraph/ViewOrderTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -45,7 +45,7 @@
 
     private static final double TOLERANCE = 0.07;
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testViewOrder() {
         final int WIDTH = 300;
         final int HEIGHT = 300;
@@ -103,7 +103,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testViewOrderHBox() {
         final int WIDTH = 500;
         final int HEIGHT = 200;
--- a/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -60,7 +60,7 @@
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testAABalanceFlip() {
         final int WIDTH = 600;
         final int HEIGHT = 600;
--- a/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -302,7 +302,7 @@
     // Tests
     // -------------------------------------------------------------
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testSnapshot3D() {
 
         runAndWait(() -> {
--- a/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -55,7 +55,7 @@
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testNearAndFarClips() {
         final int WIDTH = 500;
         final int HEIGHT = 500;
--- a/tests/system/src/test/java/test/robot/test3d/RT35019Test.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/test3d/RT35019Test.java	Thu Mar 01 12:01:23 2018 +0530
@@ -57,7 +57,7 @@
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testEmptyShapes() {
         final int WIDTH = 400;
         final int HEIGHT = 300;
--- a/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -159,7 +159,7 @@
     // Tests
     // -------------------------------------------------------------
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testSnapshot3D() {
 
         runAndWait(() -> {
--- a/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -63,7 +63,7 @@
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testInvalidNormalsLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -88,7 +88,7 @@
         });
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testNormalsLengthChange() {
         runAndWait(() -> {
             testStage = getStage();
@@ -121,7 +121,7 @@
         });
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testDegeneratedMeshUpdateNormals() {
         runAndWait(() -> {
             testStage = getStage();
@@ -156,7 +156,7 @@
         });
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testDegeneratedMeshUpdatePoints() {
         runAndWait(() -> {
             testStage = getStage();
--- a/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -64,7 +64,7 @@
         assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testEmptyMesh() {
         runAndWait(() -> {
             testStage = getStage();
@@ -87,7 +87,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testInvalidPointsLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -119,7 +119,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testInvalidTexCoordLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -147,7 +147,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testInvalidFacesLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -183,7 +183,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testInvalidFacesIndex() {
         runAndWait(() -> {
             testStage = getStage();
@@ -218,7 +218,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testInvalidFaceSmoothingGroupsLength() {
         runAndWait(() -> {
             testStage = getStage();
@@ -243,7 +243,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testPointsLengthChange() {
         runAndWait(() -> {
             testStage = getStage();
@@ -276,7 +276,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testTexCoordsLengthChange() {
         runAndWait(() -> {
             testStage = getStage();
@@ -309,7 +309,7 @@
         });
     }
 
-    @Test(timeout=10000)
+    @Test(timeout = 15000)
     public void testFaceLengthChange() {
         runAndWait(() -> {
             testStage = getStage();
@@ -353,7 +353,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testResetFaceSmoothingGroup() {
         runAndWait(() -> {
             testStage = getStage();
@@ -384,7 +384,7 @@
         });
     }
 
-    @Test(timeout=5000)
+    @Test(timeout = 15000)
     public void testUpdateMesh() {
         runAndWait(() -> {
             testStage = getStage();
@@ -431,7 +431,7 @@
         });
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testDegeneratedMeshUpdateFaces() {
         runAndWait(() -> {
             testStage = getStage();
@@ -471,7 +471,7 @@
         });
     }
 
-    @Test(timeout = 5000)
+    @Test(timeout = 15000)
     public void testDegeneratedMeshUpdatePoints() {
         runAndWait(() -> {
             testStage = getStage();
--- a/tests/system/src/test/java/test/sandbox/SandboxAppTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/sandbox/SandboxAppTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -99,22 +99,22 @@
 
     // TEST CASES
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testFXApp() throws Exception {
         runSandboxedApp("FXApp");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testFXNonApp() throws Exception {
         runSandboxedApp("FXNonApp");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testJFXPanelApp() throws Exception {
         runSandboxedApp("JFXPanelApp");
     }
 
-    @Test (timeout=15000)
+    @Test (timeout = 15000)
     public void testJFXPanelImplicitExitApp() throws Exception {
         runSandboxedApp("JFXPanelImplicitExitApp", 0);
     }
--- a/tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -44,7 +44,7 @@
 
     private final String testAppName = pkgName + "." + "ShutdownHookApp";
 
-    @Test (timeout=5000)
+    @Test (timeout = 15000)
     public void testShutdownHook() throws Exception {
         // Initilaize the socket
         final ServerSocket service = new ServerSocket(0);
--- a/tests/system/src/test/java/test/util/Util.java	Thu Mar 01 00:21:43 2018 +0530
+++ b/tests/system/src/test/java/test/util/Util.java	Thu Mar 01 12:01:23 2018 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -47,7 +47,7 @@
 public class Util {
 
     // Test timeout value in milliseconds
-    public static final int TIMEOUT = 5000;
+    public static final int TIMEOUT = 10000;
 
     private static interface Future {
         public abstract boolean await(long timeout, TimeUnit unit);