From cce9505e314e3607504d5faec1594fa5db54b3c4 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 2 Aug 2018 22:55:54 +0300 Subject: [PATCH] Fix AbstractSpringClassAnnotatorTest compilation --- .../tests/gutter/AbstractSpringClassAnnotatorTest.kt.173 | 3 +-- .../tests/gutter/AbstractSpringClassAnnotatorTest.kt.181 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.173 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.173 index 2f988846013..19079df2504 100644 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.173 +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.173 @@ -25,7 +25,6 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import icons.SpringApiIcons import junit.framework.Assert import junit.framework.AssertionFailedError -import org.jetbrains.kotlin.compatibility.projectDisposableEx import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.jsonUtils.getString 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 - PluginTestCaseBase.addJdk(myFixture.projectDisposableEx, PluginTestCaseBase::mockJdk) + PluginTestCaseBase.addJdk(myFixture.projectDisposable, PluginTestCaseBase::mockJdk) val withRuntime = config["withRuntime"]?.asBoolean ?: false if (withRuntime) { diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.181 b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.181 index 431476f12a1..049e41e2a9f 100644 --- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.181 +++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt.181 @@ -25,7 +25,6 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import icons.SpringApiIcons import junit.framework.Assert import junit.framework.AssertionFailedError -import org.jetbrains.kotlin.compatibility.projectDisposableEx import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.jsonUtils.getString 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 - PluginTestCaseBase.addJdk(myFixture.projectDisposableEx, PluginTestCaseBase::mockJdk) + PluginTestCaseBase.addJdk(myFixture.projectDisposable, PluginTestCaseBase::mockJdk) val withRuntime = config["withRuntime"]?.asBoolean ?: false if (withRuntime) {