From 80e5a3005c1ffbc40c4f0886eaf0f694fa071f0a Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 1 Mar 2017 17:08:06 +0300
Subject: [PATCH] in fixture-based tests dispose things earlier to not treat
 them as leaks

---
 .../com/intellij/unscramble/UnscrambleDialogTest.java  |  2 +-
 .../codeInsight/completion/XmlCompletionTest.java      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/unscramble/UnscrambleDialogTest.java b/java/java-tests/testSrc/com/intellij/unscramble/UnscrambleDialogTest.java
index de29e4fffbdd..80f55c670e79 100644
--- a/java/java-tests/testSrc/com/intellij/unscramble/UnscrambleDialogTest.java
+++ b/java/java-tests/testSrc/com/intellij/unscramble/UnscrambleDialogTest.java
@@ -78,7 +78,7 @@ public class UnscrambleDialogTest extends JavaCodeInsightFixtureTestCase {
   private void showText(String unscramble) {
     RunContentDescriptor descriptor = UnscrambleDialog.showUnscrambledText(null, "foo", null, getProject(), unscramble);
     assertNotNull(descriptor);
-    Disposer.register(getTestRootDisposable(), descriptor);
+    Disposer.register(myFixture.getTestRootDisposable(), descriptor);
     myContent = descriptor;
   }
 
diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java
index 635a78a7a2d7..a9c8cde3c276 100644
--- a/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java
@@ -52,7 +52,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
     final ExternalResourceManagerEx manager = ExternalResourceManagerEx.getInstanceEx();
     myOldDoctype = manager.getDefaultHtmlDoctype(getProject());
     manager.setDefaultHtmlDoctype(XmlUtil.XHTML_URI, getProject());
-    CamelHumpMatcher.forceStartMatching(getTestRootDisposable());
+    CamelHumpMatcher.forceStartMatching(myFixture.getTestRootDisposable());
   }
 
   @Override
@@ -75,7 +75,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
       return;
     }
 
-    ExternalResourceManagerExImpl.addTestResource(url, location, getTestRootDisposable());
+    ExternalResourceManagerExImpl.addTestResource(url, location, myFixture.getTestRootDisposable());
   }
 
   public void testCompleteWithAnyInSchema() throws Exception {
@@ -175,7 +175,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
   }
 
   public void testAttributesTemplateFinishWithSpace() throws Throwable {
-    TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
+    TemplateManagerImpl.setTemplateTesting(getProject(), myFixture.getTestRootDisposable());
 
     configureByFile(getTestName(false) + ".xml");
     type('b');
@@ -192,7 +192,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
   }
 
   public void testNoAttributesTemplateFinishWithSpace() throws Throwable {
-    TemplateManagerImpl.setTemplateTesting(getProject(), getTestRootDisposable());
+    TemplateManagerImpl.setTemplateTesting(getProject(), myFixture.getTestRootDisposable());
 
     configureByFile(getTestName(false) + ".xml");
     type('d');
@@ -492,7 +492,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
   }
 
   public void testCorrectSelectionInsertion() throws Exception {
-    ((StatisticsManagerImpl)StatisticsManager.getInstance()).enableStatistics(getTestRootDisposable());
+    ((StatisticsManagerImpl)StatisticsManager.getInstance()).enableStatistics(myFixture.getTestRootDisposable());
     addResource("http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd",
                 getTestDataPath() + "/hibernate-mapping-3.0.dtd");