From 549a652aeac92e5f1186242fb5d0c384502985f6 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 21 Apr 2010 18:27:39 +0400
Subject: [PATCH] NPE

---
 .../intellij/testAssistant/TestDataReferenceCollector.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataReferenceCollector.java b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataReferenceCollector.java
index bb6e69ccf27e..f8b9460ee371 100644
--- a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataReferenceCollector.java
+++ b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataReferenceCollector.java
@@ -16,6 +16,7 @@
 package com.intellij.testAssistant;
 
 import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.NullableComputable;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.testFramework.UsefulTestCase;
@@ -90,7 +91,7 @@ public class TestDataReferenceCollector {
     final PsiExpression[] arguments = expression.getArgumentList().getExpressions();
     for (int i = 0; i < arguments.length && i < parameters.length; i++) {
       final int finalI = i;
-      result.put(parameters [i].getName(), new Computable<String>() {
+      result.put(parameters [i].getName(), new NullableComputable<String>() {
         public String compute() {
           return evaluate(arguments [finalI], Collections.<String, Computable<String>>emptyMap());
         }
@@ -121,7 +122,8 @@ public class TestDataReferenceCollector {
       final PsiElement result = ((PsiReferenceExpression)expression).resolve();
       if (result instanceof PsiParameter) {
         final String name = ((PsiParameter)result).getName();
-        return arguments.get(name).compute();
+        final Computable<String> arg = arguments.get(name);
+        return arg == null ? null : arg.compute();
       }
       if (result instanceof PsiVariable) {
         final PsiExpression initializer = ((PsiVariable)result).getInitializer();