Index: src/test/api/java/common/javax/swing/JTreeTest.java =================================================================== --- src/test/api/java/common/javax/swing/JTreeTest.java (revision 505242) +++ src/test/api/java/common/javax/swing/JTreeTest.java (working copy) @@ -1184,16 +1184,8 @@ TreePath path11 = path1.pathByAddingChild(child11); assertNull(tree.getExpandedDescendants(null)); checkInEnumeration(tree.getExpandedDescendants(rootPath), new Object[] { rootPath }); - if (isHarmony()) { - assertFalse(tree.getExpandedDescendants(path1).hasMoreElements()); - } else { - assertNull(tree.getExpandedDescendants(path1)); - } - if (isHarmony()) { - assertFalse(tree.getExpandedDescendants(path11).hasMoreElements()); - } else { - assertNull(tree.getExpandedDescendants(path11)); - } + assertNull(tree.getExpandedDescendants(path1)); + assertNull(tree.getExpandedDescendants(path11)); tree.expandPath(path11); checkInEnumeration(tree.getExpandedDescendants(rootPath), new Object[] { path1, rootPath, path11 }); @@ -1201,11 +1193,7 @@ checkInEnumeration(tree.getExpandedDescendants(rootPath), new Object[] { path1, rootPath }); tree.collapsePath(rootPath); - if (isHarmony()) { - assertFalse(tree.getExpandedDescendants(rootPath).hasMoreElements()); - } else { - assertNull(tree.getExpandedDescendants(rootPath)); - } + assertNull(tree.getExpandedDescendants(rootPath)); } public void testGetSetExpandsSelectedPaths() {