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

Fix CompileKotlinAgainstCustomBinariesTest

Browse Source 
The two cases are almost irrelevant now that objects aren't resolved to
properties anymore
This commit is contained in:
Alexander Udalov
2013-11-01 20:26:47 +04:00
parent cb6c98d4d6
commit ce481b08d8
4 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/compileKotlinAgainstCustomBinaries/brokenJarWithNoClassForObject/brokenJarWithNoClassForObject.kt
+1
View File
@@ -0,0 +1 @@
package test
compiler/testData/compileKotlinAgainstCustomBinaries/brokenJarWithNoClassForObjectProperty/library/source.kt → compiler/testData/compileKotlinAgainstCustomBinaries/brokenJarWithNoClassForObject/library/source.kt
View File
compiler/testData/compileKotlinAgainstCustomBinaries/brokenJarWithNoClassForObjectProperty/brokenJarWithNoClassForObjectProperty.kt
-1
View File
@@ -1 +0,0 @@
package test
compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
+7 -13
View File
@@ -25,13 +25,12 @@ import org.jetbrains.jet.MockLibraryUtil;
import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.TestJdkKind;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptorForObject;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.test.TestCaseWithTmpdir;
import org.jetbrains.jet.test.util.DescriptorValidator; import org.jetbrains.jet.test.util.DescriptorValidator;
import org.jetbrains.jet.test.util.NamespaceComparator; import org.jetbrains.jet.test.util.NamespaceComparator;
@@ -46,6 +45,7 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isObject;
import static org.jetbrains.jet.test.util.NamespaceComparator.validateAndCompareNamespaceWithFile; import static org.jetbrains.jet.test.util.NamespaceComparator.validateAndCompareNamespaceWithFile;
public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
@@ -140,22 +140,16 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir {
Collection<DeclarationDescriptor> allDescriptors = analyzeAndGetAllDescriptors(compileLibrary("library")); Collection<DeclarationDescriptor> allDescriptors = analyzeAndGetAllDescriptors(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("Wrong name: " + descriptor, descriptor.getName().asString().equals("Lol"));
assertTrue(descriptor instanceof VariableDescriptorForObject); assertTrue("Should be an object: " + descriptor, isObject(descriptor));
assertFalse("Object property should have valid class", assertNotNull("Object should have a class object: " + descriptor, ((ClassDescriptor) descriptor).getClassObjectDescriptor());
ErrorUtils.isError(((VariableDescriptorForObject) descriptor).getObjectClass()));
} }
} }
public void testBrokenJarWithNoClassForObjectProperty() throws Exception { public void testBrokenJarWithNoClassForObject() throws Exception {
File brokenJar = copyJarFileWithoutEntry(compileLibrary("library"), "test/Lol.class"); File brokenJar = copyJarFileWithoutEntry(compileLibrary("library"), "test/Lol.class");
Collection<DeclarationDescriptor> allDescriptors = analyzeAndGetAllDescriptors(brokenJar); Collection<DeclarationDescriptor> allDescriptors = analyzeAndGetAllDescriptors(brokenJar);
assertEquals(allDescriptors.size(), 1); assertEmpty("No descriptors should be found: " + allDescriptors, allDescriptors);
DeclarationDescriptor descriptor = allDescriptors.iterator().next();
assertTrue(descriptor.getName().asString().equals("Lol"));
assertTrue(descriptor instanceof VariableDescriptorForObject);
assertTrue("Object property should have an error class",
ErrorUtils.isError(((VariableDescriptorForObject) descriptor).getObjectClass()));
} }
public void testDuplicateLibraries() throws Exception { public void testDuplicateLibraries() throws Exception {