API for specifying test source root path in RubyLightProjectDescriptor

This commit is contained in:
Dmitry Jemerov
2009-09-22 18:34:14 +04:00
parent 40f0fe58b1
commit bd143f81f1
6 changed files with 12 additions and 7 deletions
@@ -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) {
}
}
@@ -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();
@@ -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
}
};
@@ -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
@@ -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);
}
@@ -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) {
}
};
}