diff --git a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java index 8b2fcef810f..ab6a660174d 100644 --- a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java @@ -22,6 +22,7 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiField; import com.intellij.psi.PsiMethod; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.util.Query; @@ -92,6 +93,16 @@ public abstract class AbstractSearcherTest extends LightCodeInsightFixtureTestCa assertOrderedEquals(actualModified, expected); } + protected void checkClassWithDirectives() throws IOException { + myFixture.configureByFile(getFileName()); + List directives = InTextDirectivesUtils.findListWithPrefixes( + FileUtil.loadFile(new File(getPathToFile()), true), "// CLASS: "); + assertFalse("Specify CLASS directive in test file", directives.isEmpty()); + String superClassName = directives.get(0); + PsiClass psiClass = getPsiClass(superClassName); + checkResult(ClassInheritorsSearch.search(psiClass, getProjectScope(), false)); + } + private static String stringRepresentation(Object member) { if (member instanceof PsiClass) { return "class:" + ((PsiClass) member).getName(); diff --git a/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java b/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java index 6e13a653eb5..1f5bbc940dc 100644 --- a/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java @@ -16,15 +16,10 @@ package org.jetbrains.kotlin.search; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.psi.PsiClass; -import com.intellij.psi.search.searches.ClassInheritorsSearch; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; -import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; import java.io.IOException; -import java.util.List; public class ClassInheritorsSearchTest extends AbstractSearcherTest { @@ -37,17 +32,11 @@ public class ClassInheritorsSearchTest extends AbstractSearcherTest { } private void doTest() throws IOException { - myFixture.configureByFile(getFileName()); - List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile()), true), "// CLASS: "); - assertFalse("Specify CLASS directive in test file", directives.isEmpty()); - String superClassName = directives.get(0); - PsiClass psiClass = getPsiClass(superClassName); - checkResult(ClassInheritorsSearch.search(psiClass, getProjectScope(), false)); + checkClassWithDirectives(); } @Override protected String getTestDataPath() { return new File(PluginTestCaseBase.getTestDataPathBase(), "/search/inheritance").getPath() + File.separator; } - } diff --git a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java index 7ad1f75b427..52ab1374e39 100644 --- a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java @@ -20,7 +20,6 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.search.searches.AnnotatedMembersSearch; -import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor; @@ -52,12 +51,7 @@ public class JUnitMembersSearcherTest extends AbstractSearcherTest { } private void doJUnit3test() throws IOException { - myFixture.configureByFile(getFileName()); - List directives = InTextDirectivesUtils.findListWithPrefixes(FileUtil.loadFile(new File(getPathToFile()), true), "// CLASS: "); - assertFalse("Specify CLASS directive in test file", directives.isEmpty()); - String superClassName = directives.get(0); - PsiClass psiClass = getPsiClass(superClassName); - checkResult(ClassInheritorsSearch.search(psiClass, getProjectScope(), false)); + checkClassWithDirectives(); } private void doJUnit4test() throws IOException {