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

fix tests

Browse Source
This commit is contained in:
peter
2012-07-27 18:52:48 +02:00
parent 9d53db395d
commit 3c11501a6c
3 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/projectView/FileStructureDialogTest.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class FileStructureDialogTest extends BaseProjectViewTestCase {
}
});
final CommanderPanel panel = dialog.getPanel();
assertListsEqual((ListModel)panel.getModel(), "Inner1\n" + "Inner2\n" + "__method():void\n" + "_myField1:int\n" + "_myField2:String\n");
assertListsEqual((ListModel)panel.getModel(), "Inner1\n" + "Inner2\n" + "__method(): void\n" + "_myField1: int\n" + "_myField2: String\n");
}
finally {
if (dialog != null) dialog.close(0);
java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java
+55 -55
View File
@@ -3,7 +3,7 @@
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* are met:
*
* -Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
@@ -61,20 +61,20 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(),
"-Class1.java\n" +
" -Class1\n" +
" getValue():int\n" +
" getClass():Class<? extends Object>\n" +
" hashCode():int\n" +
" equals(Object):boolean\n" +
" clone():Object\n" +
" toString():String\n" +
" notify():void\n" +
" notifyAll():void\n" +
" wait(long):void\n" +
" wait(long, int):void\n" +
" wait():void\n" +
" finalize():void\n" +
" myField1:boolean\n" +
" myField2:boolean\n");
" getValue(): int\n" +
" getClass(): Class<? extends Object>\n" +
" hashCode(): int\n" +
" equals(Object): boolean\n" +
" clone(): Object\n" +
" toString(): String\n" +
" notify(): void\n" +
" notifyAll(): void\n" +
" wait(long): void\n" +
" wait(long, int): void\n" +
" wait(): void\n" +
" finalize(): void\n" +
" myField1: boolean\n" +
" myField2: boolean\n");
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, true);
@@ -82,25 +82,25 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class1.java\n" +
" -Class1\n" +
" getValue():int\n" +
" myField1:boolean\n" +
" myField2:boolean\n");
" getValue(): int\n" +
" myField1: boolean\n" +
" myField2: boolean\n");
structureViewComponent.setActionActive(PublicElementsFilter.ID, true);
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class1.java\n" +
" -Class1\n" +
" getValue():int\n" +
" myField1:boolean\n" +
" myField2:boolean\n");
" getValue(): int\n" +
" myField1: boolean\n" +
" myField2: boolean\n");
structureViewComponent.setActionActive(PublicElementsFilter.ID, false);
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class1.java\n" +
" -Class1\n" +
" getValue():int\n" +
" myField1:boolean\n" +
" myField2:boolean\n");
" getValue(): int\n" +
" myField1: boolean\n" +
" myField2: boolean\n");
}
});
}
@@ -116,22 +116,22 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
" -Class2\n" +
" +InnerClass1\n" +
" +InnerClass2\n" +
" getValue():int\n" +
" getClass():Class<? extends Object>\n" +
" hashCode():int\n" +
" equals(Object):boolean\n" +
" clone():Object\n" +
" toString():String\n" +
" notify():void\n" +
" notifyAll():void\n" +
" wait(long):void\n" +
" wait(long, int):void\n" +
" wait():void\n" +
" finalize():void\n" +
" myField1:boolean\n" +
" myField2:boolean\n" +
" myField3:boolean\n" +
" myField4:boolean\n");
" getValue(): int\n" +
" getClass(): Class<? extends Object>\n" +
" hashCode(): int\n" +
" equals(Object): boolean\n" +
" clone(): Object\n" +
" toString(): String\n" +
" notify(): void\n" +
" notifyAll(): void\n" +
" wait(long): void\n" +
" wait(long, int): void\n" +
" wait(): void\n" +
" finalize(): void\n" +
" myField1: boolean\n" +
" myField2: boolean\n" +
" myField3: boolean\n" +
" myField4: boolean\n");
structureViewComponent.setActionActive(JavaInheritedMembersNodeProvider.ID, false);
@@ -139,11 +139,11 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
" -Class2\n" +
" +InnerClass1\n" +
" +InnerClass2\n" +
" getValue():int\n" +
" myField1:boolean\n" +
" myField2:boolean\n" +
" myField3:boolean\n" +
" myField4:boolean\n");
" getValue(): int\n" +
" myField1: boolean\n" +
" myField2: boolean\n" +
" myField3: boolean\n" +
" myField4: boolean\n");
}
});
}
@@ -156,17 +156,17 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class2.java\n" +
" -Class2\n" +
" __myPrivateFiield:int\n" +
" _myProtectedField:int\n" +
" myPublicField:int\n");
" __myPrivateFiield: int\n" +
" _myProtectedField: int\n" +
" myPublicField: int\n");
structureViewComponent.setActionActive(VisibilitySorter.ID, true);
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class2.java\n" +
" -Class2\n" +
" myPublicField:int\n" +
" _myProtectedField:int\n" +
" __myPrivateFiield:int\n");
" myPublicField: int\n" +
" _myProtectedField: int\n" +
" __myPrivateFiield: int\n");
}
});
}
@@ -180,10 +180,10 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase {
IdeaTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class2.java\n" +
" -Class2\n" +
" Class2()\n" +
" af():void\n" +
" zf():void\n" +
" ab:int\n" +
" z:int\n"
" af(): void\n" +
" zf(): void\n" +
" ab: int\n" +
" z: int\n"
);
}
});
java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java
+46 -46
View File
@@ -3,7 +3,7 @@
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* are met:
*
* -Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
@@ -72,20 +72,20 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
PlatformTestUtil.assertTreeEqual(structureViewComponent.getTree(),
"-Class1.java\n" +
" -Class1\n" +
" getValue():int\n" +
" getClass():Class<? extends Object>\n" +
" hashCode():int\n" +
" equals(Object):boolean\n" +
" clone():Object\n" +
" toString():String\n" +
" notify():void\n" +
" notifyAll():void\n" +
" wait(long):void\n" +
" wait(long, int):void\n" +
" wait():void\n" +
" finalize():void\n" +
" myField1:boolean\n" +
" myField2:boolean\n");
" getValue(): int\n" +
" getClass(): Class<? extends Object>\n" +
" hashCode(): int\n" +
" equals(Object): boolean\n" +
" clone(): Object\n" +
" toString(): String\n" +
" notify(): void\n" +
" notifyAll(): void\n" +
" wait(long): void\n" +
" wait(long, int): void\n" +
" wait(): void\n" +
" finalize(): void\n" +
" myField1: boolean\n" +
" myField2: boolean\n");
new WriteCommandAction.Simple(getProject()) {
@Override
@@ -103,21 +103,21 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
//TreeUtil.expand(structureViewComponent.getTree(), 3);
PlatformTestUtil.assertTreeEqual(structureViewComponent.getTree(), "-Class1.java\n" +
" -Class1\n" + " getValue():int\n" +
" getClass():Class<? extends Object>\n" +
" hashCode():int\n" +
" equals(Object):boolean\n" +
" clone():Object\n" +
" toString():String\n" +
" notify():void\n" +
" notifyAll():void\n" +
" wait(long):void\n" +
" wait(long, int):void\n" +
" wait():void\n" +
" finalize():void\n" +
" myField1:boolean\n" +
" myField2:boolean\n" +
" myNewField:boolean = false\n");
" -Class1\n" + " getValue(): int\n" +
" getClass(): Class<? extends Object>\n" +
" hashCode(): int\n" +
" equals(Object): boolean\n" +
" clone(): Object\n" +
" toString(): String\n" +
" notify(): void\n" +
" notifyAll(): void\n" +
" wait(long): void\n" +
" wait(long, int): void\n" +
" wait(): void\n" +
" finalize(): void\n" +
" myField1: boolean\n" +
" myField2: boolean\n" +
" myNewField: boolean = false\n");
Disposer.dispose(structureViewComponent);
@@ -140,11 +140,11 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
" -Class2\n" +
" +InnerClass1\n" +
" +InnerClass2\n" +
" getValue():int\n" +
" myField1:boolean\n" +
" myField2:boolean\n" +
" myField3:boolean\n" +
" myField4:boolean\n");
" getValue(): int\n" +
" myField1: boolean\n" +
" myField2: boolean\n" +
" myField3: boolean\n" +
" myField4: boolean\n");
final PsiField innerClassField = psiClass.getInnerClasses()[0].getFields()[0];
@@ -154,13 +154,13 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
" -Class2\n" +
" -InnerClass1\n" +
" +InnerClass12\n" +
" myInnerClassField:int\n" +
" myInnerClassField: int\n" +
" +InnerClass2\n" +
" getValue():int\n" +
" myField1:boolean\n" +
" myField2:boolean\n" +
" myField3:boolean\n" +
" myField4:boolean\n");
" getValue(): int\n" +
" myField1: boolean\n" +
" myField2: boolean\n" +
" myField3: boolean\n" +
" myField4: boolean\n");
CommandProcessor.getInstance().executeCommand(myProject, new Runnable() {
@Override
@@ -187,11 +187,11 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase {
" -InnerClass1\n" +
" +InnerClass12\n" +
" +InnerClass2\n" +
" getValue():int\n" +
" myField1:boolean\n" +
" myField2:boolean\n" +
" myField3:boolean\n" +
" myField4:boolean\n");
" getValue(): int\n" +
" myField1: boolean\n" +
" myField2: boolean\n" +
" myField3: boolean\n" +
" myField4: boolean\n");
}
finally {