changeset 4942:292dc67c024a

RT-32556: test_rt32383_pageUp/pageDown fail (on Mac)
author jgiles
date Thu, 05 Sep 2013 17:07:18 +1200
parents 554ecdb56a76
children 18c67af71f48
files modules/controls/src/test/java/javafx/scene/control/ListViewKeyInputTest.java modules/controls/src/test/java/javafx/scene/control/TableViewKeyInputTest.java modules/controls/src/test/java/javafx/scene/control/TreeTableViewKeyInputTest.java modules/controls/src/test/java/javafx/scene/control/TreeViewKeyInputTest.java
diffstat 4 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/test/java/javafx/scene/control/ListViewKeyInputTest.java	Mon Sep 09 14:16:01 2013 +0100
+++ b/modules/controls/src/test/java/javafx/scene/control/ListViewKeyInputTest.java	Thu Sep 05 17:07:18 2013 +1200
@@ -1167,7 +1167,7 @@
         assertEquals(2, rt31577_count);
     }
 
-    @Ignore @Test public void test_rt32383_pageDown() {
+    @Test public void test_rt32383_pageDown() {
         // this test requires a lot of data
         listView.getItems().clear();
         for (int i = 0; i < 100; i++) {
@@ -1180,19 +1180,19 @@
 
         final String initialFocusOwner = fm.getFocusedItem();
 
-        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final String newFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, newFocusOwner);
 
-        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final String nextFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, nextFocusOwner);
         assertNotSame(newFocusOwner, nextFocusOwner);
     }
 
-    @Ignore @Test public void test_rt32383_pageUp() {
+    @Test public void test_rt32383_pageUp() {
         // this test requires a lot of data
         listView.getItems().clear();
         for (int i = 0; i < 100; i++) {
@@ -1214,12 +1214,12 @@
 
         final String initialFocusOwner = fm.getFocusedItem();
 
-        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final String newFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, newFocusOwner);
 
-        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final String nextFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, nextFocusOwner);
--- a/modules/controls/src/test/java/javafx/scene/control/TableViewKeyInputTest.java	Mon Sep 09 14:16:01 2013 +0100
+++ b/modules/controls/src/test/java/javafx/scene/control/TableViewKeyInputTest.java	Thu Sep 05 17:07:18 2013 +1200
@@ -1906,7 +1906,7 @@
         assertEquals(2, rt31577_count);
     }
 
-    @Ignore @Test public void test_rt32383_pageDown() {
+    @Test public void test_rt32383_pageDown() {
         // this test requires a lot of data
         tableView.getItems().clear();
         for (int i = 0; i < 100; i++) {
@@ -1919,19 +1919,19 @@
 
         final String initialFocusOwner = fm.getFocusedItem();
 
-        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final String newFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, newFocusOwner);
 
-        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final String nextFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, nextFocusOwner);
         assertNotSame(newFocusOwner, nextFocusOwner);
     }
 
-    @Ignore @Test public void test_rt32383_pageUp() {
+    @Test public void test_rt32383_pageUp() {
         // this test requires a lot of data
         tableView.getItems().clear();
         for (int i = 0; i < 100; i++) {
@@ -1950,12 +1950,12 @@
 
         final String initialFocusOwner = fm.getFocusedItem();
 
-        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final String newFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, newFocusOwner);
 
-        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final String nextFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, nextFocusOwner);
--- a/modules/controls/src/test/java/javafx/scene/control/TreeTableViewKeyInputTest.java	Mon Sep 09 14:16:01 2013 +0100
+++ b/modules/controls/src/test/java/javafx/scene/control/TreeTableViewKeyInputTest.java	Thu Sep 05 17:07:18 2013 +1200
@@ -2422,7 +2422,7 @@
         assertEquals(2, rt31577_count);
     }
 
-    @Ignore @Test public void test_rt32383_pageDown() {
+    @Test public void test_rt32383_pageDown() {
         // this test requires a lot of data
         for (int i = 0; i < 100; i++) {
             root.getChildren().add(new TreeItem<String>("Row " + i));
@@ -2434,19 +2434,19 @@
 
         final TreeItem<String> initialFocusOwner = fm.getFocusedItem();
 
-        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final TreeItem<String> newFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, newFocusOwner);
 
-        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final TreeItem<String> nextFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, nextFocusOwner);
         assertNotSame(newFocusOwner, nextFocusOwner);
     }
 
-    @Ignore @Test public void test_rt32383_pageUp() {
+    @Test public void test_rt32383_pageUp() {
         // this test requires a lot of data
         for (int i = 0; i < 100; i++) {
             root.getChildren().add(new TreeItem<String>("Row " + i));
@@ -2464,12 +2464,12 @@
 
         final TreeItem<String> initialFocusOwner = fm.getFocusedItem();
 
-        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final TreeItem<String> newFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, newFocusOwner);
 
-        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final TreeItem<String> nextFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, nextFocusOwner);
--- a/modules/controls/src/test/java/javafx/scene/control/TreeViewKeyInputTest.java	Mon Sep 09 14:16:01 2013 +0100
+++ b/modules/controls/src/test/java/javafx/scene/control/TreeViewKeyInputTest.java	Thu Sep 05 17:07:18 2013 +1200
@@ -1371,7 +1371,7 @@
         assertEquals(2, rt31577_count);
     }
 
-    @Ignore @Test public void test_rt32383_pageDown() {
+    @Test public void test_rt32383_pageDown() {
         // this test requires a lot of data
         for (int i = 0; i < 100; i++) {
             root.getChildren().add(new TreeItem<String>("Row " + i));
@@ -1383,19 +1383,19 @@
 
         final TreeItem<String> initialFocusOwner = fm.getFocusedItem();
 
-        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final TreeItem<String> newFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, newFocusOwner);
 
-        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_DOWN, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final TreeItem<String> nextFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, nextFocusOwner);
         assertNotSame(newFocusOwner, nextFocusOwner);
     }
 
-    @Ignore @Test public void test_rt32383_pageUp() {
+    @Test public void test_rt32383_pageUp() {
         // this test requires a lot of data
         for (int i = 0; i < 100; i++) {
             root.getChildren().add(new TreeItem<String>("Row " + i));
@@ -1413,12 +1413,12 @@
 
         final TreeItem<String> initialFocusOwner = fm.getFocusedItem();
 
-        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final TreeItem<String> newFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, newFocusOwner);
 
-        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.CTRL);
+        keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.getShortcutKey());
         Toolkit.getToolkit().firePulse();
         final TreeItem<String> nextFocusOwner = fm.getFocusedItem();
         assertNotSame(initialFocusOwner, nextFocusOwner);