From 847990a4f678831d5bae48f06763c50f0d68edc9 Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Fri, 2 Feb 2018 10:58:39 +0300
Subject: [PATCH] Tests: call super.teardown from finally block in android
 tests

---
 .../AbstractAndroidQuickFixMultiFileTest.java         | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AbstractAndroidQuickFixMultiFileTest.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AbstractAndroidQuickFixMultiFileTest.java
index 77b5944c2be..73d3f433143 100644
--- a/idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AbstractAndroidQuickFixMultiFileTest.java
+++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AbstractAndroidQuickFixMultiFileTest.java
@@ -38,10 +38,13 @@ public abstract class AbstractAndroidQuickFixMultiFileTest extends AbstractQuick
 
     @Override
     protected void tearDown() {
-        Extensions.getRootArea().getExtensionPoint(ImportFilter.EP_NAME).unregisterExtension(KotlinTestImportFilter.INSTANCE);
-        AndroidFacet facet = FacetManager.getInstance(myModule).getFacetByType(AndroidFacet.getFacetType().getId());
-        FacetUtil.deleteFacet(facet);
-        super.tearDown();
+        try {
+            Extensions.getRootArea().getExtensionPoint(ImportFilter.EP_NAME).unregisterExtension(KotlinTestImportFilter.INSTANCE);
+            AndroidFacet facet = FacetManager.getInstance(myModule).getFacetByType(AndroidFacet.getFacetType().getId());
+            FacetUtil.deleteFacet(facet);
+        } finally {
+            super.tearDown();
+        }
     }
 
     @Override