From 88372132be039a1baba57ee3703acd6ac2642245 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 27 Mar 2017 15:05:22 +0200 Subject: [PATCH] Delete Android facet in teardown --- .../quickfix/AbstractAndroidQuickFixMultiFileTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 829af38e95e..bf412959e20 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 @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.android.quickfix; import com.intellij.facet.FacetManager; import com.intellij.facet.ModifiableFacetModel; +import com.intellij.facet.impl.FacetUtil; import com.intellij.openapi.application.ApplicationManager; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixMultiFileTest; @@ -30,6 +31,13 @@ public abstract class AbstractAndroidQuickFixMultiFileTest extends AbstractQuick addAndroidFacet(); } + @Override + protected void tearDown() { + AndroidFacet facet = FacetManager.getInstance(myModule).getFacetByType(AndroidFacet.getFacetType().getId()); + FacetUtil.deleteFacet(facet); + super.tearDown(); + } + @Override protected void doTestWithExtraFile(String beforeFileName) throws Exception { addManifest();