From b6f3bf986992152c7a9752105024aa47d14fbcfc Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 30 Nov 2015 18:57:47 +0300 Subject: [PATCH] Update undroid test clean up --- .../jetbrains/kotlin/android/KotlinAndroidTestCase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java index e41a3a4cf6e..a9f37142898 100644 --- a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java +++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java @@ -213,15 +213,15 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase { public void tearDown() throws Exception { KotlinInternalMode.Instance.setEnabled(kotlinInternalModeOriginalValue); - super.tearDown(); - - Field listenersField = PsiProjectListener.class.getDeclaredField("ourListeners"); + Field listenersField = PsiProjectListener.class.getDeclaredField("myListeners"); listenersField.setAccessible(true); - Map listeners = (Map)listenersField.get(null); + Map listeners = (Map)listenersField.get(PsiProjectListener.getInstance(getProject())); listeners.clear(); VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); + super.tearDown(); + myModule = null; myAdditionalModules = null; myFixture.tearDown();