From f2283ab50dec04328717d97f577c80033f8fb9ca Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 1 Sep 2011 12:49:17 +0200
Subject: [PATCH] testng: jvm format expected in generated testng.xml
 (IDEA-73791 )

---
 .../src/com/intellij/psi/util/ClassUtil.java   | 18 +++++++++++++++---
 .../configuration/SearchingForTestsTask.java   |  7 ++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/java/openapi/src/com/intellij/psi/util/ClassUtil.java b/java/openapi/src/com/intellij/psi/util/ClassUtil.java
index ec81618addd0..18038c40c13d 100644
--- a/java/openapi/src/com/intellij/psi/util/ClassUtil.java
+++ b/java/openapi/src/com/intellij/psi/util/ClassUtil.java
@@ -200,18 +200,30 @@ public class ClassUtil {
   }
 
   @Nullable
-  public static PsiClass findPsiClass(final PsiManager psiManager, String externalName, PsiClass psiClass, boolean jvmCompatible) {
+  public static PsiClass findPsiClass(final PsiManager psiManager,
+                                      String externalName,
+                                      PsiClass psiClass,
+                                      boolean jvmCompatible) {
+    return findPsiClass(psiManager, externalName, psiClass, jvmCompatible, GlobalSearchScope.allScope(psiManager.getProject()));
+  }
+
+  @Nullable
+  public static PsiClass findPsiClass(final PsiManager psiManager,
+                                      String externalName,
+                                      @Nullable PsiClass psiClass,
+                                      boolean jvmCompatible, 
+                                      final GlobalSearchScope scope) {
     final int topIdx = externalName.indexOf('$');
     if (topIdx > -1) {
       if (psiClass == null) {
         psiClass = JavaPsiFacade.getInstance(psiManager.getProject())
-          .findClass(externalName.substring(0, topIdx), GlobalSearchScope.allScope(psiManager.getProject()));
+          .findClass(externalName.substring(0, topIdx), scope);
       }
       if (psiClass == null) return null;
       externalName = externalName.substring(topIdx + 1);
       return findSubclass(psiManager, externalName, psiClass, jvmCompatible);
     } else {
-      return JavaPsiFacade.getInstance(psiManager.getProject()).findClass(externalName, GlobalSearchScope.allScope(psiManager.getProject()));
+      return JavaPsiFacade.getInstance(psiManager.getProject()).findClass(externalName, scope);
     }
   }
 
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
index 2a724764973c..f1843a740b65 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
@@ -37,6 +37,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PackageScope;
 import com.intellij.psi.search.searches.AnnotatedMembersSearch;
+import com.intellij.psi.util.ClassUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.theoryinpractice.testng.model.IDEARemoteTestRunnerClient;
 import com.theoryinpractice.testng.model.TestClassFilter;
@@ -183,7 +184,7 @@ public class SearchingForTestsTask extends Task.Backgroundable {
         new Computable<String>() {
           @Nullable
           public String compute() {
-            return entry.getKey().getQualifiedName();
+            return ClassUtil.getJVMClassName(entry.getKey());
           }
         }
       ), methods);
@@ -303,7 +304,7 @@ public class SearchingForTestsTask extends Task.Backgroundable {
         new Computable<PsiClass>() {
           @Nullable
           public PsiClass compute() {
-            return JavaPsiFacade.getInstance(psiManager.getProject()).findClass(data.getMainClassName(), getSearchScope());
+            return ClassUtil.findPsiClass(psiManager, data.getMainClassName().replace('/', '.'), null, true, getSearchScope());
           }
         }
       );
@@ -326,7 +327,7 @@ public class SearchingForTestsTask extends Task.Backgroundable {
         new Computable<PsiClass>() {
           @Nullable
           public PsiClass compute() {
-            return JavaPsiFacade.getInstance(psiManager.getProject()).findClass(data.getMainClassName(), getSearchScope());
+            return ClassUtil.findPsiClass(psiManager, data.getMainClassName().replace('/', '.'), null, true, getSearchScope());
           }
         }
       );