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

Fix AnnotationDescriptorResolveTest, objects are now classes in scopes

Browse Source
This commit is contained in:
Alexander Udalov
2013-11-13 18:22:51 +04:00
parent 6f930ef725
commit 57678a5506
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveTest.java
+2 -10
View File
@@ -162,7 +162,7 @@ public class AnnotationDescriptorResolveTest extends JetLiteFixture {
checkDescriptor(expectedAnnotation, topProp.getGetter()); checkDescriptor(expectedAnnotation, topProp.getGetter());
checkDescriptor(expectedAnnotation, topProp.getSetter()); checkDescriptor(expectedAnnotation, topProp.getSetter());
checkDescriptor(expectedAnnotation, getObjectDescriptor(test, "MyObject")); checkDescriptor(expectedAnnotation, getClassDescriptor(test, "MyObject"));
checkDescriptor(expectedAnnotation, getConstructorParameterDescriptor(myClass, "consProp")); checkDescriptor(expectedAnnotation, getConstructorParameterDescriptor(myClass, "consProp"));
checkDescriptor(expectedAnnotation, getConstructorParameterDescriptor(myClass, "param")); checkDescriptor(expectedAnnotation, getConstructorParameterDescriptor(myClass, "param"));
@@ -209,18 +209,10 @@ public class AnnotationDescriptorResolveTest extends JetLiteFixture {
Name className = Name.identifier(name); Name className = Name.identifier(name);
ClassifierDescriptor aClass = namespaceDescriptor.getMemberScope().getClassifier(className); ClassifierDescriptor aClass = namespaceDescriptor.getMemberScope().getClassifier(className);
assertNotNull("Failed to find class: " + namespaceDescriptor.getName() + "." + className, aClass); assertNotNull("Failed to find class: " + namespaceDescriptor.getName() + "." + className, aClass);
assert aClass instanceof ClassDescriptor; assert aClass instanceof ClassDescriptor : "Not a class: " + aClass;
return (ClassDescriptor) 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 @NotNull
private static ClassDescriptor getClassObjectDescriptor(@NotNull ClassDescriptor classDescriptor) { private static ClassDescriptor getClassObjectDescriptor(@NotNull ClassDescriptor classDescriptor) {
ClassDescriptor objectDescriptor = classDescriptor.getClassObjectDescriptor(); ClassDescriptor objectDescriptor = classDescriptor.getClassObjectDescriptor();