From 86a396d8ea0585e02df3cbdda357c0cb6924f9a0 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 5 Nov 2015 11:53:41 +0100 Subject: [PATCH] test navigation: don't ever treat current class as potential test --- .../src/com/intellij/testIntegration/JavaTestFinder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java b/java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java index 6fb9c7e91c5b..3c7798a4856b 100644 --- a/java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java +++ b/java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java @@ -117,7 +117,7 @@ public class JavaTestFinder implements TestFinder { for (String eachName : names) { if (pattern.matcher(eachName).matches()) { for (PsiClass eachClass : cache.getClassesByName(eachName, scope)) { - if (isTestClass(eachClass)) { + if (isTestClass(eachClass, klass)) { if (!processor.process(Pair.create(eachClass, TestFinderHelper.calcTestNameProximity(klassName, eachName)))) { return true; } @@ -128,9 +128,9 @@ public class JavaTestFinder implements TestFinder { return false; } - protected boolean isTestClass(PsiClass eachClass) { + protected boolean isTestClass(PsiClass eachClass, PsiClass klass) { final TestFrameworks frameworks = TestFrameworks.getInstance(); - return eachClass.isPhysical() && (frameworks.isTestClass(eachClass) || frameworks.isPotentialTestClass(eachClass)); + return eachClass.isPhysical() && (frameworks.isTestClass(eachClass) || eachClass != klass && frameworks.isPotentialTestClass(eachClass)); } @Nullable