From 50feff7ed301afd1d9784bc4b7c53cbe40794b1a Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 22 May 2015 19:06:42 +0200
Subject: [PATCH] avoid runtime class names in run configurations (IDEA-140615)

---
 .../impl/src/com/intellij/execution/ui/ClassBrowser.java  | 2 +-
 .../testng/configuration/TestNGConfigurationEditor.java   | 8 ++++----
 .../testng/configuration/browser/TestClassBrowser.java    | 2 +-
 .../theoryinpractice/testng/model/TestNGTestClass.java    | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/ui/ClassBrowser.java b/java/execution/impl/src/com/intellij/execution/ui/ClassBrowser.java
index 827dbbf736ce..522456e711bf 100644
--- a/java/execution/impl/src/com/intellij/execution/ui/ClassBrowser.java
+++ b/java/execution/impl/src/com/intellij/execution/ui/ClassBrowser.java
@@ -60,7 +60,7 @@ public abstract class ClassBrowser extends BrowseModuleValueActionListener {
     final PsiClass psiClass = dialog.getSelected();
     if (psiClass == null) return null;
     onClassChoosen(psiClass);
-    return JavaExecutionUtil.getRuntimeQualifiedName(psiClass);
+    return psiClass.getQualifiedName();
   }
 
   protected TreeClassChooser createClassChooser(ClassFilter.ClassFilterWithScope classFilter) {
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
index 9a4b4d74635b..9fdaa87144f3 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
@@ -44,10 +44,7 @@ import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.*;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.JavaCodeFragment;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiMethod;
+import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBList;
@@ -403,6 +400,9 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
     classField.setComponent(new EditorTextFieldWithBrowseButton(project, true, new JavaCodeFragment.VisibilityChecker() {
       @Override
       public Visibility isDeclarationVisible(PsiElement declaration, PsiElement place) {
+        if (declaration instanceof PsiClass && place.getParent() instanceof PsiJavaCodeReferenceElement) {
+          return Visibility.VISIBLE;
+        }
         try {
           if (declaration instanceof PsiClass &&
               new TestClassBrowser(project, TestNGConfigurationEditor.this).getFilter().isAccepted((PsiClass)declaration)) {
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/TestClassBrowser.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/TestClassBrowser.java
index 7fbd8b2733b0..106e97d4bf80 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/TestClassBrowser.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/browser/TestClassBrowser.java
@@ -62,7 +62,7 @@ public class TestClassBrowser extends BrowseModuleValueActionListener
       return null;
     } else {
       onClassChoosen(psiclass);
-      return JavaExecutionUtil.getRuntimeQualifiedName(psiclass);
+      return psiclass.getQualifiedName();
     }
   }
 
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestClass.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestClass.java
index f41ace51e870..c1638f543b6f 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestClass.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestNGTestClass.java
@@ -80,7 +80,8 @@ public class TestNGTestClass extends TestNGTestObject {
     if (scope == null) {
       throw new RuntimeConfigurationException("Invalid scope specified");
     }
-    PsiClass psiClass = JavaPsiFacade.getInstance(myConfig.getProject()).findClass(data.getMainClassName(), scope.getGlobalSearchScope());
+    final PsiManager manager = PsiManager.getInstance(myConfig.getProject());
+    final PsiClass psiClass = ClassUtil.findPsiClass(manager, data.getMainClassName(), null, true, scope.getGlobalSearchScope());
     if (psiClass == null) throw new RuntimeConfigurationException("Class '" + data.getMainClassName() + "' not found");
   }