diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java b/java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java index 92d9f5900680..13f4f56cef7e 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java @@ -1,5 +1,6 @@ package com.intellij.testFramework.fixtures; +import com.intellij.openapi.roots.ContentEntry; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.StdModuleTypes; @@ -20,6 +21,6 @@ public class DefaultLightProjectDescriptor implements LightProjectDescriptor { return JavaSdkImpl.getMockJdk15("java 1.5"); } - public void configureModule(Module module, ModifiableRootModel model) { + public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { } } diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java index a060cd65fe3b..7bb3a0e9f234 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java @@ -15,6 +15,7 @@ import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; +import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.psi.*; import com.intellij.testFramework.LightProjectDescriptor; @@ -38,7 +39,7 @@ public abstract class LightCodeInsightFixtureTestCase extends UsefulTestCase{ return JavaSdkImpl.getMockJdk("java 1.4"); } - public void configureModule(Module module, ModifiableRootModel model) { + public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { } }; public static final LightProjectDescriptor JAVA_1_5 = new DefaultLightProjectDescriptor(); diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/SMLightFixtureTestCase.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/SMLightFixtureTestCase.java index 6bebda25db8a..dee093c88144 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/SMLightFixtureTestCase.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/SMLightFixtureTestCase.java @@ -4,6 +4,7 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.psi.PsiFile; import com.intellij.testFramework.LightProjectDescriptor; @@ -30,7 +31,7 @@ public abstract class SMLightFixtureTestCase extends UsefulTestCase { return null; } - public void configureModule(Module module, ModifiableRootModel model) { + public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { //Do nothing } }; diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java index 9d110c294472..65d09933e506 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java @@ -222,7 +222,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da final ContentEntry contentEntry = rootModel.addContentEntry(ourSourceRoot); contentEntry.addSourceFolder(ourSourceRoot, false); - descriptor.configureModule(ourModule, rootModel); + descriptor.configureModule(ourModule, rootModel, contentEntry); rootModel.commit(); @@ -609,7 +609,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da return mySdk; } - public void configureModule(Module module, ModifiableRootModel model) { + public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { } @Override diff --git a/platform/testFramework/src/com/intellij/testFramework/LightProjectDescriptor.java b/platform/testFramework/src/com/intellij/testFramework/LightProjectDescriptor.java index 938efda06609..d2b91db1c3ef 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightProjectDescriptor.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightProjectDescriptor.java @@ -3,6 +3,7 @@ package com.intellij.testFramework; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; /** @@ -11,5 +12,5 @@ import com.intellij.openapi.roots.ModifiableRootModel; public interface LightProjectDescriptor { ModuleType getModuleType(); Sdk getSdk(); - void configureModule(Module module, ModifiableRootModel model); + void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry); } diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/IdeaTestFixtureFactoryImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/IdeaTestFixtureFactoryImpl.java index 2af5ff1925c8..2816765b20ee 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/IdeaTestFixtureFactoryImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/IdeaTestFixtureFactoryImpl.java @@ -8,6 +8,7 @@ import com.intellij.openapi.module.EmptyModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.builders.EmptyModuleFixtureBuilder; @@ -94,7 +95,7 @@ public class IdeaTestFixtureFactoryImpl extends IdeaTestFixtureFactory { return null; } - public void configureModule(Module module, ModifiableRootModel model) { + public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { } }; }