From 4e190248cd7a289ddfdd0c3584aefb8c6dfe5bea Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 8 Aug 2017 17:33:37 +0300
Subject: [PATCH] Add resetApplicationToNull utility with old application

---
 .../kotlin/test/testFramework/KtUsefulTestCase.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java
index 9210b4ac756..9cb770d5c7c 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java
@@ -132,13 +132,16 @@ public abstract class KtUsefulTestCase extends TestCase {
         UIUtil.removeLeakingAppleListeners();
         super.tearDown();
 
-        if (application == null) {
-            resetApplicationToNull();
-        }
+        resetApplicationToNull(application);
 
         application = null;
     }
 
+    public static void resetApplicationToNull(Application old) {
+        if (old != null) return;
+        resetApplicationToNull();
+    }
+
     public static void resetApplicationToNull() {
         try {
             Field ourApplicationField = ApplicationManager.class.getDeclaredField("ourApplication");