azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set projectJdk in MultiFileTestCase, because many of configuration files contains inheritedJdk dependency

Browse Source 
Fix MultiModuleRenameTest, MultiModuleSafeDeleteTest, MultiModuleChangeSignatureTest
This commit is contained in:
Natalia Selezneva
2018-10-29 14:22:27 +03:00
parent 0fa908a1b5
commit cc689af635
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
+6
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.test
import com.intellij.ide.highlighter.ModuleFileType import com.intellij.ide.highlighter.ModuleFileType
import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.VirtualFileVisitor import com.intellij.openapi.vfs.VirtualFileVisitor
@@ -35,6 +36,11 @@ abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
runWriteAction {
PluginTestCaseBase.addJdk(testRootDisposable, PluginTestCaseBase::mockJdk6)
ProjectRootManager.getInstance(project).projectSdk = PluginTestCaseBase.mockJdk6()
}
} }
protected fun getTestDirName(lowercaseFirstLetter : Boolean) : String { protected fun getTestDirName(lowercaseFirstLetter : Boolean) : String {