From 0c2deecd406913485c13a228de801b6b2b745939 Mon Sep 17 00:00:00 2001 From: Alexander Doroshko Date: Mon, 19 Oct 2009 20:29:53 +0400 Subject: [PATCH] update HierarchyNodeDescriptors before sorting --- .../codeInsight/hierarchy/HierarchyViewTestBase.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/testFramework/src/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestBase.java b/java/testFramework/src/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestBase.java index 6e9ed3895605..249b5125bdd9 100755 --- a/java/testFramework/src/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestBase.java +++ b/java/testFramework/src/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestBase.java @@ -31,13 +31,14 @@ public abstract class HierarchyViewTestBase extends CodeInsightTestCase { } private static void checkHierarchyTreeStructure(final HierarchyTreeStructure treeStructure, final Document document) { - checkNodeDescriptorRecursively(treeStructure, (HierarchyNodeDescriptor)treeStructure.getRootElement(), document.getRootElement()); + final HierarchyNodeDescriptor rootNodeDescriptor = (HierarchyNodeDescriptor)treeStructure.getRootElement(); + rootNodeDescriptor.update(); + checkNodeDescriptorRecursively(treeStructure, rootNodeDescriptor, document.getRootElement()); } private static void checkNodeDescriptorRecursively(final HierarchyTreeStructure treeStructure, final HierarchyNodeDescriptor descriptor, final Element expectedElement) { - descriptor.update(); checkBaseNode(treeStructure, descriptor, expectedElement); checkContent(descriptor, expectedElement); checkChildren(treeStructure, descriptor, expectedElement); @@ -64,6 +65,10 @@ public abstract class HierarchyViewTestBase extends CodeInsightTestCase { final List expectedChildren = new ArrayList(element.getChildren()); assertEquals("Children of " + descriptor.getHighlightedText().getText(), expectedChildren.size(), children.length); + for (Object child : children) { + ((HierarchyNodeDescriptor)child).update(); + } + Arrays.sort(children, new Comparator() { public int compare(final Object first, final Object second) { return ((HierarchyNodeDescriptor)first).getHighlightedText().getText()