changeset 354:b68ae02f60e5 2.1-b11

Automated merge with ssh://jpgodine@jfxsrc.us.oracle.com//javafx/2.1/MASTER/jfx/rt
author jpgodine@JPGODINE-LAP.st-users.us.oracle.com
date Tue, 31 Jan 2012 10:07:21 -0800
parents 7e2f6c7ce2c0 bcf63abfdbbf
children 3557441fca66 5fd0bc71c9d6 d5cc45b05dc5 5259aa889b15
files javafx-ui-controls/test/javafx/scene/control/TableViewKeyInputTest.java
diffstat 4 files changed, 131 insertions(+), 115 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-ui-controls/test/javafx/scene/control/LabelTest.java	Tue Jan 31 10:01:04 2012 -0500
+++ b/javafx-ui-controls/test/javafx/scene/control/LabelTest.java	Tue Jan 31 10:07:21 2012 -0800
@@ -17,6 +17,7 @@
 import javafx.scene.shape.Rectangle;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class LabelTest {
@@ -136,24 +137,28 @@
     // TODO I'm not actually sure why we base the showMnemonics of a Label
     // TODO on the showMnemonics of its labelFor, but since we do, I need
     // TODO to test it to make sure things get hooked up and unhooked
+    @Ignore("RT-19311")
     @Test public void showMnemonicsHasNoListenersOnTextFieldByDefault() {
         // This is a sanity check test, so the following tests make sense
         TextField textField = new TextField();
         assertEquals(0, getListenerCount(textField.impl_showMnemonicsProperty()));
     }
 
+    @Ignore("RT-19311")
     @Test public void settingLabelForShouldAddListenerToShowMnemonics() {
         TextField textField = new TextField();
         label.setLabelFor(textField);
         assertEquals(1, getListenerCount(textField.impl_showMnemonicsProperty()));
     }
 
+    @Ignore("RT-19311")
     @Test public void settingLabelForShouldAddListenerToShowMnemonics_SetThroughProperty() {
         TextField textField = new TextField();
         label.labelForProperty().set(textField);
         assertEquals(1, getListenerCount(textField.impl_showMnemonicsProperty()));
     }
 
+    @Ignore("RT-19311")
     @Test public void settingLabelForShouldAddListenerToShowMnemonics_WhenBound() {
         TextField textField = new TextField();
         ObjectProperty<TextField> other = new SimpleObjectProperty<TextField>(textField);
@@ -161,6 +166,7 @@
         assertEquals(1, getListenerCount(textField.impl_showMnemonicsProperty()));
     }
 
+    @Ignore("RT-19311")
     @Test public void clearingLabelForShouldRemoveListenerFromShowMnemonics() {
         TextField textField = new TextField();
         label.setLabelFor(textField);
@@ -168,6 +174,7 @@
         assertEquals(0, getListenerCount(textField.impl_showMnemonicsProperty()));
     }
 
+    @Ignore("RT-19311")
     @Test public void clearingLabelForShouldRemoveListenerFromShowMnemonics_SetThroughProperty() {
         TextField textField = new TextField();
         label.labelForProperty().set(textField);
@@ -175,6 +182,7 @@
         assertEquals(0, getListenerCount(textField.impl_showMnemonicsProperty()));
     }
 
+    @Ignore("RT-19311")
     @Test public void clearingLabelForShouldRemoveListenerFromShowMnemonics_WhenBound() {
         TextField textField = new TextField();
         ObjectProperty<TextField> other = new SimpleObjectProperty<TextField>(textField);
@@ -183,6 +191,7 @@
         assertEquals(0, getListenerCount(textField.impl_showMnemonicsProperty()));
     }
 
+    @Ignore("RT-19311")
     @Test public void swappingLabelForShouldAddAndRemoveListenerFromShowMnemonics() {
         TextField a = new TextField();
         TextField b = new TextField();
@@ -192,6 +201,7 @@
         assertEquals(1, getListenerCount(b.impl_showMnemonicsProperty()));
     }
 
+    @Ignore("RT-19311")
     @Test public void swappingLabelForShouldAddAndRemoveListenerFromShowMnemonics_SetThroughProperty() {
         TextField a = new TextField();
         TextField b = new TextField();
@@ -201,6 +211,7 @@
         assertEquals(1, getListenerCount(b.impl_showMnemonicsProperty()));
     }
 
+    @Ignore("RT-19311")
     @Test public void swappingLabelForShouldAddAndRemoveListenerFromShowMnemonics_WhenBound() {
         TextField a = new TextField();
         TextField b = new TextField();
--- a/javafx-ui-controls/test/javafx/scene/control/ListCellTest.java	Tue Jan 31 10:01:04 2012 -0500
+++ b/javafx-ui-controls/test/javafx/scene/control/ListCellTest.java	Tue Jan 31 10:07:21 2012 -0800
@@ -12,6 +12,7 @@
 
 import com.sun.javafx.stage.EmbeddedWindow;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static javafx.scene.control.ControlTestUtils.*;
@@ -471,6 +472,7 @@
         assertFalse(other.isSelected());
     }
 
+    @Ignore("RT-19311")
     @Test public void replacingTheFocusModelRemovesTheListenerFromTheOldModel() {
         cell.updateIndex(0);
         cell.updateListView(list);
--- a/javafx-ui-controls/test/javafx/scene/control/ListViewKeyInputTest.java	Tue Jan 31 10:01:04 2012 -0500
+++ b/javafx-ui-controls/test/javafx/scene/control/ListViewKeyInputTest.java	Tue Jan 31 10:07:21 2012 -0800
@@ -152,14 +152,14 @@
         testInitialState();
     }
     
-    // test 19
+    /* test 19
     @Test public void testCtrlDownMovesFocusButLeavesSelectionAlone() {
         assertTrue(fm.isFocused(0));
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());
         assertTrue(fm.isFocused(1));
         assertTrue(sm.isSelected(0));
         assertFalse(sm.isSelected(1));
-    }
+    } */
     
     // test 20
     @Test public void testCtrlUpDoesNotMoveFocus() {
@@ -185,15 +185,15 @@
         assertTrue(sm.isSelected(0));
     }
     
-    // test 23
+    /* test 23
     @Test public void testCtrlUpMovesFocus() {
         sm.clearAndSelect(1);
         assertTrue(fm.isFocused(1));
         assertTrue(sm.isSelected(1));
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());
         assertTrue(fm.isFocused(0));
-        assertTrue(sm.isSelected(1));
-    }
+
+    } */
     
     // test 24
     @Test public void testCtrlDownDoesNotMoveFocusWhenAtLastIndex() {
@@ -206,7 +206,7 @@
         assertTrue(sm.isSelected(endIndex));
     }
     
-    // test 25
+    /* test 25
     @Test public void testCtrlDownArrowWithSpaceChangesAnchor() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -215,9 +215,9 @@
         assertTrue(isSelected(0, 2));
         assertTrue(isNotSelected(1));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 26
+    /* test 26
     @Test public void testCtrlUpArrowWithSpaceChangesAnchor() {
         sm.clearAndSelect(2);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -226,7 +226,7 @@
         assertTrue(isSelected(0, 2));
         assertTrue(isNotSelected(1));
         assertTrue(isAnchor(0));
-    }
+    } */
     
     // test 44
     @Test public void testHomeKey() {
@@ -244,23 +244,23 @@
         assertTrue(isNotSelected(1,2,3));
     }
     
-    // test 53
+    /* test 53
     @Test public void testCtrlHome() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.getShortcutKey());
         assertTrue(isSelected(5));
         assertTrue(fm.isFocused(0));
-    }
+    } */
     
-    // test 54
+    /* test 54
     @Test public void testCtrlEnd() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.END, KeyModifier.getShortcutKey());
         assertTrue(isSelected(5));
         assertTrue(fm.isFocused(listView.getItems().size() - 1));
-    }
+    } */
     
-    // test 68
+    /* test 68
     @Test public void testCtrlSpaceToClearSelection() {
         sm.clearAndSelect(5);
         assertTrue(isSelected(5));
@@ -269,7 +269,7 @@
         assertTrue(isNotSelected(5));
         assertTrue(debug(), fm.isFocused(5));
         assertTrue(isAnchor(5));
-    }
+    } */
     
     
     
@@ -382,7 +382,7 @@
         assertFalse(sm.isSelected(endIndex - 2));
     }
     
-    // test 27
+    /* test 27
     @Test public void testCtrlDownArrowWithSpaceChangesAnchor_extended() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -395,9 +395,9 @@
         assertTrue(isSelected(2));
         assertTrue(isNotSelected(0, 1));
         assertTrue(isAnchor(0));
-    }
+    } */
     
-    // test 28
+    /* test 28
     @Test public void testCtrlUpArrowWithSpaceChangesAnchor_extended() {
         sm.clearAndSelect(2);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -410,9 +410,9 @@
         assertTrue(isSelected(0));
         assertTrue(isNotSelected(1, 2));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 29
+    /* test 29
     @Test public void testCtrlDownArrowWithSpaceChangesAnchor_extended2() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -425,9 +425,9 @@
         assertTrue(isSelected(0, 2, 4));
         assertTrue(isNotSelected(1, 3, 5));
         assertTrue(isAnchor(4));
-    }
+    } */
     
-    // test 30
+    /* test 30
     @Test public void testCtrlUpArrowWithSpaceChangesAnchor_extended2() {
         sm.clearAndSelect(4);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 3
@@ -440,9 +440,9 @@
         assertTrue(isSelected(0, 2, 4));
         assertTrue(isNotSelected(1, 3));
         assertTrue(isAnchor(0));
-    }
+    } */
     
-    // test 31
+    /* test 31
     @Test public void testCtrlDownArrowThenShiftSpaceToSelectRange() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -451,9 +451,9 @@
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3));
         assertTrue(isAnchor(0));
-    }
+    } */
     
-    // test 32
+    /* test 32
     @Test public void testCtrlUpArrowThenShiftSpaceToSelectRange() {
         sm.clearAndSelect(2);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -462,9 +462,9 @@
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3));
         assertTrue(debug(), isAnchor(2));
-    }
+    } */
     
-    // test 33
+    /* test 33
     @Test public void testCtrlDownArrowThenSpaceToChangeSelection() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -480,9 +480,9 @@
         assertTrue(isSelected(2, 3, 4));
         assertTrue(isNotSelected(0, 1));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 34
+    /* test 34
     @Test public void testCtrlUpArrowThenSpaceToChangeSelection() {
         sm.clearAndSelect(4);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 3
@@ -498,18 +498,18 @@
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3, 4));
         assertTrue(debug(), isAnchor(2));
-    }
+    } */
     
-    // test 35
+    /* test 35
     @Test public void testCtrlDownTwiceThenShiftDown() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 2
         keyboard.doKeyPress(KeyCode.DOWN, KeyModifier.SHIFT);  // select 0,1,2,3
         assertTrue(isSelected(0, 1, 2, 3));
-    }
+    } */
     
-    // test 36
+    /* test 36
     @Test public void testCtrlUpTwiceThenShiftDown() {
         sm.clearAndSelect(3);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 2
@@ -518,9 +518,9 @@
         keyboard.doKeyPress(KeyCode.DOWN, KeyModifier.SHIFT);  // select 1,2,3
         assertTrue(isSelected(1, 2, 3));
         assertTrue(isNotSelected(0));
-    }
+    } */
     
-    // test 37
+    /* test 37
     @Test public void testCtrlDownThriceThenShiftUp() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -529,9 +529,9 @@
         keyboard.doKeyPress(KeyCode.UP, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3, 4));
-    }
+    } */
     
-    // test 38
+    /* test 38
     @Test public void testCtrlUpTwiceThenShiftUp() {
         sm.clearAndSelect(3);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 2
@@ -539,9 +539,9 @@
         keyboard.doKeyPress(KeyCode.UP, KeyModifier.SHIFT);  // select 0,1,2,3
         assertTrue(isSelected(0, 1, 2, 3));
         assertTrue(isNotSelected(4));
-    }
+    } */
     
-    // test 39
+    /* test 39
     @Test public void testCtrlDownTwiceThenSpace_extended() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -557,9 +557,9 @@
         assertTrue(isSelected(2, 3, 4, 5));
         assertTrue(isNotSelected(0, 1));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 40
+    /* test 40
     @Test public void testCtrlUpTwiceThenSpace_extended() {
         sm.clearAndSelect(5);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 4
@@ -576,9 +576,9 @@
         assertTrue(isSelected(1,2,3));
         assertTrue(isNotSelected(0,4,5));
         assertTrue(isAnchor(3));
-    }
+    } */
     
-    // test 41
+    /* test 41
     @Test public void testCtrlDownTwiceThenSpace_extended2() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -595,9 +595,9 @@
         assertTrue(isSelected(2,3,4));
         assertTrue(isNotSelected(0,1,5));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 50
+    /* test 50
     @Test public void testCtrlDownThenShiftHome() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -613,9 +613,9 @@
         assertTrue(isSelected(0,1,2));
         assertTrue(isNotSelected(3,4));
         assertTrue(debug(),isAnchor(2));
-    }
+    } */
     
-    // test 51
+    /* test 51
     @Test public void testCtrlUpThenShiftEnd() {
         sm.clearAndSelect(5);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 4
@@ -631,9 +631,9 @@
         assertTrue(isSelected(3,4,5,6,7,8,9));
         assertTrue(isNotSelected(0,1,2));
         assertTrue(debug(),isAnchor(3));
-    }
+    } */
     
-    // test 42
+    /* test 42
     @Test public void testCtrlUpTwiceThenSpace_extended2() {
         sm.clearAndSelect(5);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 4
@@ -649,7 +649,7 @@
         assertTrue(isSelected(0,1,2,3));
         assertTrue(isNotSelected(4,5));
         assertTrue(isAnchor(3));
-    }
+    } */
     
     // test 46
     @Test public void testHomeKey_withSelectedItems() {
@@ -699,7 +699,7 @@
         assertTrue(isAnchor(5));
     }
     
-    // test 65
+    /* test 65
     @Test public void testShiftPageUp() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());
@@ -713,14 +713,14 @@
         keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 67
+    /* test 67
     @Test public void testCtrlAToSelectAll() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.A, KeyModifier.getShortcutKey());
         assertTrue(isSelected(0,1,2,3,4,5,6,7,8,9));
-    }
+    } */
     
     
     /***************************************************************************
@@ -754,7 +754,7 @@
      * Tests for specific bug reports
      **************************************************************************/
     
-    @Test public void test_rt18642() {
+    /* @Test public void test_rt18642() {
         sm.clearAndSelect(1);                          // select 1
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());   // shift focus to 2
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());   // shift focus to 3
@@ -770,5 +770,5 @@
         keyboard.doUpArrowPress(KeyModifier.SHIFT);   
         assertTrue(isSelected(4, 5));
         assertTrue(isNotSelected(0, 1, 2, 3));
-    }
+    } */
 }
--- a/javafx-ui-controls/test/javafx/scene/control/TableViewKeyInputTest.java	Tue Jan 31 10:01:04 2012 -0500
+++ b/javafx-ui-controls/test/javafx/scene/control/TableViewKeyInputTest.java	Tue Jan 31 10:07:21 2012 -0800
@@ -170,14 +170,14 @@
         testInitialState();
     }
     
-    // test 19
+    /* test 19
     @Test public void testCtrlDownMovesFocusButLeavesSelectionAlone() {
         assertTrue(fm.isFocused(0));
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());
         assertTrue(fm.isFocused(1));
         assertTrue(sm.isSelected(0));
         assertFalse(sm.isSelected(1));
-    }
+    } */
     
     // test 20
     @Test public void testCtrlUpDoesNotMoveFocus() {
@@ -203,7 +203,7 @@
         assertTrue(sm.isSelected(0));
     }
     
-    // test 23
+    /* test 23
     @Test public void testCtrlUpMovesFocus() {
         sm.clearAndSelect(1);
         assertTrue(fm.isFocused(1));
@@ -211,7 +211,7 @@
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());
         assertTrue(fm.isFocused(0));
         assertTrue(sm.isSelected(1));
-    }
+    } */
     
     // test 24
     @Test public void testCtrlDownDoesNotMoveFocusWhenAtLastIndex() {
@@ -224,7 +224,7 @@
         assertTrue(sm.isSelected(endIndex));
     }
     
-    // test 25
+    /* test 25
     @Test public void testCtrlDownArrowWithSpaceChangesAnchor() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -233,9 +233,9 @@
         assertTrue(isSelected(0, 2));
         assertTrue(isNotSelected(1));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 26
+    /* test 26
     @Test public void testCtrlUpArrowWithSpaceChangesAnchor() {
         sm.clearAndSelect(2);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -244,7 +244,7 @@
         assertTrue(isSelected(0, 2));
         assertTrue(isNotSelected(1));
         assertTrue(isAnchor(0));
-    }
+    } */
     
     // test 44
     @Test public void testHomeKey() {
@@ -262,23 +262,23 @@
         assertTrue(isNotSelected(1,2,3));
     }
     
-    // test 53
+    /* test 53
     @Test public void testCtrlHome() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.HOME, KeyModifier.getShortcutKey());
         assertTrue(isSelected(5));
         assertTrue(fm.isFocused(0));
-    }
+    } */
     
-    // test 54
+    /* test 54
     @Test public void testCtrlEnd() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.END, KeyModifier.getShortcutKey());
         assertTrue(isSelected(5));
         assertTrue(fm.isFocused(tableView.getItems().size() - 1));
-    }
+    } */
     
-    // test 68
+    /* test 68
     @Test public void testCtrlSpaceToClearSelection() {
         sm.clearAndSelect(5);
         assertTrue(isSelected(5));
@@ -287,7 +287,7 @@
         assertTrue(isNotSelected(5));
         assertTrue(debug(), fm.isFocused(5));
         assertTrue(isAnchor(5));
-    }
+    } */
     
     
     
@@ -400,7 +400,7 @@
         assertFalse(sm.isSelected(endIndex - 2));
     }
     
-    // test 27
+    /* test 27
     @Test public void testCtrlDownArrowWithSpaceChangesAnchor_extended() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -413,9 +413,9 @@
         assertTrue(isSelected(2));
         assertTrue(isNotSelected(0, 1));
         assertTrue(isAnchor(0));
-    }
+    } */
     
-    // test 28
+    /* test 28
     @Test public void testCtrlUpArrowWithSpaceChangesAnchor_extended() {
         sm.clearAndSelect(2);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -428,9 +428,9 @@
         assertTrue(isSelected(0));
         assertTrue(isNotSelected(1, 2));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 29
+    /* test 29
     @Test public void testCtrlDownArrowWithSpaceChangesAnchor_extended2() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -443,9 +443,9 @@
         assertTrue(isSelected(0, 2, 4));
         assertTrue(isNotSelected(1, 3, 5));
         assertTrue(isAnchor(4));
-    }
+    } */
     
-    // test 30
+    /* test 30
     @Test public void testCtrlUpArrowWithSpaceChangesAnchor_extended2() {
         sm.clearAndSelect(4);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 3
@@ -458,9 +458,9 @@
         assertTrue(isSelected(0, 2, 4));
         assertTrue(isNotSelected(1, 3));
         assertTrue(isAnchor(0));
-    }
+    } */
     
-    // test 31
+    /* test 31
     @Test public void testCtrlDownArrowThenShiftSpaceToSelectRange() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -469,9 +469,9 @@
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3));
         assertTrue(isAnchor(0));
-    }
+    } */
     
-    // test 32
+    /* test 32
     @Test public void testCtrlUpArrowThenShiftSpaceToSelectRange() {
         sm.clearAndSelect(2);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -480,9 +480,9 @@
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3));
         assertTrue(debug(), isAnchor(2));
-    }
+    } */
     
-    // test 33
+    /* test 33
     @Test public void testCtrlDownArrowThenSpaceToChangeSelection() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -498,9 +498,9 @@
         assertTrue(isSelected(2, 3, 4));
         assertTrue(isNotSelected(0, 1));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 34
+    /* test 34
     @Test public void testCtrlUpArrowThenSpaceToChangeSelection() {
         sm.clearAndSelect(4);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 3
@@ -516,18 +516,18 @@
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3, 4));
         assertTrue(debug(), isAnchor(2));
-    }
+    } */
     
-    // test 35
+    /* test 35
     @Test public void testCtrlDownTwiceThenShiftDown() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 2
         keyboard.doKeyPress(KeyCode.DOWN, KeyModifier.SHIFT);  // select 0,1,2,3
         assertTrue(isSelected(0, 1, 2, 3));
-    }
+    } */
     
-    // test 36
+    /* test 36
     @Test public void testCtrlUpTwiceThenShiftDown() {
         sm.clearAndSelect(3);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 2
@@ -536,9 +536,9 @@
         keyboard.doKeyPress(KeyCode.DOWN, KeyModifier.SHIFT);  // select 1,2,3
         assertTrue(isSelected(1, 2, 3));
         assertTrue(isNotSelected(0));
-    }
+    } */
     
-    // test 37
+    /* test 37
     @Test public void testCtrlDownThriceThenShiftUp() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -547,9 +547,9 @@
         keyboard.doKeyPress(KeyCode.UP, KeyModifier.SHIFT);  // select 0,1,2
         assertTrue(isSelected(0, 1, 2));
         assertTrue(isNotSelected(3, 4));
-    }
+    } */
     
-    // test 38
+    /* test 38
     @Test public void testCtrlUpTwiceThenShiftUp() {
         sm.clearAndSelect(3);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 2
@@ -557,9 +557,9 @@
         keyboard.doKeyPress(KeyCode.UP, KeyModifier.SHIFT);  // select 0,1,2,3
         assertTrue(isSelected(0, 1, 2, 3));
         assertTrue(isNotSelected(4));
-    }
+    } */
     
-    // test 39
+    /* test 39
     @Test public void testCtrlDownTwiceThenSpace_extended() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -575,9 +575,9 @@
         assertTrue(isSelected(2, 3, 4, 5));
         assertTrue(isNotSelected(0, 1));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 40
+    /* test 40
     @Test public void testCtrlUpTwiceThenSpace_extended() {
         sm.clearAndSelect(5);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 4
@@ -594,9 +594,9 @@
         assertTrue(isSelected(1,2,3));
         assertTrue(isNotSelected(0,4,5));
         assertTrue(isAnchor(3));
-    }
+    } */
     
-    // test 41
+    /* test 41
     @Test public void testCtrlDownTwiceThenSpace_extended2() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -613,9 +613,9 @@
         assertTrue(isSelected(2,3,4));
         assertTrue(isNotSelected(0,1,5));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 50
+    /* test 50
     @Test public void testCtrlDownThenShiftHome() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());    // move focus to 1
@@ -631,9 +631,9 @@
         assertTrue(isSelected(0,1,2));
         assertTrue(isNotSelected(3,4));
         assertTrue(debug(),isAnchor(2));
-    }
+    } */
     
-    // test 51
+    /* test 51
     @Test public void testCtrlUpThenShiftEnd() {
         sm.clearAndSelect(5);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 4
@@ -649,9 +649,9 @@
         assertTrue(isSelected(3,4,5,6,7,8,9));
         assertTrue(isNotSelected(0,1,2));
         assertTrue(debug(),isAnchor(3));
-    }
+    } */
     
-    // test 42
+    /* test 42
     @Test public void testCtrlUpTwiceThenSpace_extended2() {
         sm.clearAndSelect(5);
         keyboard.doUpArrowPress(KeyModifier.getShortcutKey());    // move focus to 4
@@ -667,7 +667,7 @@
         assertTrue(isSelected(0,1,2,3));
         assertTrue(isNotSelected(4,5));
         assertTrue(isAnchor(3));
-    }
+    } */
     
     // test 46
     @Test public void testHomeKey_withSelectedItems() {
@@ -717,7 +717,7 @@
         assertTrue(isAnchor(5));
     }
     
-    // test 65
+    /* test 65
     @Test public void testShiftPageUp() {
         sm.clearAndSelect(0);
         keyboard.doDownArrowPress(KeyModifier.getShortcutKey());
@@ -731,14 +731,14 @@
         keyboard.doKeyPress(KeyCode.PAGE_UP, KeyModifier.SHIFT);
         assertTrue(isSelected(0,1,2));
         assertTrue(isAnchor(2));
-    }
+    } */
     
-    // test 67
+    /* test 67
     @Test public void testCtrlAToSelectAll() {
         sm.clearAndSelect(5);
         keyboard.doKeyPress(KeyCode.A, KeyModifier.getShortcutKey());
         assertTrue(isSelected(0,1,2,3,4,5,6,7,8,9));
-    }
+    } */
     
     
     /***************************************************************************
@@ -895,7 +895,8 @@
         assertTrue(sm.isSelected(1, col2));
         assertTrue(sm.isSelected(1, col1));
     }
-    
+
+    /*
     @Test public void test_rt18536_positive_vertical() {
         // Test shift selection when focus is elsewhere (so as to select a range)
         sm.setCellSelectionEnabled(true);
@@ -915,8 +916,9 @@
         assertTrue(sm.isSelected(3, col5));
         assertTrue(sm.isSelected(4, col5));
         assertTrue(sm.isSelected(5, col5));
-    }
+    } */
     
+    /*
     @Test public void test_rt18536_negative_vertical() {
         // Test shift selection when focus is elsewhere (so as to select a range)
         sm.setCellSelectionEnabled(true);
@@ -936,8 +938,9 @@
         assertTrue(sm.isSelected(3, col5));
         assertTrue(sm.isSelected(4, col5));
         assertTrue(sm.isSelected(5, col5));
-    }
+    } */
     
+    /*
     @Test public void test_rt18642() {
         sm.setCellSelectionEnabled(false);
         sm.clearAndSelect(1);                          // select 1
@@ -955,5 +958,5 @@
         keyboard.doUpArrowPress(KeyModifier.SHIFT);   
         assertTrue(isSelected(4, 5));
         assertTrue(isNotSelected(0, 1, 2, 3));
-    }
+    } */
 }