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

LTDA: Test problem - skip LazyEntity in search for closest interface

Browse Source
This commit is contained in:
Nikolay Krasko
2014-09-11 21:03:17 +04:00
parent 0fa001ed01
commit cc6d7e420c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java
+5 -2
View File
@@ -24,6 +24,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; 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.FqName;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer; import org.jetbrains.jet.utils.Printer;
@@ -66,10 +67,12 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment
private static Class closestInterface(Class<?> aClass) { private static Class closestInterface(Class<?> aClass) {
if (aClass == null) return null; if (aClass == null) return null;
if (aClass.isInterface()) return aClass; if (aClass.isInterface() && aClass != LazyEntity.class) return aClass;
Class<?>[] interfaces = aClass.getInterfaces(); 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()); return closestInterface(aClass.getSuperclass());
} }