From 04397f41107bd6de41b31d45a4e8e2ed65628bbe Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 8 Jun 2015 15:51:31 +0300 Subject: [PATCH] create test: collect test folders from all dependencies (IDEA-141051) --- .../createTest/CreateTestAction.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) 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 5ee52555c459..0f92d485b4ed 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java @@ -129,20 +129,15 @@ public class CreateTestAction extends PsiElementBaseIntentionAction { } protected static void checkForTestRoots(Module srcModule, Set testFolders) { - checkForTestRoots(srcModule, testFolders, new HashSet()); - } - - private static void checkForTestRoots(final Module srcModule, final Set testFolders, final Set processed) { - final boolean isFirst = processed.isEmpty(); - if (!processed.add(srcModule)) return; - testFolders.addAll(ModuleRootManager.getInstance(srcModule).getSourceRoots(JavaSourceRootType.TEST_SOURCE)); - if (isFirst && !testFolders.isEmpty()) return; + //create test in the same module + if (!testFolders.isEmpty()) return; + //suggest to choose from all dependencies modules final HashSet modules = new HashSet(); ModuleUtilCore.collectModulesDependsOn(srcModule, modules); for (Module module : modules) { - checkForTestRoots(module, testFolders, processed); + testFolders.addAll(ModuleRootManager.getInstance(module).getSourceRoots(JavaSourceRootType.TEST_SOURCE)); } }