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

fix tests

Browse Source
This commit is contained in:
anna
2011-12-16 13:44:05 +01:00
parent 02ef56a225
commit cf6806b673
1 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit/TestPackage.java
+38 -33
View File
@@ -94,39 +94,7 @@ public class TestPackage extends TestObject {
@Override
public void startNotified(ProcessEvent event) {
super.startNotified(event);
final JUnitConfiguration.Data data = myConfiguration.getPersistentData();
final TestClassFilter filter;
try {
filter = getClassFilter(data);
}
catch (CantRunException e) {
//should not happen
return;
}
tasks[0] = findTestsWithProgress(new FindCallback() {
public void found(@NotNull final Collection<PsiClass> classes, final boolean isJunit4) {
try {
addClassesListToJavaParameters(classes, new Function<PsiElement, String>() {
@Nullable
public String fun(PsiElement element) {
if (element instanceof PsiClass) {
return JavaExecutionUtil.getRuntimeQualifiedName((PsiClass)element);
}
else if (element instanceof PsiMethod) {
PsiMethod method = (PsiMethod)element;
return JavaExecutionUtil.getRuntimeQualifiedName(method.getContainingClass()) + "," + method.getName();
}
else {
return null;
}
}
}, getPackage(data).getQualifiedName(), false, isJunit4);
}
catch (CantRunException e) {
//can't be here
}
}
}, filter);
tasks[0] = (MySearchForTestsTask)findTests();
}
@Override
@@ -142,6 +110,43 @@ public class TestPackage extends TestObject {
return handler;
}
public Task findTests() {
final JUnitConfiguration.Data data = myConfiguration.getPersistentData();
final TestClassFilter filter;
try {
filter = getClassFilter(data);
}
catch (CantRunException e) {
//should not happen
return null;
}
return findTestsWithProgress(new FindCallback() {
public void found(@NotNull final Collection<PsiClass> classes, final boolean isJunit4) {
try {
addClassesListToJavaParameters(classes, new Function<PsiElement, String>() {
@Nullable
public String fun(PsiElement element) {
if (element instanceof PsiClass) {
return JavaExecutionUtil.getRuntimeQualifiedName((PsiClass)element);
}
else if (element instanceof PsiMethod) {
PsiMethod method = (PsiMethod)element;
return JavaExecutionUtil.getRuntimeQualifiedName(method.getContainingClass()) + "," + method.getName();
}
else {
return null;
}
}
}, getPackage(data).getQualifiedName(), false, isJunit4);
}
catch (CantRunException e) {
//can't be here
}
}
}, filter);
}
protected void initialize() throws ExecutionException {
super.initialize();
final JUnitConfiguration.Data data = myConfiguration.getPersistentData();