--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ButtonSkinTest.java 2015-09-03 15:26:49.101029900 -0700 +++ /dev/null 2015-09-03 15:26:50.000000000 -0700 @@ -1,157 +0,0 @@ -/* - * Copyright (c) 2011, 2013, 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 com.sun.javafx.scene.control.skin; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import javafx.geometry.Insets; -import javafx.scene.control.Button; - -import javafx.scene.Group; -import javafx.scene.Scene; -import javafx.stage.Stage; -import javafx.scene.input.Mnemonic; -import javafx.collections.ObservableList; -import javafx.scene.input.KeyCombination; - -import com.sun.javafx.scene.control.behavior.TextBinding.MnemonicKeyCombination; - -import org.junit.Before; -import org.junit.Test; - -/** - */ -public class ButtonSkinTest { - private Button button; - private ButtonSkinMock skin; - - @Before public void setup() { - button = new Button("Test"); - skin = new ButtonSkinMock(button); - // Set some padding so that any places where padding was being - // computed but wasn't expected will be caught. - button.setPadding(new Insets(10, 10, 10, 10)); - button.setSkin(skin); - - } - - @Test public void maxWidthTracksPreferred() { - button.setPrefWidth(500); - assertEquals(500, button.maxWidth(-1), 0); - } - - @Test public void maxHeightTracksPreferred() { - button.setPrefHeight(500); - assertEquals(500, button.maxHeight(-1), 0); - } - - @Test - public void testMnemonicAutoParseAddition() { - if(!com.sun.javafx.PlatformUtil.isMac()) { - boolean nodeFound = false; - Stage stage = new Stage(); - Scene scene = new Scene(new Group(), 500, 500); - stage.setScene(scene); - - button.setMnemonicParsing(true); - button.setText("_Mnemonic"); - - ((Group)scene.getRoot()).getChildren().add(button); - - stage.show(); - - KeyCombination mnemonicKeyCombo = new MnemonicKeyCombination("M"); - - ObservableList mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo); - if (mnemonicsList != null) { - for (int i = 0 ; i < mnemonicsList.size() ; i++) { - if (mnemonicsList.get(i).getNode() == button) { - nodeFound = true; - } - } - } - assertTrue(nodeFound); - } - } - - - @Test - public void testMnemonicAutoParseAdditionRemovalOnParentChange() { - if(!com.sun.javafx.PlatformUtil.isMac()) { - boolean nodeFound = false; - Stage stage = new Stage(); - Scene scene = new Scene(new Group(), 500, 500); - stage.setScene(scene); - - button.setMnemonicParsing(true); - button.setText("_AnotherMnemonic"); - - ((Group)scene.getRoot()).getChildren().add(button); - - stage.show(); - - KeyCombination mnemonicKeyCombo = new MnemonicKeyCombination("A"); - - ObservableList mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo); - if (mnemonicsList != null) { - for (int i = 0 ; i < mnemonicsList.size() ; i++) { - if (mnemonicsList.get(i).getNode() == button) { - nodeFound = true; - } - } - } - assertTrue(nodeFound); - - nodeFound = false; - - ((Group)scene.getRoot()).getChildren().remove(button); - - mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo); - if (mnemonicsList != null) { - for (int i = 0 ; i < mnemonicsList.size() ; i++) { - if (mnemonicsList.get(i).getNode() == button) { - nodeFound = true; - } - } - } - assertTrue(!nodeFound); - } - } - - public static final class ButtonSkinMock extends ButtonSkin { - boolean propertyChanged = false; - int propertyChangeCount = 0; - public ButtonSkinMock(Button button) { - super(button); - } - - @Override protected void handleControlPropertyChanged(String p) { - super.handleControlPropertyChanged(p); - propertyChanged = true; - propertyChangeCount++; - } - } -} --- /dev/null 2015-09-03 15:26:50.000000000 -0700 +++ new/modules/controls/src/test/java/javafx/scene/control/skin/ButtonSkinTest.java 2015-09-03 15:26:48.266982200 -0700 @@ -0,0 +1,161 @@ +/* + * Copyright (c) 2011, 2013, 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 javafx.scene.control.skin; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import javafx.beans.value.ObservableValue; +import javafx.geometry.Insets; +import javafx.scene.control.Button; + +import javafx.scene.Group; +import javafx.scene.Scene; +import javafx.scene.control.skin.ButtonSkin; +import javafx.stage.Stage; +import javafx.scene.input.Mnemonic; +import javafx.collections.ObservableList; +import javafx.scene.input.KeyCombination; + +import com.sun.javafx.scene.control.behavior.TextBinding.MnemonicKeyCombination; + +import org.junit.Before; +import org.junit.Test; + +/** + */ +public class ButtonSkinTest { + private Button button; + private ButtonSkinMock skin; + + @Before public void setup() { + button = new Button("Test"); + skin = new ButtonSkinMock(button); + // Set some padding so that any places where padding was being + // computed but wasn't expected will be caught. + button.setPadding(new Insets(10, 10, 10, 10)); + button.setSkin(skin); + + } + + @Test public void maxWidthTracksPreferred() { + button.setPrefWidth(500); + assertEquals(500, button.maxWidth(-1), 0); + } + + @Test public void maxHeightTracksPreferred() { + button.setPrefHeight(500); + assertEquals(500, button.maxHeight(-1), 0); + } + + @Test + public void testMnemonicAutoParseAddition() { + if(!com.sun.javafx.PlatformUtil.isMac()) { + boolean nodeFound = false; + Stage stage = new Stage(); + Scene scene = new Scene(new Group(), 500, 500); + stage.setScene(scene); + + button.setMnemonicParsing(true); + button.setText("_Mnemonic"); + + ((Group)scene.getRoot()).getChildren().add(button); + + stage.show(); + + KeyCombination mnemonicKeyCombo = new MnemonicKeyCombination("M"); + + ObservableList mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo); + if (mnemonicsList != null) { + for (int i = 0 ; i < mnemonicsList.size() ; i++) { + if (mnemonicsList.get(i).getNode() == button) { + nodeFound = true; + } + } + } + assertTrue(nodeFound); + } + } + + + @Test + public void testMnemonicAutoParseAdditionRemovalOnParentChange() { + if(!com.sun.javafx.PlatformUtil.isMac()) { + boolean nodeFound = false; + Stage stage = new Stage(); + Scene scene = new Scene(new Group(), 500, 500); + stage.setScene(scene); + + button.setMnemonicParsing(true); + button.setText("_AnotherMnemonic"); + + ((Group)scene.getRoot()).getChildren().add(button); + + stage.show(); + + KeyCombination mnemonicKeyCombo = new MnemonicKeyCombination("A"); + + ObservableList mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo); + if (mnemonicsList != null) { + for (int i = 0 ; i < mnemonicsList.size() ; i++) { + if (mnemonicsList.get(i).getNode() == button) { + nodeFound = true; + } + } + } + assertTrue(nodeFound); + + nodeFound = false; + + ((Group)scene.getRoot()).getChildren().remove(button); + + mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo); + if (mnemonicsList != null) { + for (int i = 0 ; i < mnemonicsList.size() ; i++) { + if (mnemonicsList.get(i).getNode() == button) { + nodeFound = true; + } + } + } + assertTrue(!nodeFound); + } + } + + public static final class ButtonSkinMock extends ButtonSkin { + boolean propertyChanged = false; + int propertyChangeCount = 0; + public ButtonSkinMock(Button button) { + super(button); + } + + public void addWatchedProperty(ObservableValue p) { + p.addListener(o -> { + propertyChanged = true; + propertyChangeCount++; + }); + } + } +}