fix JetCompilerMessagingTest

(cherry-picked from 7c90e82)
JetBrains · Dec 18, 2012 · 4a146a0 · 4a146a0
1 parent b3b49f2
commit 4a146a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/IDECompilerMessagingTest.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/IDECompilerMessagingTest.java
@@ -16,12 +16,14 @@
 
 package org.jetbrains.jet.plugin.compilerMessages;
 
+import com.intellij.ide.startup.impl.StartupManagerImpl;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.compiler.TranslatingCompiler;
 import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.PlatformTestCase;
@@ -35,6 +37,11 @@
  * @author Pavel Talanov
  */
 public abstract class IDECompilerMessagingTest extends PlatformTestCase {
+    @Override
+    protected void runStartupActivities() {
+        super.runStartupActivities();
+        ((StartupManagerImpl) StartupManager.getInstance(myProject)).runPostStartupActivitiesFromExtensions();
+    }
 
     protected void performTest(@NotNull Function1<MessageChecker, Void> whatToExpect,
             @NotNull TranslatingCompiler compiler, @NotNull String testDataPath) {

diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java
@@ -64,7 +64,7 @@ public Void invoke(MessageChecker checker) {
     }
 
     public void testLib() {
-        KotlinJsBuildConfigurationManager component = myModule.getComponent(KotlinJsBuildConfigurationManager.class);
+        KotlinJsBuildConfigurationManager component = KotlinJsBuildConfigurationManager.getInstance(myModule);
         component.setJavaScriptModule(true);
         component.setPathToJavaScriptLibrary("/lib.zip");
         doTest(new Function1<MessageChecker, Void>() {