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

fix tests to put test data in proper place (source root)

Browse Source
This commit is contained in:
Dmitry Batkovich
2018-05-17 12:20:51 +03:00
parent d03c794b64
commit cd891ed788
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferenceDataInCompletionTest.java
+2 -1
View File
@@ -36,6 +36,7 @@ public class CompilerReferenceDataInCompletionTest extends CompilerReferencesTes
@Override
public void setUp() throws Exception {
super.setUp();
myFixture.setTestDataPath(getTestDataPath() + getName());
installCompiler();
}
@@ -104,7 +105,7 @@ public class CompilerReferenceDataInCompletionTest extends CompilerReferencesTes
@NotNull String phraseToComplete,
@NotNull String[] expectedOrder,
@NotNull Predicate<PsiMember> resultFilter) {
myFixture.configureByFiles(ContainerUtil.map2Array(files, String.class, f -> getName() + "/" + f));
myFixture.configureByFiles(files);
myFixture.type(phraseToComplete);
final int offset = myFixture.getCaretOffset();
final LookupElement[] completionVariantsBeforeCompilation = myFixture.complete(CompletionType.BASIC);
java/java-tests/testSrc/com/intellij/java/compiler/CompilerReferencesTest.java
+17 -15
View File
@@ -5,6 +5,7 @@ import com.intellij.JavaTestUtil;
import com.intellij.compiler.CompilerDirectHierarchyInfo;
import com.intellij.compiler.CompilerReferenceService;
import com.intellij.compiler.backwardRefs.CompilerReferenceServiceImpl;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
@@ -36,15 +37,16 @@ public class CompilerReferencesTest extends CompilerReferencesTestBase {
public void setUp() throws Exception {
super.setUp();
installCompiler();
myFixture.setTestDataPath(getTestDataPath() + getName() + "/");
}
public void testIsNotReady() {
myFixture.configureByFile(getName() + "/Foo.java");
myFixture.configureByFile("Foo.java");
assertNull(getReferentFilesForElementUnderCaret());
}
public void testSimpleUsagesInFullyCompiledProject() {
myFixture.configureByFiles(getName() + "/Foo.java", getName() + "/Bar.java", getName() + "/Baz.java", getName() + "/FooImpl.java");
myFixture.configureByFiles("Foo.java", "Bar.java", "Baz.java", "FooImpl.java");
rebuildProject();
final Set<VirtualFile> referents = getReferentFilesForElementUnderCaret();
@@ -57,7 +59,7 @@ public class CompilerReferencesTest extends CompilerReferencesTestBase {
}
public void testLambda() {
myFixture.configureByFiles(getName() + "/Foo.java", getName() + "/FooImpl.java", getName() + "/Bar.java", getName() + "/BarRef.java");
myFixture.configureByFiles("Foo.java", "FooImpl.java", "Bar.java", "BarRef.java");
rebuildProject();
final CompilerDirectHierarchyInfo funExpressions = getFunctionalExpressionsForElementUnderCaret();
List<PsiFunctionalExpression> funExprs = funExpressions.getHierarchyChildren().map(PsiFunctionalExpression.class::cast).collect(Collectors.toList());
@@ -65,7 +67,7 @@ public class CompilerReferencesTest extends CompilerReferencesTestBase {
}
public void testInnerFunExpressions() {
myFixture.configureByFiles(getName() + "/Foo.java");
myFixture.configureByFiles("Foo.java");
rebuildProject();
List<PsiFunctionalExpression> funExpressions =
getFunExpressionsFor(myFixture.getJavaFacade().findClass(CommonClassNames.JAVA_LANG_RUNNABLE))
@@ -88,7 +90,7 @@ public class CompilerReferencesTest extends CompilerReferencesTestBase {
}
public void testHierarchy() {
myFixture.configureByFiles(getName() + "/Foo.java", getName() + "/FooImpl.java", getName() + "/Bar.java", getName() + "/Baz.java", getName() + "/Test.java");
myFixture.configureByFiles("Foo.java", "FooImpl.java", "Bar.java", "Baz.java", "Test.java");
rebuildProject();
CompilerDirectHierarchyInfo directInheritorInfo = getHierarchyForElementUnderCaret();
@@ -104,7 +106,7 @@ public class CompilerReferencesTest extends CompilerReferencesTestBase {
}
public void testHierarchyOfLibClass() {
myFixture.configureByFiles(getName() + "/Foo.java");
myFixture.configureByFiles("Foo.java");
rebuildProject();
CompilerDirectHierarchyInfo directInheritorInfo = getDirectInheritorsFor(myFixture.getJavaFacade().findClass(CommonClassNames.JAVA_UTIL_LIST));
PsiClass inheritor = assertOneElement(directInheritorInfo.getHierarchyChildren().map(PsiClass.class::cast).collect(Collectors.toList()));
@@ -113,13 +115,13 @@ public class CompilerReferencesTest extends CompilerReferencesTestBase {
public void testNestedAnonymousInheritors() {
myFixture.configureByFiles(getName() + "/Anonymouses.java",
getName() + "/Foo1.java",
getName() + "/Foo2.java",
getName() + "/Foo3.java",
getName() + "/Foo4.java",
getName() + "/Foo5.java",
getName() + "/Foo6.java");
myFixture.configureByFiles("Anonymouses.java",
"Foo1.java",
"Foo2.java",
"Foo3.java",
"Foo4.java",
"Foo5.java",
"Foo6.java");
rebuildProject();
PsiClass[] classes = IntStream
@@ -143,7 +145,7 @@ public class CompilerReferencesTest extends CompilerReferencesTestBase {
}
public void testExtensionRename() {
VirtualFile file = myFixture.configureByFiles(getName() + "/Bar.java", getName() + "/Foo.txt")[1].getVirtualFile();
VirtualFile file = myFixture.configureByFiles("Bar.java", "Foo.txt")[1].getVirtualFile();
rebuildProject();
assertOneElement(getReferentFilesForElementUnderCaret());
myFixture.renameElement(getPsiManager().findFile(file), "Foo.java");
@@ -156,7 +158,7 @@ public class CompilerReferencesTest extends CompilerReferencesTestBase {
}
public void testReverseExtensionRename() {
VirtualFile file = myFixture.configureByFiles(getName() + "/Bar.java", getName() + "/Foo.java")[1].getVirtualFile();
VirtualFile file = myFixture.configureByFiles("Bar.java", "Foo.java")[1].getVirtualFile();
rebuildProject();
assertSize(2, getReferentFilesForElementUnderCaret());
myFixture.renameElement(getPsiManager().findFile(file), "Foo.txt");