MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix ProjectTreeSortingTest

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-03-06 08:14:55 +01:00
parent dd63dc20a4
commit 49c6b5e9ce
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/projectView/ProjectTreeSortingTest.java
+16 -13
View File
@@ -47,14 +47,17 @@ public class ProjectTreeSortingTest extends BaseProjectViewTestCase {
@Override
public void tearDown() throws Exception {
myProjectView.setManualOrder(myPane.getId(), myOriginalManualOrder);
myProjectView.setSortByType(myPane.getId(), myOriginalSortByType);
((ProjectViewImpl)myProjectView).setFoldersAlwaysOnTop(myOriginalFoldersAlwaysOnTop);
myProjectView.removeProjectPane(myPane);
myProjectView = null;
myPane = null;
super.tearDown();
try {
myProjectView.setManualOrder(myPane.getId(), myOriginalManualOrder);
myProjectView.setSortByType(myPane.getId(), myOriginalSortByType);
((ProjectViewImpl)myProjectView).setFoldersAlwaysOnTop(myOriginalFoldersAlwaysOnTop);
myProjectView.removeProjectPane(myPane);
myProjectView = null;
myPane = null;
}
finally {
super.tearDown();
}
}
public void testSortByName() {
@@ -84,7 +87,7 @@ public class ProjectTreeSortingTest extends BaseProjectViewTestCase {
}
public void testFoldersOnTop() {
// first, check with 'sort by type' disabled
// first, check with 'sort by type' disabled
myProjectView.setSortByType(myPane.getId(), false);
((ProjectViewImpl)myProjectView).setFoldersAlwaysOnTop(true);
@@ -105,7 +108,7 @@ public class ProjectTreeSortingTest extends BaseProjectViewTestCase {
" c.java\n" +
" c.txt\n");
// now let's check the behavior, when sortByType is enabled
// now let's check the behavior, when sortByType is enabled
myProjectView.setSortByType(myPane.getId(), true);
((ProjectViewImpl)myProjectView).setFoldersAlwaysOnTop(true);
@@ -238,7 +241,7 @@ public class ProjectTreeSortingTest extends BaseProjectViewTestCase {
PlatformTestUtil.waitWhileBusy(myPane.getTree());
Object element = path.getLastPathComponent();
assertNotNull("Element for " + getContentDirectory() + " not found", element);
assertEquals(expected, PlatformTestUtil.print(myPane.getTree(), path, new Queryable.PrintInfo(), false));
assertEquals(expected.trim(), PlatformTestUtil.print(myPane.getTree(), path, new Queryable.PrintInfo(), false));
}
static class MyOrderProvider implements TreeStructureProvider {
@@ -283,7 +286,7 @@ public class ProjectTreeSortingTest extends BaseProjectViewTestCase {
@Override
public int getWeight() {
return ((ProjectViewNode)child).getWeight();
return child.getWeight();
}
@Nullable
@@ -295,7 +298,7 @@ public class ProjectTreeSortingTest extends BaseProjectViewTestCase {
@Nullable
@Override
public Comparable getManualOrderKey() {
return order == null ? null : order;
return order;
}
@Nullable