diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index b8695b57b85..84cdc62c6eb 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -195,11 +195,12 @@ public abstract class ExpectedResolveData { PsiElement element = position.getElement(); JetReferenceExpression referenceExpression = PsiTreeUtil.getParentOfType(element, JetReferenceExpression.class); + DeclarationDescriptor referenceTarget = bindingContext.get(REFERENCE_TARGET, referenceExpression); if ("!".equals(name)) { assertTrue( "Must have been unresolved: " + renderReferenceInContext(referenceExpression) + - " but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)), + " but was resolved to " + renderNullableDescriptor(referenceTarget), unresolvedReferences.contains(referenceExpression)); continue; } @@ -207,7 +208,7 @@ public abstract class ExpectedResolveData { assertTrue( "Must have been resolved to multiple descriptors: " + renderReferenceInContext(referenceExpression) + - " but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)), + " but was resolved to " + renderNullableDescriptor(referenceTarget), bindingContext.get(AMBIGUOUS_REFERENCE_TARGET, referenceExpression) != null); continue; } @@ -215,8 +216,8 @@ public abstract class ExpectedResolveData { assertTrue( "Must have been resolved to null: " + renderReferenceInContext(referenceExpression) + - " but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)), - bindingContext.get(REFERENCE_TARGET, referenceExpression) == null + " but was resolved to " + renderNullableDescriptor(referenceTarget), + referenceTarget == null ); continue; } @@ -224,8 +225,8 @@ public abstract class ExpectedResolveData { assertTrue( "Must have been resolved to error: " + renderReferenceInContext(referenceExpression) + - " but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)), - ErrorUtils.isError(bindingContext.get(REFERENCE_TARGET, referenceExpression)) + " but was resolved to " + renderNullableDescriptor(referenceTarget), + ErrorUtils.isError(referenceTarget) ); continue; }