changeset 10838:aa60e507985e

Merge
author kcr
date Thu, 15 Feb 2018 07:39:11 -0800
parents 45bc48e0e2e9 b86ce9469653
children f8b0d53d9542
files
diffstat 10 files changed, 43 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Wed Feb 14 11:54:19 2018 -0800
+++ b/build.gradle	Thu Feb 15 07:39:11 2018 -0800
@@ -3894,6 +3894,10 @@
             // Disable all robot-based visual tests
             exclude("test/robot/**");
         }
+        if (!IS_UNSTABLE_TEST) {
+            // JDK-8196607 Don't run monocle test cases 
+            exclude("test/robot/com/sun/glass/ui/monocle/**");
+        }
         if (!IS_AWT_TEST) {
             // Disable all AWT-based tests
             exclude("**/javafx/embed/swing/*.*");
--- a/modules/javafx.web/src/main/java/javafx/scene/web/HTMLEditorSkin.java	Wed Feb 14 11:54:19 2018 -0800
+++ b/modules/javafx.web/src/main/java/javafx/scene/web/HTMLEditorSkin.java	Thu Feb 15 07:39:11 2018 -0800
@@ -927,7 +927,8 @@
             }
         }
 
-        if (alignmentToggleGroup.getSelectedToggle() == null) {
+        if (alignmentToggleGroup.getSelectedToggle() == null
+                && webPage.getClientSelectedText().isEmpty()) {
             alignmentToggleGroup.selectToggle(alignLeftButton);
         }
 
--- a/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeMemoryLeakTest.java	Wed Feb 14 11:54:19 2018 -0800
+++ b/tests/system/src/test/java/test/javafx/embed/swing/SwingNodeMemoryLeakTest.java	Thu Feb 15 07:39:11 2018 -0800
@@ -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
@@ -25,6 +25,7 @@
 
 package test.javafx.embed.swing;
 
+import com.sun.javafx.PlatformUtil;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.embed.swing.SwingNode;
@@ -46,6 +47,7 @@
 import org.junit.BeforeClass;
 import org.junit.AfterClass;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeTrue;
 
 public class SwingNodeMemoryLeakTest {
 
@@ -82,6 +84,9 @@
 
     @Test
     public void testSwingNodeMemoryLeak() {
+        if (PlatformUtil.isMac()) {
+            assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8196614
+        }
         Util.runAndWait(() -> {
             testSwingNodeObjectsInStage();
         });
--- a/tests/system/src/test/java/test/javafx/scene/NewSceneSizeTest.java	Wed Feb 14 11:54:19 2018 -0800
+++ b/tests/system/src/test/java/test/javafx/scene/NewSceneSizeTest.java	Thu Feb 15 07:39:11 2018 -0800
@@ -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
@@ -41,6 +41,7 @@
 import org.junit.Test;
 
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 public class NewSceneSizeTest {
     static CountDownLatch startupLatch;
@@ -85,6 +86,7 @@
 
     @Test
     public void testNewSceneSize() throws Exception {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8193185
         Thread.sleep(200);
         final int nTries = 100;
         Stage childStage[] = new Stage[nTries];
--- a/tests/system/src/test/java/test/javafx/scene/RestoreSceneSizeTest.java	Wed Feb 14 11:54:19 2018 -0800
+++ b/tests/system/src/test/java/test/javafx/scene/RestoreSceneSizeTest.java	Thu Feb 15 07:39:11 2018 -0800
@@ -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
@@ -91,6 +91,7 @@
 
     @Test
     public void testUnfullscreenSize() throws Exception {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8193185
         // Disable on Mac until JDK-8176813 is fixed
         assumeTrue(!PlatformUtil.isMac());
 
--- a/tests/system/src/test/java/test/javafx/stage/ChildStageLocationTest.java	Wed Feb 14 11:54:19 2018 -0800
+++ b/tests/system/src/test/java/test/javafx/stage/ChildStageLocationTest.java	Thu Feb 15 07:39:11 2018 -0800
@@ -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
@@ -46,6 +46,7 @@
 
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 public class ChildStageLocationTest {
     static CountDownLatch startupLatch;
@@ -75,6 +76,7 @@
 
     @Test
     public void testLocation() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8176776
         Rectangle2D bounds = Screen.getPrimary().getVisualBounds();
         Window window = stage.getScene().getWindow();
         double minX = bounds.getMinX() + (bounds.getWidth() - window.getWidth())/2 - 50;
--- a/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java	Wed Feb 14 11:54:19 2018 -0800
+++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java	Thu Feb 15 07:39:11 2018 -0800
@@ -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
@@ -29,6 +29,8 @@
 import junit.framework.Assert;
 import org.junit.Test;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  * RT-30650: SwingNode is not Resizable
  */
@@ -36,6 +38,7 @@
 
     @Test(timeout=10000)
     public void test() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8196606
         Assert.assertTrue(RT30650GUI.test());
 
         System.out.println("Passed.");
--- a/tests/system/src/test/java/test/robot/javafx/scene/AfterModalClosedTest.java	Wed Feb 14 11:54:19 2018 -0800
+++ b/tests/system/src/test/java/test/robot/javafx/scene/AfterModalClosedTest.java	Thu Feb 15 07:39:11 2018 -0800
@@ -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
@@ -42,6 +42,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 public class AfterModalClosedTest {
     static CountDownLatch startupLatch;
@@ -90,6 +91,7 @@
 
     @Test
     public void testResizability() throws Exception {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8176776
         Assert.assertTrue(stage.isResizable());
         CountDownLatch resizeLatch = new CountDownLatch(2);
         Platform.runLater(() -> {
--- a/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java	Wed Feb 14 11:54:19 2018 -0800
+++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java	Thu Feb 15 07:39:11 2018 -0800
@@ -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
@@ -29,6 +29,8 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  */
 public class RegionBackgroundFillUITest extends RegionUITestBase {
@@ -133,6 +135,7 @@
 
     @Test(timeout=20000)
     public void basicFill_Radius1() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8170026
         setStyle(
                 "-fx-background-color: red;" +
                 "-fx-background-radius: 10");
@@ -179,6 +182,7 @@
 
     @Test(timeout=20000)
     public void basicFill_RadiusAndInsets() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8170026
         setStyle(
                 "-fx-background-color: red;" +
                 "-fx-background-radius: 10 20 30 40;" +
@@ -369,6 +373,7 @@
 
     @Test(timeout=20000)
     public void testScenario3() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8170026
         setStyle(
                 "-fx-background-color: red, green, blue, grey;" +
                 "-fx-background-insets: 0 0 -10 0, 0, 10, 20;" +
@@ -404,6 +409,7 @@
 
     @Test(timeout=20000)
     public void testScenario4() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8170026
         setStyle(
                 "-fx-background-color: red, green, blue, repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" +
                 "-fx-background-insets: 0 0 -10 0, 0, 10, 20;" +
@@ -490,6 +496,7 @@
 
     @Test(timeout=20000)
     public void testOnePixelTopInset() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8170026
         setStyle(
                 "-fx-background-color: red, yellow;" +
                 "-fx-background-insets: 0, 1 0 0 0;");
@@ -518,6 +525,7 @@
 
     @Test(timeout=20000)
     public void testOnePixelRightInset() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8170026
         setStyle(
                 "-fx-background-color: red, yellow;" +
                 "-fx-background-insets: 0, 0 1 0 0;");
@@ -546,6 +554,7 @@
 
     @Test(timeout=20000)
     public void testOnePixelBottomInset() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8170026
         setStyle(
                 "-fx-background-color: red, yellow;" +
                 "-fx-background-insets: 0, 0 0 1 0;");
@@ -574,6 +583,7 @@
 
     @Test(timeout=20000)
     public void testOnePixelLeftInset() {
+        assumeTrue(Boolean.getBoolean("unstable.test")); // JDK-8170026
         setStyle(
                 "-fx-background-color: red, yellow;" +
                 "-fx-background-insets: 0, 0 0 0 1;");
--- a/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java	Wed Feb 14 11:54:19 2018 -0800
+++ b/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java	Thu Feb 15 07:39:11 2018 -0800
@@ -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
@@ -54,8 +54,8 @@
 
     @Test(timeout = 5000)
     public void testAABalanceFlip() {
-        final int WIDTH = 800;
-        final int HEIGHT = 800;
+        final int WIDTH = 600;
+        final int HEIGHT = 600;
         selfIllumMap = new WritableImage(64, 64);
         PixelWriter pWriter = selfIllumMap.getPixelWriter();
         setArgb(pWriter, 0, 32, 0, 32, 0Xff000000);
@@ -199,8 +199,8 @@
         meshView.setCullFace(CullFace.BACK);
 
         final Group grp = new Group(meshView);
-        grp.setTranslateX(400);
-        grp.setTranslateY(400);
+        grp.setTranslateX(width/2);
+        grp.setTranslateY(height/2);
         grp.setTranslateZ(10);
 
         root = new Group(grp, new AmbientLight(Color.BLACK));