--- /dev/null 2018-10-10 12:18:08.824000000 +0530 +++ new/tests/system/src/test/java/test/javafx/scene/RestoreSceneSizeTest.java 2018-10-10 16:43:40.134662979 +0530 @@ -0,0 +1,126 @@ +/* + * Copyright (c) 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package test.javafx.scene; + +import javafx.application.Application; +import javafx.application.Platform; +import javafx.beans.value.ChangeListener; +import javafx.scene.Scene; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; +import javafx.stage.WindowEvent; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import static org.junit.Assert.fail; + +public class RestoreSceneSizeTest { + static CountDownLatch startupLatch; + static Stage stage; + static double w; + static double h; + + public static void main(String[] args) throws Exception { + initFX(); + try { + RestoreSceneSizeTest test = new RestoreSceneSizeTest(); + test.testUnfullscreenSize(); + } catch (Throwable e) { + e.printStackTrace(); + } finally { + teardown(); + } + } + + public static class TestApp extends Application { + + @Override + public void start(Stage primaryStage) throws Exception { + primaryStage.setScene(new Scene(new VBox(), 234, 255)); + stage = primaryStage; + w = stage.getScene().getWidth(); + h = stage.getScene().getHeight(); + stage.setFullScreen(true); + stage.addEventHandler(WindowEvent.WINDOW_SHOWN, e -> + Platform.runLater(startupLatch::countDown)); + stage.show(); + } + } + + @BeforeClass + public static void initFX() { + startupLatch = new CountDownLatch(1); + new Thread(() -> Application.launch(TestApp.class, (String[])null)).start(); + try { + if (!startupLatch.await(15, TimeUnit.SECONDS)) { + fail("Timeout waiting for FX runtime to start"); + } + } catch (InterruptedException ex) { + fail("Unexpected exception: " + ex); + } + } + + @Test + public void testUnfullscreenSize() throws Exception { + Thread.sleep(200); + Assert.assertTrue(stage.isShowing()); + Assert.assertTrue(stage.isFullScreen()); + + CountDownLatch latch = new CountDownLatch(2); + ChangeListener listenerW = (observable, oldValue, newValue) -> { + if (Math.abs((Double) newValue - w) < 0.1) { + latch.countDown(); + }; + }; + ChangeListener listenerH = (observable, oldValue, newValue) -> { + if (Math.abs((Double) newValue - h) < 0.1) { + latch.countDown(); + }; + }; + stage.getScene().widthProperty().addListener(listenerW); + stage.getScene().heightProperty().addListener(listenerH); + Platform.runLater(() -> stage.setFullScreen(false)); + latch.await(5, TimeUnit.SECONDS); + Thread.sleep(200); + Assert.assertFalse(stage.isFullScreen()); + stage.getScene().widthProperty().removeListener(listenerW); + stage.getScene().heightProperty().removeListener(listenerH); + + Assert.assertEquals("Scene got wrong width", w, stage.getScene().getWidth(), 0.1); + Assert.assertEquals("Scene got wrong height", h, stage.getScene().getHeight(), 0.1); + } + + @AfterClass + public static void teardown() { + Platform.runLater(stage::hide); + Platform.exit(); + } +} +