Fix sdk-aware tests on IDEA 15 EAP

go-lang-plugin-org · Sep 29, 2015 · f958bd5 · f958bd5
1 parent ab583b1
commit f958bd5
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/tests/com/goide/GoCodeInsightFixtureTestCase.java b/tests/com/goide/GoCodeInsightFixtureTestCase.java
@@ -18,12 +18,14 @@
 
 import com.goide.project.GoApplicationLibrariesService;
 import com.goide.sdk.GoSdkType;
+import com.goide.sdk.GoSdkUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.projectRoots.ProjectJdkTable;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkModificator;
 import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl;
+import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtilCore;
@@ -55,10 +57,10 @@ protected static DefaultLightProjectDescriptor createMockProjectDescriptor() {
     return new DefaultLightProjectDescriptor() {
       @Override
       public Sdk getSdk() {
-        String version = "1.1.2";
-        return createMockSdk("testData/mockSdk-" + version + "/", version);
+        return createMockSdk("1.1.2");
       }
 
+      @NotNull
       @Override
       public ModuleType getModuleType() {
         return GoModuleType.getInstance();
@@ -78,15 +80,17 @@ public void run() {
   }
 
   @NotNull
-  private static Sdk createMockSdk(@NotNull String sdkHome, @NotNull String version) {
-    GoSdkType instance = GoSdkType.getInstance();
-    String release = "Go " + version;
-    Sdk sdk = new ProjectJdkImpl(release, instance);
+  private static Sdk createMockSdk(@NotNull String version) {
+    Sdk sdk = new ProjectJdkImpl("Go " + version, GoSdkType.getInstance());
     SdkModificator sdkModificator = sdk.getSdkModificator();
-    sdkModificator.setHomePath(sdkHome);
+
+    String homePath = new File("testData/mockSdk-" + version + "/").getAbsolutePath();
+    sdkModificator.setHomePath(homePath);
     sdkModificator.setVersionString(version); // must be set after home path, otherwise setting home path clears the version string
+    for (VirtualFile file : GoSdkUtil.getSdkDirectoriesToAttach(homePath, version)) {
+      sdkModificator.addRoot(file, OrderRootType.CLASSES);
+    }
     sdkModificator.commitChanges();
-    instance.setupSdkPaths(sdk);
     return sdk;
   }