1 files changed, 13 insertions, 26 deletions

diff --git a/java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java b/java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java
index 92fe17ad085e..f75fb83cf54e 100644
--- a/java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java
+++ b/java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java
@@ -47,14 +47,7 @@ public class JavaTestFinder implements TestFinder {
     PsiClass klass = findSourceElement(element);
     if (klass == null) return Collections.emptySet();
 
-    GlobalSearchScope scope;
-    Module module = getModule(element);
-    if (module != null) {
-      scope = GlobalSearchScope.moduleWithDependenciesScope(module);
-    }
-    else {
-      scope = GlobalSearchScope.projectScope(element.getProject());
-    }
+    GlobalSearchScope scope = getSearchScope(element);
 
     PsiShortNamesCache cache = PsiShortNamesCache.getInstance(element.getProject());
 
@@ -70,6 +63,16 @@ public class JavaTestFinder implements TestFinder {
     return TestFinderHelper.getSortedElements(classesWithWeights, false);
   }
 
+  protected GlobalSearchScope getSearchScope(PsiElement element) {
+    final Module module = getModule(element);
+    if (module != null) {
+      return GlobalSearchScope.moduleWithDependenciesScope(module);
+    }
+    else {
+      return GlobalSearchScope.projectScope(element.getProject());
+    }
+  }
+
   private static boolean isTestSubjectClass(PsiClass klass) {
     if (klass.isAnnotationType() || TestFrameworks.getInstance().isTestClass(klass)) {
       return false;
@@ -90,15 +93,8 @@ public class JavaTestFinder implements TestFinder {
     return TestFinderHelper.getSortedElements(classesWithProximities, true);
   }
 
-  private static boolean collectTests(PsiClass klass, Processor<Pair<? extends PsiNamedElement, Integer>> processor) {
-    GlobalSearchScope scope;
-    Module module = getModule(klass);
-    if (module != null) {
-      scope = GlobalSearchScope.moduleWithDependentsScope(module);
-    }
-    else {
-      scope = GlobalSearchScope.projectScope(klass.getProject());
-    }
+  private boolean collectTests(PsiClass klass, Processor<Pair<? extends PsiNamedElement, Integer>> processor) {
+    GlobalSearchScope scope = getSearchScope(klass);
 
     PsiShortNamesCache cache = PsiShortNamesCache.getInstance(klass.getProject());
 
@@ -131,13 +127,4 @@ public class JavaTestFinder implements TestFinder {
   public boolean isTest(@NotNull PsiElement element) {
     return TestIntegrationUtils.isTest(element);
   }
-
-  public static boolean hasTestsForClass(PsiClass aClass) {
-    return collectTests(aClass, new CommonProcessors.FindProcessor<Pair<? extends PsiNamedElement, Integer>>() {
-      @Override
-      protected boolean accept(Pair<? extends PsiNamedElement, Integer> pair) {
-        return true;
-      }
-    });
-  }
 }