running maven tests in its own classpath

diff --git a/platform/platform-api/src/com/intellij/ide/plugins/PluginManager.java b/platform/platform-api/src/com/intellij/ide/plugins/PluginManager.java
index a9bd7bf84dca478551457d24d53d77c0fa2e17c6..9e551e8596608a8ca80286ddc39e5eb302c6a909 100644 (file)
--- a/platform/platform-api/src/com/intellij/ide/plugins/PluginManager.java
+++ b/platform/platform-api/src/com/intellij/ide/plugins/PluginManager.java
@@ -196,7 +196,7 @@ public class PluginManager {
     }
 
     final IdeaPluginDescriptor corePluginDescriptor = idToDescriptorMap.get(PluginId.getId(CORE_PLUGIN_ID));
-    assert corePluginDescriptor != null;
+    assert corePluginDescriptor != null : CORE_PLUGIN_ID + " not found";
     for (IdeaPluginDescriptorImpl descriptor : result) {
       if (descriptor != corePluginDescriptor) {
         descriptor.insertDependency(corePluginDescriptor);

diff --git a/plugins/maven/maven.iml b/plugins/maven/maven.iml
index 8353391393fdd5d4755f2ffa69dd61baecdbfc9b..d65454c55bc6a7a6cce5e8db369f6380af8d9e30 100644 (file)
--- a/plugins/maven/maven.iml
+++ b/plugins/maven/maven.iml
@@ -117,6 +117,7 @@
     <orderEntry type="library" exported="" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="testFramework-java" exported="" scope="TEST" />
     <orderEntry type="module" module-name="jetgroovy" scope="TEST" />
+    <orderEntry type="module" module-name="idea-tests" scope="TEST" />
   </component>
   <component name="copyright">
     <Base>