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

Fix AbstractSpringClassAnnotatorTest compilation

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-08-02 22:55:54 +03:00
parent 5c177a86fe
commit cce9505e31
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.173
+1 -2
View File
@@ -25,7 +25,6 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import icons.SpringApiIcons import icons.SpringApiIcons
import junit.framework.Assert import junit.framework.Assert
import junit.framework.AssertionFailedError import junit.framework.AssertionFailedError
import org.jetbrains.kotlin.compatibility.projectDisposableEx
import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.jsonUtils.getString
import org.jetbrains.kotlin.idea.spring.lineMarking.KotlinSpringClassAnnotator import org.jetbrains.kotlin.idea.spring.lineMarking.KotlinSpringClassAnnotator
@@ -56,7 +55,7 @@ abstract class AbstractSpringClassAnnotatorTest : KotlinLightCodeInsightFixtureT
val config = JsonParser().parse(FileUtil.loadFile(configFile, true)) as JsonObject val config = JsonParser().parse(FileUtil.loadFile(configFile, true)) as JsonObject
PluginTestCaseBase.addJdk(myFixture.projectDisposableEx, PluginTestCaseBase::mockJdk) PluginTestCaseBase.addJdk(myFixture.projectDisposable, PluginTestCaseBase::mockJdk)
val withRuntime = config["withRuntime"]?.asBoolean ?: false val withRuntime = config["withRuntime"]?.asBoolean ?: false
if (withRuntime) { if (withRuntime) {
ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.181
+1 -2
View File
@@ -25,7 +25,6 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import icons.SpringApiIcons import icons.SpringApiIcons
import junit.framework.Assert import junit.framework.Assert
import junit.framework.AssertionFailedError import junit.framework.AssertionFailedError
import org.jetbrains.kotlin.compatibility.projectDisposableEx
import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.jsonUtils.getString
import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension
@@ -51,7 +50,7 @@ abstract class AbstractSpringClassAnnotatorTest : KotlinLightCodeInsightFixtureT
val config = JsonParser().parse(FileUtil.loadFile(configFile, true)) as JsonObject val config = JsonParser().parse(FileUtil.loadFile(configFile, true)) as JsonObject
PluginTestCaseBase.addJdk(myFixture.projectDisposableEx, PluginTestCaseBase::mockJdk) PluginTestCaseBase.addJdk(myFixture.projectDisposable, PluginTestCaseBase::mockJdk)
val withRuntime = config["withRuntime"]?.asBoolean ?: false val withRuntime = config["withRuntime"]?.asBoolean ?: false
if (withRuntime) { if (withRuntime) {