From 264094861dfad086be045185a42263b201306f7a Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Sun, 14 Jun 2020 18:56:12 +0300 Subject: [PATCH] 202: Fix null passed to @NotNull in `PomModelImpl` Fixes `AdditionalResolveDescriptorRendererTestGenerated#testAnonymousObjectInClassParameterInitializer` and others --- ...AbstractAdditionalResolveDescriptorRendererTest.kt.202 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt.202 b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt.202 index 0d77f58e2dd..ac3f90b104c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt.202 +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.kt.202 @@ -23,17 +23,15 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.TargetEnvironment import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.ResolveSession -import org.picocontainer.MutablePicoContainer abstract class AbstractAdditionalResolveDescriptorRendererTest : AbstractDescriptorRendererTest() { override fun setUp() { super.setUp() - val pomModelImpl = PomModelImpl(project) - val treeAspect = TreeAspect.getInstance(project) - val mockProject = project as MockProject - createAndRegisterKotlinCodeBlockModificationListener(mockProject, pomModelImpl, treeAspect) + mockProject.registerService(TreeAspect::class.java, TreeAspect()) + mockProject.registerService(PomModel::class.java, PomModelImpl(project)) + mockProject.registerService(KotlinCodeBlockModificationListener::class.java, KotlinCodeBlockModificationListener(mockProject)) } override fun tearDown() {