azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AbstractSearcherTest: check member kind in test data not the psi implementation class

Browse Source 
It is not what should be tested in this test
This commit is contained in:
Pavel V. Talanov
2015-10-30 19:05:48 +03:00
parent 78bb44850d
commit ce4a950697
10 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/search/annotations/testAnnotationsOnClass.kt
Vendored
+3 -3
View File
@@ -11,6 +11,6 @@ class TestClass5 {
} }
// ANNOTATION: java.lang.Deprecated // ANNOTATION: java.lang.Deprecated
// SEARCH: KotlinLightClass:TestClass1, KotlinLightClass:TestClass2, KotlinLightClass:TestClass3 // SEARCH: class:TestClass1, class:TestClass2, class:TestClass3
// SEARCH: KotlinLightClass:TestClass4 // SEARCH: class:TestClass4
// SEARCH: KotlinLightClass:TestClass5.innerTestClass5 // SEARCH: class:innerTestClass5
idea/testData/search/annotations/testAnnotationsOnFunction.kt
Vendored
+5 -5
View File
@@ -27,8 +27,8 @@ object Test7 {
} }
// ANNOTATION: java.lang.Deprecated // ANNOTATION: java.lang.Deprecated
// SEARCH: KotlinLightMethodForDeclaration:test1 // SEARCH: method:test1
// SEARCH: KotlinLightMethodForDeclaration:test2 // SEARCH: method:test2
// SEARCH: KotlinLightMethodForDeclaration:test4 // SEARCH: method:test4
// SEARCH: KotlinLightMethodForDeclaration:test6 // SEARCH: method:test6
// SEARCH: KotlinLightMethodForDeclaration:test7 // SEARCH: method:test7
idea/testData/search/annotations/testAnnotationsWithParameters.kt
Vendored
+2 -2
View File
@@ -7,5 +7,5 @@
annotation class MyAnnotation(val first: String, val second: String) annotation class MyAnnotation(val first: String, val second: String)
// ANNOTATION: MyAnnotation // ANNOTATION: MyAnnotation
// SEARCH: KotlinLightMethodForDeclaration:test1 // SEARCH: method:test1
// SEARCH: KotlinLightClass:Test1 // SEARCH: class:Test1
idea/testData/search/inheritance/testInheritanceFromJavaClass.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
class A: Object() {} class A: Object() {}
// CLASS: java.lang.Object // CLASS: java.lang.Object
// SEARCH: KotlinLightClass:A // SEARCH: class:A
idea/testData/search/inheritance/testInheritanceFromKotlinClass.kt
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ class A: Base() {}
open class Base() {} open class Base() {}
// CLASS: Base // CLASS: Base
// SEARCH: KotlinLightClass:A // SEARCH: class:A
idea/testData/search/junit/testJunit3.kt
Vendored
+1 -1
View File
@@ -9,4 +9,4 @@ class Test2: junit.framework.TestCase() {
} }
// CLASS: junit.framework.TestCase // CLASS: junit.framework.TestCase
// SEARCH: KotlinLightClass:Test1, KotlinLightClass:Test2 // SEARCH: class:Test1, class:Test2
idea/testData/search/junit/testJunit4.kt
Vendored
+6 -6
View File
@@ -17,9 +17,9 @@ class MyTestClass {
} }
// ANNOTATION: org.junit.Test // ANNOTATION: org.junit.Test
// SEARCH: KotlinLightMethodForDeclaration:test1 // SEARCH: method:test1
// SEARCH: KotlinLightMethodForDeclaration:test2 // SEARCH: method:test2
// SEARCH: KotlinLightMethodForDeclaration:test3 // SEARCH: method:test3
// SEARCH: KotlinLightMethodForDeclaration:test4 // SEARCH: method:test4
// SEARCH: KotlinLightMethodForDeclaration:test5 // SEARCH: method:test5
// SEARCH: KotlinLightMethodForDeclaration:test6 // SEARCH: method:test6
idea/testData/search/junit/testJunit4Alias.kt
Vendored
+3 -3
View File
@@ -10,6 +10,6 @@ class MyTestClass {
} }
// ANNOTATION: org.junit.Test // ANNOTATION: org.junit.Test
// SEARCH: KotlinLightMethodForDeclaration:test1 // SEARCH: method:test1
// SEARCH: KotlinLightMethodForDeclaration:test2 // SEARCH: method:test2
// SEARCH: KotlinLightMethodForDeclaration:test3 // SEARCH: method:test3
idea/testData/search/junit/testJunit4FancyAlias.kt
Vendored
+3 -3
View File
@@ -10,6 +10,6 @@ class MyTestClass {
} }
// ANNOTATION: org.junit.Test // ANNOTATION: org.junit.Test
// SEARCH: KotlinLightMethodForDeclaration:test1 // SEARCH: method:test1
// SEARCH: KotlinLightMethodForDeclaration:test2 // SEARCH: method:test2
// SEARCH: KotlinLightMethodForDeclaration:test3 // SEARCH: method:test3
idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java
+12 -1
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.search;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
@@ -59,13 +60,23 @@ public abstract class AbstractSearcherTest extends LightCodeInsightFixtureTestCa
List<String> expected = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile()), true), "// SEARCH: "); List<String> expected = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile()), true), "// SEARCH: ");
List<String> actualModified = new ArrayList<String>(); List<String> actualModified = new ArrayList<String>();
for (Object member : actual) { for (Object member : actual) {
actualModified.add(member.toString()); actualModified.add(stringRepresentation(member));
} }
Collections.sort(expected); Collections.sort(expected);
Collections.sort(actualModified); Collections.sort(actualModified);
assertOrderedEquals(actualModified, expected); assertOrderedEquals(actualModified, expected);
} }
private static String stringRepresentation(Object member) {
if (member instanceof PsiClass) {
return "class:" + ((PsiClass) member).getName();
}
if (member instanceof PsiMethod) {
return "method:" + ((PsiMethod) member).getName();
}
throw new IllegalStateException("Do not know how to render member of type: " + member.getClass().getName());
}
protected String getPathToFile() { protected String getPathToFile() {
return getTestDataPath() + File.separator + getName() + ".kt"; return getTestDataPath() + File.separator + getName() + ".kt";
} }