correct fix to allow running tests without classpath of 'main' module

This commit is contained in:
Dmitry Jemerov
2010-04-19 19:07:22 +04:00
parent ceac16de83
commit d39f4aa532
4 changed files with 57 additions and 2 deletions
@@ -0,0 +1,26 @@
<component>
<version codename="Community Edition" major="10" minor="0" eap="true" update-channel="IDEA10EAP"/>
<build number="__BUILD_NUMBER__" date="__BUILD_DATE__"/>
<install-over minbuild="0" maxbuild="0" version="9.0"/>
<logo url="/idea_community_logo.png" textcolor="FFFFFF"/>
<about url="/idea_community_about.png"/>
<icon size32="/icon_CE.png" size16="/icon_CEsmall.png" size32opaque="/icon_CEwhite.png" size12="/general/toolWindowProject.png"/>
<package code="__PACKAGE_CODE__"/>
<names product="IDEA" fullname="IntelliJ IDEA"/>
<welcome-screen caption-url="/welcomeCaption_community.png" slogan-url="/developSlogan_community.png"/>
<update-urls check="http://www.jetbrains.com/updates/updates.xml"
patches="http://download.jetbrains.com/idea/"/>
<help file="ideahelp.jar" root="idea"/>
<documentation url="http://www.jetbrains.com/idea/documentation"/>
<support url="http://www.jetbrains.com/support/idea/index.html"/>
<feedback eap-url="http://youtrack.jetbrains.net" release-url="http://www.jetbrains.com/feedback/feedback.jsp?product=IDEA&amp;build=$BUILD&amp;timezone=$TIMEZONE&amp;eval=$EVAL"/>
<plugins url="http://plugins.intellij.net"/>
<whatsnew url="http://www.jetbrains.com/idea/whatsnew/index.html"/>
<keymap win="http://www.jetbrains.com/idea/docs/IntelliJIDEA9_ReferenceCard.pdf"
mac="http://www.jetbrains.com/idea/docs/IntelliJIDEA9_ReferenceCard_Mac.pdf"/>
<plugins-page category="VCS Integration" title="Select VCS Integration Plugins"/>
<plugins-page title="Select Other Plugins"/>
</component>
@@ -26,8 +26,6 @@ import org.jetbrains.annotations.NonNls;
* @author mike
*/
@NonNls public abstract class IdeaTestCase extends PlatformTestCase {
private static boolean ourPlatformPrefixInitialized;
protected IdeaTestCase() {
initPlatformPrefix();
}
@@ -0,0 +1,13 @@
<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
<application-components>
<component>
<implementation-class>com.intellij.ultimate.UltimateVerifier</implementation-class>
</component>
</application-components>
<xi:include href="/META-INF/PlatformLangPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/ImagesPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<module value="com.intellij.modules.xml"/>
</idea-plugin>
@@ -96,6 +96,8 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
private String myTempDirPath;
private ThreadTracker myThreadTracker;
protected static boolean ourPlatformPrefixInitialized;
static {
Logger.setFactory(TestLoggerFactory.getInstance());
}
@@ -618,4 +620,20 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
}
}
}
public static void initPlatformLangPrefix() {
if (!ourPlatformPrefixInitialized) {
ourPlatformPrefixInitialized = true;
boolean isUltimate = true;
try {
PlatformTestCase.class.getClassLoader().loadClass("com.intellij.openapi.project.impl.IdeaProjectManagerImpl");
}
catch (ClassNotFoundException e) {
isUltimate = false;
}
if (!isUltimate) {
System.setProperty("idea.platform.prefix", "PlatformLangXml");
}
}
}
}