diff options
Diffstat (limited to 'java/java-impl/src/com/intellij/testIntegration')
3 files changed, 23 insertions, 32 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; - } - }); - } } diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java index d32864676c55..cceceb24c826 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java @@ -109,11 +109,7 @@ public class CreateTestAction extends PsiElementBaseIntentionAction { propertiesComponent.setValue(CREATE_TEST_IN_THE_SAME_ROOT, String.valueOf(true)); } - final CreateTestDialog d = new CreateTestDialog(project, - getText(), - srcClass, - srcPackage, - srcModule); + final CreateTestDialog d = createTestDialog(project, srcModule, srcClass, srcPackage); d.show(); if (!d.isOK()) return; @@ -127,6 +123,10 @@ public class CreateTestAction extends PsiElementBaseIntentionAction { }, CodeInsightBundle.message("intention.create.test"), this); } + protected CreateTestDialog createTestDialog(Project project, Module srcModule, PsiClass srcClass, PsiPackage srcPackage) { + return new CreateTestDialog(project, getText(), srcClass, srcPackage, srcModule); + } + protected static void checkForTestRoots(Module srcModule, Set<VirtualFile> testFolders) { checkForTestRoots(srcModule, testFolders, new HashSet<Module>()); } diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java index cf4c67911208..5be9ce379705 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java @@ -181,7 +181,7 @@ public class CreateTestDialog extends DialogWrapper { } }); - myTargetClassNameField = new EditorTextField(targetClass.getName() + "Test"); + myTargetClassNameField = new EditorTextField(suggestTestClassName(targetClass)); myTargetClassNameField.getDocument().addDocumentListener(new DocumentAdapter() { @Override public void documentChanged(DocumentEvent e) { @@ -217,6 +217,10 @@ public class CreateTestDialog extends DialogWrapper { updateMethodsTable(); } + protected String suggestTestClassName(PsiClass targetClass) { + return targetClass.getName() + "Test"; + } + private boolean isSuperclassSelectedManually() { String superClass = mySuperClassField.getText(); if (StringUtil.isEmptyOrSpaces(superClass)) { |