From cc6d7e420c46af7f56ab98892015000f6f3e257a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 11 Sep 2014 21:03:17 +0400 Subject: [PATCH] LTDA: Test problem - skip LazyEntity in search for closest interface --- .../jet/test/util/RecursiveDescriptorProcessorTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java index 67f4fcabca2..beb5ce65d4c 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java @@ -24,6 +24,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; +import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.utils.Printer; @@ -66,10 +67,12 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment private static Class closestInterface(Class aClass) { if (aClass == null) return null; - if (aClass.isInterface()) return aClass; + if (aClass.isInterface() && aClass != LazyEntity.class) return aClass; Class[] interfaces = aClass.getInterfaces(); - if (interfaces.length > 0) return interfaces[0]; + for (Class anInterface : interfaces) { + if (anInterface != LazyEntity.class) return anInterface; + } return closestInterface(aClass.getSuperclass()); }