From d2a308964d9c52d3e0be28263eb9fbf8b5766d09 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 15 Nov 2012 19:16:21 +0400
Subject: [PATCH] Skipping java.util.Collection and similar classes in
 JdkAnnotationsSanityTest.

---
 .../jet/jvm/compiler/JdkAnnotationsSanityTest.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
index f1b30b24387..b037a481d67 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsSanityTest.java
@@ -38,7 +38,9 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
 import org.jetbrains.jet.lang.descriptors.*;
 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.JavaToKotlinClassMap;
 import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
 import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -74,7 +76,7 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment {
         final BindingContext bindingContext = injector.getBindingTrace().getBindingContext();
         JavaDescriptorResolver javaDescriptorResolver = injector.getJavaDescriptorResolver();
 
-        final Map<DeclarationDescriptor, String> errors = Maps.newLinkedHashMap();
+        final Map<DeclarationDescriptor, String> errors = Maps.newHashMap();
 
         Iterable<FqName> affectedClasses = getAffectedClasses(kotlinAnnotationsRoot);
         AlternativeSignatureErrorFindingVisitor visitor = new AlternativeSignatureErrorFindingVisitor(bindingContext, errors);
@@ -218,6 +220,11 @@ public class JdkAnnotationsSanityTest extends KotlinTestWithEnvironment {
 
         @Override
         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());
         }