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

Skipping java.util.Collection and similar classes in JdkAnnotationsSanityTest.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-15 19:16:21 +04:00
parent d1f217f2df
commit d2a308964d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
+8 -1
View File
@@ -38,7 +38,9 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.di.InjectorForJavaSemanticServices; import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -74,7 +76,7 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment {
final BindingContext bindingContext = injector.getBindingTrace().getBindingContext(); final BindingContext bindingContext = injector.getBindingTrace().getBindingContext();
JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver(); JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver();
final Map<DeclarationDescriptor, String> errors = Maps.newLinkedHashMap(); final Map<DeclarationDescriptor, String> errors = Maps.newHashMap();
Iterable<FqName> affectedClasses = getAffectedClasses(kotlinAnnotationsRoot); Iterable<FqName> affectedClasses = getAffectedClasses(kotlinAnnotationsRoot);
AlternativeSignatureErrorFindingVisitor visitor = new AlternativeSignatureErrorFindingVisitor(bindingContext, errors); AlternativeSignatureErrorFindingVisitor visitor = new AlternativeSignatureErrorFindingVisitor(bindingContext, errors);
@@ -218,6 +220,11 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment {
@Override @Override
public Void visitClassDescriptor(ClassDescriptor descriptor, Void data) { public Void visitClassDescriptor(ClassDescriptor descriptor, Void data) {
// skip java.util.Collection, etc.
if (!JavaToKotlinClassMap.getInstance().mapPlatformClass(DescriptorUtils.getFQName(descriptor).toSafe()).isEmpty()) {
return null;
}
return visitDeclarationRecursively(descriptor, descriptor.getDefaultType().getMemberScope()); return visitDeclarationRecursively(descriptor, descriptor.getDefaultType().getMemberScope());
} }