modules/controls/src/test/java/javafx/scene/control/skin/MenuBarSkinTest.java

rev 9240 : 8076423: JEP 253: Prepare JavaFX UI Controls & CSS APIs for Modularization

*** 21,50 ****
   * 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 com.sun.javafx.menu.MenuBase;
  import com.sun.javafx.pgstub.StubToolkit;
  import com.sun.javafx.tk.Toolkit;
  import javafx.geometry.Insets;
  import javafx.scene.Group;
  import javafx.scene.Scene;
  import javafx.scene.control.Menu;
  import javafx.scene.control.MenuBar;
  import javafx.stage.Stage;
  
  import java.util.List;
  
  import org.junit.Before;
  import org.junit.BeforeClass;
  import org.junit.Test;
- import static org.junit.Assert.*;
  
  /**
   * This fails with IllegalStateException because of the toolkit's check for the FX application thread
   */
  public class MenuBarSkinTest {
--- 21,51 ----
   * 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 com.sun.javafx.menu.MenuBase;
  import com.sun.javafx.pgstub.StubToolkit;
  import com.sun.javafx.tk.Toolkit;
+ import javafx.beans.value.ObservableValue;
  import javafx.geometry.Insets;
  import javafx.scene.Group;
  import javafx.scene.Scene;
  import javafx.scene.control.Menu;
  import javafx.scene.control.MenuBar;
+ import javafx.scene.control.skin.MenuBarSkin;
  import javafx.stage.Stage;
  
  import java.util.List;
  
  import org.junit.Before;
  import org.junit.BeforeClass;
  import org.junit.Test;
  
  /**
   * This fails with IllegalStateException because of the toolkit's check for the FX application thread
   */
  public class MenuBarSkinTest {
*** 166,179 ****
          int propertyChangeCount = 0;
          public MenuBarSkinMock(MenuBar menubar) {
              super(menubar);
          }
          
!         @Override protected void handleControlPropertyChanged(String p) {
!             super.handleControlPropertyChanged(p);
              propertyChanged = true;
              propertyChangeCount++;
          }
      }
  
      private List<MenuBase> getSystemMenus() {
          return ((StubToolkit.StubSystemMenu)tk.getSystemMenu()).getMenus();
--- 167,181 ----
          int propertyChangeCount = 0;
          public MenuBarSkinMock(MenuBar menubar) {
              super(menubar);
          }
  
!         public void addWatchedProperty(ObservableValue<?> p) {
!             p.addListener(o -> {
                  propertyChanged = true;
                  propertyChangeCount++;
+             });
          }
      }
  
      private List<MenuBase> getSystemMenus() {
          return ((StubToolkit.StubSystemMenu)tk.getSystemMenu()).getMenus();