Skip to content
Permalink
Browse files

8245601: TESTBUG] Disable TabPaneDragPolicyTest on Mac until JDK-8213…

…136 is fixed and fix ISE

Reviewed-by: kcr
  • Loading branch information
Ambarish Rapte
Ambarish Rapte committed May 26, 2020
1 parent f3190db commit 2d98fe6cae71673cf1de89b39846a13d9505c4c4
Showing with 13 additions and 2 deletions.
  1. +13 −2 tests/system/src/test/java/test/robot/javafx/scene/TabPaneDragPolicyTest.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2020, 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
@@ -24,6 +24,8 @@
*/
package test.robot.javafx.scene;

import com.sun.javafx.PlatformUtil;

import javafx.application.Application;
import javafx.application.Platform;
import javafx.collections.ListChangeListener;
@@ -47,6 +49,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;

import test.util.Util;

@@ -138,6 +141,8 @@ public static void main(String[] args) {

@Test
public void testReorderTop() {
// Disable on Mac until JDK-8213136 is fixed
assumeTrue(!PlatformUtil.isMac());
expectedTab = tabs[1];
setDragPolicyAndSide(TabPane.TabDragPolicy.REORDER, Side.TOP);
tabPane.getTabs().addListener(reorderListener);
@@ -151,6 +156,8 @@ public void testReorderTop() {

@Test
public void testReorderBottom() {
// Disable on Mac until JDK-8213136 is fixed
assumeTrue(!PlatformUtil.isMac());
expectedTab = tabs[1];
setDragPolicyAndSide(TabPane.TabDragPolicy.REORDER, Side.BOTTOM);
tabPane.getTabs().addListener(reorderListener);
@@ -164,6 +171,8 @@ public void testReorderBottom() {

@Test
public void testReorderLeft() {
// Disable on Mac until JDK-8213136 is fixed
assumeTrue(!PlatformUtil.isMac());
expectedTab = tabs[1];
setDragPolicyAndSide(TabPane.TabDragPolicy.REORDER, Side.LEFT);
tabPane.getTabs().addListener(reorderListener);
@@ -177,6 +186,8 @@ public void testReorderLeft() {

@Test
public void testReorderRight() {
// Disable on Mac until JDK-8213136 is fixed
assumeTrue(!PlatformUtil.isMac());
expectedTab = tabs[1];
setDragPolicyAndSide(TabPane.TabDragPolicy.REORDER, Side.RIGHT);
tabPane.getTabs().addListener(reorderListener);
@@ -290,7 +301,7 @@ public void testReorder(int dX, int dY, int xIncr, int yIncr, boolean isFixed) {
waitForLatch(releaseLatch, 5, "Timeout waiting for robot.mouseRelease(Robot.MOUSE_LEFT_BTN).");

if (isFixed) {
tabPane.getSelectionModel().select(tabs[2]);
Util.runAndWait(() -> tabPane.getSelectionModel().select(tabs[2]));
waitForLatch(latches[2], 5, "Timeout waiting tabs[2] to get selected.");
latches[0] = new CountDownLatch(1);
}

0 comments on commit 2d98fe6

Please sign in to comment.
You can’t perform that action at this time.