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

Minor, use List<File> directly instead of Function0

Browse Source
This commit is contained in:
Alexander Udalov
2013-10-10 18:58:58 +04:00
parent 102ced153c
commit e6259deb8c
1 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
+11 -33
View File
@@ -18,7 +18,6 @@ package org.jetbrains.jet.jvm.compiler;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import jet.Function0;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.JetTestUtils;
@@ -61,10 +60,10 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
return MockLibraryUtil.compileLibraryToJar(new File(getTestDataDirectory(), sourcePath).getPath()); return MockLibraryUtil.compileLibraryToJar(new File(getTestDataDirectory(), sourcePath).getPath());
} }
private void doTestWithTxt(@NotNull Function0<List<File>> classPathProducer) throws Exception { private void doTestWithTxt(@NotNull File... extraClassPath) throws Exception {
File ktFile = new File(getTestDataDirectory(), getTestName(false) + ".kt"); File ktFile = new File(getTestDataDirectory(), getTestName(false) + ".kt");
NamespaceDescriptor namespace = analyzeFileToNamespace(ktFile, classPathProducer); NamespaceDescriptor namespace = analyzeFileToNamespace(ktFile, extraClassPath);
NamespaceComparator.Configuration comparator = NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT.withValidationStrategy( NamespaceComparator.Configuration comparator = NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT.withValidationStrategy(
DescriptorValidator.ValidationVisitor.ALLOW_ERROR_TYPES); DescriptorValidator.ValidationVisitor.ALLOW_ERROR_TYPES);
@@ -73,9 +72,8 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
} }
@NotNull @NotNull
private NamespaceDescriptor analyzeFileToNamespace(@NotNull File ktFile, @NotNull Function0<List<File>> classPathProducer) private NamespaceDescriptor analyzeFileToNamespace(@NotNull File ktFile, @NotNull File... extraClassPath) throws IOException {
throws IOException { Project project = createEnvironment(Arrays.asList(extraClassPath)).getProject();
Project project = createEnvironment(classPathProducer.invoke()).getProject();
BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration( BindingContext bindingContext = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegration(
JetTestUtils.loadJetFile(project, ktFile), JetTestUtils.loadJetFile(project, ktFile),
@@ -99,10 +97,9 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
} }
@NotNull @NotNull
private Collection<DeclarationDescriptor> analyzeAndGetAllDescriptors(@NotNull Function0<List<File>> classPathProducer) private Collection<DeclarationDescriptor> analyzeAndGetAllDescriptors(@NotNull File... extraClassPath) throws IOException {
throws IOException {
File ktFile = new File(getTestDataDirectory(), getTestName(true) + ".kt"); File ktFile = new File(getTestDataDirectory(), getTestName(true) + ".kt");
return analyzeFileToNamespace(ktFile, classPathProducer).getMemberScope().getAllDescriptors(); return analyzeFileToNamespace(ktFile, extraClassPath).getMemberScope().getAllDescriptors();
} }
@NotNull @NotNull
@@ -138,12 +135,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
public void testDuplicateObjectInBinaryAndSources() throws Exception { public void testDuplicateObjectInBinaryAndSources() throws Exception {
Collection<DeclarationDescriptor> allDescriptors = analyzeAndGetAllDescriptors(new Function0<List<File>>() { Collection<DeclarationDescriptor> allDescriptors = analyzeAndGetAllDescriptors(compileLibrary("library"));
@Override
public List<File> invoke() {
return Collections.singletonList(compileLibrary("library"));
}
});
assertEquals(allDescriptors.size(), 2); assertEquals(allDescriptors.size(), 2);
for (DeclarationDescriptor descriptor : allDescriptors) { for (DeclarationDescriptor descriptor : allDescriptors) {
assertTrue(descriptor.getName().asString().equals("Lol")); assertTrue(descriptor.getName().asString().equals("Lol"));
@@ -154,12 +146,8 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
} }
public void testBrokenJarWithNoClassForObjectProperty() throws Exception { public void testBrokenJarWithNoClassForObjectProperty() throws Exception {
Collection<DeclarationDescriptor> allDescriptors = analyzeAndGetAllDescriptors(new Function0<List<File>>() { File brokenJar = copyJarFileWithoutEntry(compileLibrary("library"), "test/Lol.class");
@Override Collection<DeclarationDescriptor> allDescriptors = analyzeAndGetAllDescriptors(brokenJar);
public List<File> invoke() {
return Collections.singletonList(copyJarFileWithoutEntry(compileLibrary("library"), "test/Lol.class"));
}
});
assertEquals(allDescriptors.size(), 1); assertEquals(allDescriptors.size(), 1);
DeclarationDescriptor descriptor = allDescriptors.iterator().next(); DeclarationDescriptor descriptor = allDescriptors.iterator().next();
assertTrue(descriptor.getName().asString().equals("Lol")); assertTrue(descriptor.getName().asString().equals("Lol"));
@@ -169,20 +157,10 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
} }
public void testDuplicateLibraries() throws Exception { public void testDuplicateLibraries() throws Exception {
doTestWithTxt(new Function0<List<File>>() { doTestWithTxt(compileLibrary("library-1"), compileLibrary("library-2"));
@Override
public List<File> invoke() {
return Arrays.asList(compileLibrary("library-1"), compileLibrary("library-2"));
}
});
} }
public void testMissingEnumReferencedInAnnotation() throws Exception { public void testMissingEnumReferencedInAnnotation() throws Exception {
doTestWithTxt(new Function0<List<File>>() { doTestWithTxt(copyJarFileWithoutEntry(compileLibrary("library"), "test/E.class"));
@Override
public List<File> invoke() {
return Collections.singletonList(copyJarFileWithoutEntry(compileLibrary("library"), "test/E.class"));
}
});
} }
} }