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

Merge branch 'master' of git.labs.intellij.net:idea/ultimate

Browse Source
This commit is contained in:
Dmitry Cheryasov
2011-02-16 18:11:07 +02:00
parent 409cd0842b 30e03efe6d
commit bb8bc2017c
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/testing/PythonUnitTestUtil.java
+15 -11
View File
@@ -2,6 +2,8 @@ package com.jetbrains.python.testing;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.intellij.psi.PsiElement;
import com.intellij.util.containers.Stack;
import com.jetbrains.python.psi.*;
import org.jetbrains.annotations.NotNull;
@@ -60,18 +62,20 @@ public class PythonUnitTestUtil {
}
private static boolean hasAssertOrYield(PyStatementList list) {
for (PyStatement st : list.getStatements()) {
if (st instanceof PyAssertStatement) return true;
else if (st instanceof PyForStatement)
return hasAssertOrYield(((PyForStatement)st).getForPart().getStatementList());
else if (st instanceof PyWhileStatement)
return hasAssertOrYield(((PyWhileStatement)st).getWhilePart().getStatementList());
else if (st instanceof PyExpressionStatement) {
if (((PyExpressionStatement)st).getExpression() instanceof PyYieldExpression)
return true;
Stack<PsiElement> stack = new Stack<PsiElement>();
if (list != null) {
for (PyStatement st : list.getStatements()) {
stack.push(st);
while (!stack.isEmpty()) {
PsiElement e = stack.pop();
if (e instanceof PyAssertStatement || e instanceof PyYieldExpression) return true;
for (PsiElement psiElement : e.getChildren()) {
stack.push(psiElement);
}
}
}
}
}
return false;
return false;
}
public static boolean isTestCaseClass(@NotNull PyClass cls) {
python/src/com/jetbrains/python/testing/unittest/PythonUnitTestRunConfigurationForm.java
+1
View File
@@ -28,6 +28,7 @@ public class PythonUnitTestRunConfigurationForm implements PythonUnitTestRunConf
myIsPureUnittest.setSelected(configuration.isPureUnittest());
final JRadioButton functionRB = myTestRunConfigurationForm.getFunctionRB();
functionRB.setEnabled(!myIsPureUnittest.isSelected());
myIsPureUnittest.addActionListener(new ActionListener() {
@Override