From 57678a55066ea4c396d91c3925c38236352989fe Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 13 Nov 2013 18:22:51 +0400 Subject: [PATCH] Fix AnnotationDescriptorResolveTest, objects are now classes in scopes --- .../annotation/AnnotationDescriptorResolveTest.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java index 9f29ccf454b..e4def39223a 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java @@ -162,7 +162,7 @@ public class AnnotationDescriptorResolveTest extends JetLiteFixture { checkDescriptor(expectedAnnotation, topProp.getGetter()); checkDescriptor(expectedAnnotation, topProp.getSetter()); - checkDescriptor(expectedAnnotation, getObjectDescriptor(test, "MyObject")); + checkDescriptor(expectedAnnotation, getClassDescriptor(test, "MyObject")); checkDescriptor(expectedAnnotation, getConstructorParameterDescriptor(myClass, "consProp")); checkDescriptor(expectedAnnotation, getConstructorParameterDescriptor(myClass, "param")); @@ -209,18 +209,10 @@ public class AnnotationDescriptorResolveTest extends JetLiteFixture { Name className = Name.identifier(name); ClassifierDescriptor aClass = namespaceDescriptor.getMemberScope().getClassifier(className); assertNotNull("Failed to find class: " + namespaceDescriptor.getName() + "." + className, aClass); - assert aClass instanceof ClassDescriptor; + assert aClass instanceof ClassDescriptor : "Not a class: " + aClass; return (ClassDescriptor) aClass; } - @NotNull - private static ClassDescriptor getObjectDescriptor(@NotNull NamespaceDescriptor namespaceDescriptor, @NotNull String name) { - Name className = Name.identifier(name); - ClassDescriptor aClass = namespaceDescriptor.getMemberScope().getObjectDescriptor(className); - assertNotNull("Failed to find class: " + namespaceDescriptor.getName() + "." + className, aClass); - return aClass; - } - @NotNull private static ClassDescriptor getClassObjectDescriptor(@NotNull ClassDescriptor classDescriptor) { ClassDescriptor objectDescriptor = classDescriptor.getClassObjectDescriptor();