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

test depends on the first 17 classes in annotations.jar? Really?

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-01-13 14:31:43 +04:00
parent 7db04f5db3
commit 96baacaa86
4 changed files with 15 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java
+1 -36
View File
@@ -7,7 +7,7 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
myPrintInfo = new Queryable.PrintInfo(new String[]{"className", "fileName", "fieldName", "methodName", "packageName"});
myPrintInfo = new Queryable.PrintInfo();
}
public void test1() {
@@ -33,24 +33,6 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
" Form1.form\n" +
" Form2.form\n");
assertStructureEqual("Project\n" +
" External Libraries\n" +
" Library: < java 1.7 >\n" +
" annotations.jar\n" +
" META-INF\n" +
" MANIFEST.MF\n" +
" classpath.index\n" +
" org\n" +
" intellij\n" +
" lang\n" +
" annotations\n" +
" Identifier\n" +
" Language\n" +
" Pattern\n" +
" PrintFormat\n" +
" PrintFormatPattern\n" +
" RegExp\n");
getProjectTreeStructure().setProviders();
assertStructureEqual(getPackageDirectory(),
@@ -62,23 +44,6 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase {
" Form1.java\n" +
" Form2.form\n");
assertStructureEqual("Project\n" +
" External Libraries\n" +
" Library: < java 1.7 >\n" +
" annotations.jar\n" +
" META-INF\n" +
" MANIFEST.MF\n" +
" classpath.index\n" +
" org\n" +
" intellij\n" +
" lang\n" +
" annotations\n" +
" Identifier.class\n" +
" Language.class\n" +
" Pattern.class\n" +
" PrintFormat.class\n" +
" PrintFormatPattern.class\n" +
" RegExp.class\n");
}
public void testShowClassMembers() {
java/testFramework/src/com/intellij/projectView/BaseProjectViewTestCase.java
+4 -12
View File
@@ -31,7 +31,7 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.ProjectViewTestUtil;
import com.intellij.testFramework.TestSourceBasedTestCase;
import com.intellij.util.Function;
@@ -112,10 +112,6 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
return (AbstractProjectTreeStructure)myStructure;
}
protected void assertStructureEqual(@NonNls String expected) {
assertStructureEqual(myStructure.getRootElement(), expected);
}
protected void assertStructureEqual(String expected, Comparator comparator) {
assertStructureEqual(myStructure.getRootElement(), expected, 27, comparator);
}
@@ -123,16 +119,12 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
private void assertStructureEqual(PsiDirectory root, String expected, int maxRowCount, AbstractTreeStructure structure) {
assertNotNull(root);
PsiDirectoryNode rootNode = new PsiDirectoryNode(myProject, root, (ViewSettings)structure);
assertStructureEqual(rootNode, expected, maxRowCount, IdeaTestUtil.createComparator(myPrintInfo));
}
private void assertStructureEqual(Object rootNode, String expected) {
assertStructureEqual(rootNode, expected, 17, IdeaTestUtil.createComparator(myPrintInfo));
assertStructureEqual(rootNode, expected, maxRowCount, PlatformTestUtil.createComparator(myPrintInfo));
}
private void assertStructureEqual(Object rootNode, String expected, int maxRowCount, Comparator comparator) {
checkGetParentConsistency(rootNode);
StringBuffer actual = IdeaTestUtil.print(myStructure, rootNode, 0, comparator, maxRowCount, ' ', myPrintInfo);
StringBuffer actual = PlatformTestUtil.print(myStructure, rootNode, 0, comparator, maxRowCount, ' ', myPrintInfo);
assertEquals(expected, actual.toString());
}
@@ -185,7 +177,7 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase {
}
protected static void assertListsEqual(ListModel model, String expected) {
assertEquals(expected, IdeaTestUtil.print(model));
assertEquals(expected, PlatformTestUtil.print(model));
}
public static void checkContainsMethod(final Object rootElement, final AbstractTreeStructure structure) {
platform/core-api/src/com/intellij/openapi/ui/Queryable.java
+9 -9
View File
@@ -26,8 +26,8 @@ public interface Queryable {
void putInfo(@NotNull Map<String, String> info);
class PrintInfo {
String[] myIdKeys;
String[] myInfoKeys;
private final String[] myIdKeys;
private final String[] myInfoKeys;
public PrintInfo() {
this(null, null);
@@ -57,13 +57,13 @@ public interface Queryable {
String id = null;
String[] names = print.myIdKeys != null ? print.myIdKeys : new String[] {"name"};
for (String eachKey : names) {
String eachValue = map.get(eachKey);
if (eachValue != null) {
id = eachValue;
}
}
//String[] names = print.myIdKeys != null ? print.myIdKeys : new String[] {"name"};
//for (String eachKey : names) {
// String eachValue = map.get(eachKey);
// if (eachValue != null) {
// id = eachValue;
// }
//}
if (!map.isEmpty()) {
id = map.values().iterator().next();
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+1 -1
View File
@@ -1029,7 +1029,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
}
@Override
public void putInfo(Map<String, String> info) {
public void putInfo(@NotNull Map<String, String> info) {
putInfo(this, info);
}