diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java index 452204aba267..b99ac180953c 100644 --- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java +++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java @@ -133,25 +133,27 @@ public abstract class ProjectWizardTestCase extends PlatformTestCase { } protected Module importModuleFrom(ProjectImportProvider provider, String path) { - return importFrom(path, getProject(), provider); + return importFrom(path, getProject(), null, provider); } - protected Module importProjectFrom(String path, ProjectImportProvider... providers) { - Module module = importFrom(path, null, providers); + protected Module importProjectFrom(String path, Consumer adjuster, ProjectImportProvider... providers) { + Module module = importFrom(path, null, adjuster, providers); if (module != null) { myCreatedProject = module.getProject(); } return module; } - private Module importFrom(String path, @Nullable Project project, final ProjectImportProvider... providers) { + private Module importFrom(String path, + @Nullable Project project, Consumer adjuster, + final ProjectImportProvider... providers) { VirtualFile file = LocalFileSystem.getInstance().refreshAndFindFileByPath(path); assertNotNull("Can't find " + path, file); assertTrue(providers[0].canImport(file, project)); myWizard = ImportModuleAction.createImportWizard(project, null, file, providers); if (myWizard.getStepCount() > 0) { - runWizard(null); + runWizard(adjuster); } List modules = ImportModuleAction.createFromWizard(project, myWizard); return modules == null || modules.isEmpty() ? null : modules.get(0); diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImportWizardTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImportWizardTest.java index a8bd6f875b2c..6f50d5899cc2 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImportWizardTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImportWizardTest.java @@ -31,7 +31,7 @@ public class EclipseImportWizardTest extends ProjectWizardTestCase { public void testNothingToImport() throws Exception { try { File file = createTempFile("Foo.java", "class Foo {}"); - importProjectFrom(file.getParent(), new ImportFromSourcesProvider(), new EclipseProjectImportProvider(new EclipseImportBuilder())); + importProjectFrom(file.getParent(), null, new ImportFromSourcesProvider(), new EclipseProjectImportProvider(new EclipseImportBuilder())); fail("Exception should be frown"); } catch (RuntimeException e) { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/wizards/MavenImportWizardTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/wizards/MavenImportWizardTest.java index 87bbaf7aece7..054d109b396c 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/wizards/MavenImportWizardTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/wizards/MavenImportWizardTest.java @@ -36,7 +36,7 @@ public class MavenImportWizardTest extends ProjectWizardTestCase { public void testImportProject() throws Exception { File pom = createPom(); - Module module = importProjectFrom(pom.getPath(), new MavenProjectImportProvider(new MavenProjectBuilder())); + Module module = importProjectFrom(pom.getPath(), null, new MavenProjectImportProvider(new MavenProjectBuilder())); assertEquals("project", module.getName()); }