From 8d110e4a30fce3a4ef6c1d29fc005c2362fafffe Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 13 Jun 2013 15:40:02 +0400 Subject: [PATCH] Properly memoize classes in tests --- .../serialization/AbstractDescriptorSerializationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java index 1ca932e9a66..bda03d48f7d 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java @@ -381,13 +381,13 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith @Nullable @Override public ClassDescriptor resolveNestedClass(@NotNull ClassDescriptor outerClass, @NotNull Name name) { - return resolveClass(outerClass, classId.createNestedClassId(name)); + return findClass(classId.createNestedClassId(name)); } @Nullable @Override public ClassDescriptor resolveClassObject(@NotNull ClassDescriptor outerClass) { - return resolveClass(outerClass, classId.createNestedClassId(Name.identifier(JvmAbi.CLASS_OBJECT_CLASS_NAME))); + return findClass(classId.createNestedClassId(Name.identifier(JvmAbi.CLASS_OBJECT_CLASS_NAME))); } };