MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

testng: jvm format expected in generated testng.xml (IDEA-73791 )

Browse Source
This commit is contained in:
anna
2011-09-01 16:04:31 +02:00
parent cd43fc0173
commit f2283ab50d
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openapi/src/com/intellij/psi/util/ClassUtil.java
+15 -3
View File
@@ -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);
}
}
plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
+4 -3
View File
@@ -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());
}
}
);