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: inline method

Browse Source
This commit is contained in:
Anna Kozlova
2015-05-27 22:01:02 +02:00
parent 09748e1434
commit 1fa670bb93
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/testng/src/com/theoryinpractice/testng/util/TestNGUtil.java
+3 -10
View File
@@ -203,7 +203,7 @@ public class TestNGUtil {
}
return true;
}
if (element instanceof PsiDocCommentOwner && hasTestJavaDoc((PsiDocCommentOwner) element, checkJavadoc))
if (element instanceof PsiDocCommentOwner && checkJavadoc && getTextJavaDoc((PsiDocCommentOwner)element) != null)
return true;
//now we check all methods for the test annotation
if (element instanceof PsiClass) {
@@ -217,7 +217,7 @@ public class TestNGUtil {
return true;
}
if (AnnotationUtil.isAnnotated(method, FACTORY_ANNOTATION_FQN, false, true)) return true;
if (hasTestJavaDoc(method, checkJavadoc)) return true;
if (checkJavadoc && getTextJavaDoc(method) != null) return true;
}
return false;
} else if (element instanceof PsiMethod) {
@@ -231,7 +231,7 @@ public class TestNGUtil {
boolean isPrivate = element.hasModifierProperty(PsiModifier.PRIVATE);
return !isPrivate && !element.hasModifierProperty(PsiModifier.STATIC) && !hasConfig(element);
}
else if (hasTestJavaDoc(psiClass, checkJavadoc)) return true;
else if (checkJavadoc && getTextJavaDoc(psiClass) != null) return true;
}
}
return false;
@@ -242,13 +242,6 @@ public class TestNGUtil {
return attributeValue != null && attributeValue.textMatches("false");
}
private static boolean hasTestJavaDoc(@NotNull PsiDocCommentOwner element, final boolean checkJavadoc) {
if (checkJavadoc) {
return getTextJavaDoc(element) != null;
}
return false;
}
private static PsiDocTag getTextJavaDoc(@NotNull final PsiDocCommentOwner element) {
final PsiDocComment docComment = element.getDocComment();
if (docComment != null) {