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

Minor: extract common method to base class

Browse Source
This commit is contained in:
Nikolay Krasko
2017-04-11 16:30:00 +03:00
parent 9748c7d068
commit 65c1a2d732
3 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java
+11
View File
@@ -22,6 +22,7 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiField; import com.intellij.psi.PsiField;
import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiMethod;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import com.intellij.util.Query; import com.intellij.util.Query;
@@ -92,6 +93,16 @@ public abstract class AbstractSearcherTest extends LightCodeInsightFixtureTestCa
assertOrderedEquals(actualModified, expected); assertOrderedEquals(actualModified, expected);
} }
protected void checkClassWithDirectives() throws IOException {
myFixture.configureByFile(getFileName());
List<String> 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) { private static String stringRepresentation(Object member) {
if (member instanceof PsiClass) { if (member instanceof PsiClass) {
return "class:" + ((PsiClass) member).getName(); return "class:" + ((PsiClass) member).getName();
idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java
+1 -12
View File
@@ -16,15 +16,10 @@
package org.jetbrains.kotlin.search; 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.idea.test.PluginTestCaseBase;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.List;
public class ClassInheritorsSearchTest extends AbstractSearcherTest { public class ClassInheritorsSearchTest extends AbstractSearcherTest {
@@ -37,17 +32,11 @@ public class ClassInheritorsSearchTest extends AbstractSearcherTest {
} }
private void doTest() throws IOException { private void doTest() throws IOException {
myFixture.configureByFile(getFileName()); checkClassWithDirectives();
List<String> 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));
} }
@Override @Override
protected String getTestDataPath() { protected String getTestDataPath() {
return new File(PluginTestCaseBase.getTestDataPathBase(), "/search/inheritance").getPath() + File.separator; return new File(PluginTestCaseBase.getTestDataPathBase(), "/search/inheritance").getPath() + File.separator;
} }
} }
idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java
+1 -7
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import com.intellij.psi.search.searches.AnnotatedMembersSearch; import com.intellij.psi.search.searches.AnnotatedMembersSearch;
import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor; import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor;
@@ -52,12 +51,7 @@ public class JUnitMembersSearcherTest extends AbstractSearcherTest {
} }
private void doJUnit3test() throws IOException { private void doJUnit3test() throws IOException {
myFixture.configureByFile(getFileName()); checkClassWithDirectives();
List<String> 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 void doJUnit4test() throws IOException { private void doJUnit4test() throws IOException {