Index: modules/swing/src/test/api/java/common/javax/swing/DefaultListSelectionModelTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/DefaultListSelectionModelTest.java (revision 479938) +++ modules/swing/src/test/api/java/common/javax/swing/DefaultListSelectionModelTest.java (working copy) @@ -545,6 +545,32 @@ checkIntervalState(6, 10, false); } + public void testMoveLeadSelectionIndex() throws Exception { + model.addListSelectionListener(listener); + model.setSelectionInterval(3, 6); + + listener.reset(); + model.moveLeadSelectionIndex(-1); + assertEquals(6, model.getLeadSelectionIndex()); + assertEquals(0, listener.getEvents().size()); + + listener.reset(); + model.moveLeadSelectionIndex(2); + assertEquals(2, model.getLeadSelectionIndex()); + checkIntervalState(0, 2, false); + checkIntervalState(3, 6, true); + checkIntervalState(7, 10, false); + checkSingleEvent(2, 6, false); + + listener.reset(); + model.moveLeadSelectionIndex(8); + assertEquals(8, model.getLeadSelectionIndex()); + checkIntervalState(0, 2, false); + checkIntervalState(3, 6, true); + checkIntervalState(7, 10, false); + checkSingleEvent(2, 8, false); + } + public void testToString() throws Exception { assertNotNull(model.toString()); } Index: modules/swing/src/test/api/java/common/javax/swing/table/DefaultTableColumnModelTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/table/DefaultTableColumnModelTest.java (revision 479938) +++ modules/swing/src/test/api/java/common/javax/swing/table/DefaultTableColumnModelTest.java (working copy) @@ -366,11 +366,7 @@ assertTrue(listener.eventOccured()); assertEquals(TestTableColumnModelListener.SELECTION_CHANGED, listener.getEventType()); assertEquals(model.getSelectionModel(), listener.getEvent().getSource()); - if (isHarmony()) { - assertEquals(1, ((ListSelectionEvent) listener.getEvent()).getFirstIndex()); - } else { - assertEquals(0, ((ListSelectionEvent) listener.getEvent()).getFirstIndex()); - } + assertEquals(1, ((ListSelectionEvent) listener.getEvent()).getFirstIndex()); assertEquals(2, ((ListSelectionEvent) listener.getEvent()).getLastIndex()); listener.reset(); ListSelectionEvent event = new ListSelectionEvent("source", 4, 7, true); Index: modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicLookAndFeelTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicLookAndFeelTest.java (revision 479938) +++ modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicLookAndFeelTest.java (working copy) @@ -45,7 +45,7 @@ public void testDefaultsTable() { UIDefaults defaults = lf.getDefaults(); if (isHarmony()) { - assertEquals(474, defaults.size()); + assertEquals(475, defaults.size()); } assertNull(lookAndFeelInstance().getDefaults()); } Index: modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalLookAndFeelTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalLookAndFeelTest.java (revision 479938) +++ modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalLookAndFeelTest.java (working copy) @@ -39,7 +39,7 @@ public void testSize() throws Exception { if (isHarmony()) { - assertEquals(558, new MetalLookAndFeel().getDefaults().size()); + assertEquals(559, new MetalLookAndFeel().getDefaults().size()); } }