From cc392114dcbad9dd85eb628f532152c380083caa Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Wed, 25 Dec 2013 17:06:04 +0400 Subject: [PATCH] dispose caret --- .../actions/KillToWordEndActionTest.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java index 81317fa54c51..3439b6f61187 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/KillToWordEndActionTest.java @@ -23,6 +23,7 @@ import com.intellij.openapi.editor.impl.EditorImpl; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.ide.KillRingTransferable; +import com.intellij.openapi.util.Disposer; import com.intellij.testFramework.LightPlatformCodeInsightTestCase; import org.jetbrains.annotations.NotNull; @@ -195,15 +196,20 @@ public class KillToWordEndActionTest extends LightPlatformCodeInsightTestCase { configureFromFileText(getTestName(false) + ".txt", text); final Document document = myEditor.getDocument(); final CaretModelImpl caretModel = new CaretModelImpl((EditorImpl)myEditor); - document.addDocumentListener(caretModel); - caretModel.moveToOffset(document.getTextLength()-1); - killToWordEnd(); - killToWordEnd(); - checkResultByText(" third"); + try { + document.addDocumentListener(caretModel); + caretModel.moveToOffset(document.getTextLength()-1); + killToWordEnd(); + killToWordEnd(); + checkResultByText(" third"); - Transferable contents = CopyPasteManager.getInstance().getContents(); - assertTrue(contents instanceof KillRingTransferable); - Object string = contents.getTransferData(DataFlavor.stringFlavor); - assertEquals("first second", string); + Transferable contents = CopyPasteManager.getInstance().getContents(); + assertTrue(contents instanceof KillRingTransferable); + Object string = contents.getTransferData(DataFlavor.stringFlavor); + assertEquals("first second", string); + } + finally { + Disposer.dispose(caretModel); + } } }