From 2bb93dd28304a2720a05d43b41d397e70edf2d8a Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 27 Sep 2011 16:11:05 +0200 Subject: [PATCH] junit4|3 problems: check if class extends test case before warn about @Ignore (IDEA-74800) --- ...nnotatedMethodInJUnit3TestCaseInspection.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java index fd9b4b845149..6124e43ecdd2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java @@ -196,18 +196,18 @@ public class JUnit4AnnotatedMethodInJUnit3TestCaseInspection extends @Override public void visitMethod(PsiMethod method) { super.visitMethod(method); - if (AnnotationUtil.isAnnotated(method, IGNORE, false) && method.getName().startsWith("test")) { - registerMethodError(method, method); - return; - } - if (!TestUtils.isJUnit4TestMethod(method)) { - return; - } final PsiClass containingClass = method.getContainingClass(); if (containingClass == null) { - return; + return; } if (!TestUtils.isJUnitTestClass(containingClass)) { + return; + } + if (AnnotationUtil.isAnnotated(method, IGNORE, false) && method.getName().startsWith("test")) { + registerMethodError(method, method); + return; + } + if (!TestUtils.isJUnit4TestMethod(method)) { return; } final String className = containingClass.getName();