From 7c84f9794e7d2ca11b3ea4b64a583ff00e49fe6d Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 23 Nov 2015 16:42:18 +0300 Subject: [PATCH] cpu bound --- .../com/intellij/codeInsight/XmlPerformanceTest.java | 12 ++++-------- xml/tests/src/com/intellij/editor/XmlEditorTest.java | 10 ++++------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java b/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java index 3155cb9880b0..200702b39d83 100644 --- a/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java +++ b/xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java @@ -27,7 +27,6 @@ import com.intellij.ide.DataManager; import com.intellij.openapi.editor.actionSystem.EditorActionManager; import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.PlatformTestUtil; -import com.intellij.util.ThrowableRunnable; import org.jetbrains.annotations.NotNull; import java.io.File; @@ -75,14 +74,11 @@ public class XmlPerformanceTest extends LightQuickFixTestCase { doHighlighting(); myEditor.getSelectionModel().setSelection(0,myEditor.getDocument().getTextLength()); - PlatformTestUtil.startPerformanceTest("Fix long indent/unindent "+time, time, new ThrowableRunnable() { - @Override - public void run() { - EditorActionManager.getInstance().getActionHandler("EditorIndentSelection").execute(myEditor, DataManager.getInstance().getDataContext()); + PlatformTestUtil.startPerformanceTest("Fix long indent/unindent "+time, time, () -> { + EditorActionManager.getInstance().getActionHandler("EditorIndentSelection").execute(myEditor, DataManager.getInstance().getDataContext()); - EditorActionManager.getInstance().getActionHandler("EditorUnindentSelection").execute(myEditor, DataManager.getInstance().getDataContext()); - } - }).assertTiming(); + EditorActionManager.getInstance().getActionHandler("EditorUnindentSelection").execute(myEditor, DataManager.getInstance().getDataContext()); + }).cpuBound().assertTiming(); final int startOffset = myEditor.getCaretModel().getOffset(); myEditor.getSelectionModel().setSelection(startOffset,startOffset); checkResultByFile(getBasePath() + getTestName(false)+".xml"); diff --git a/xml/tests/src/com/intellij/editor/XmlEditorTest.java b/xml/tests/src/com/intellij/editor/XmlEditorTest.java index ae6ad3c47416..b588de5fa3a3 100644 --- a/xml/tests/src/com/intellij/editor/XmlEditorTest.java +++ b/xml/tests/src/com/intellij/editor/XmlEditorTest.java @@ -35,13 +35,11 @@ public class XmlEditorTest extends LightCodeInsightTestCase { public void testEnterPerformance() throws Exception { configureByFile(getTestFilePath(true)); EditorTestUtil.performTypingAction(myEditor, '\n'); - PlatformTestUtil.assertTiming("Xml editor enter", 7500, 1, new Runnable() { - public void run() { - for (int i = 0; i < 3; i ++) { - EditorTestUtil.performTypingAction(myEditor, '\n'); - } + PlatformTestUtil.assertTiming("Xml editor enter", 7500, 1, () -> { + for (int i = 0; i < 3; i ++) { + EditorTestUtil.performTypingAction(myEditor, '\n'); } - }); + }); checkResultByFile(getTestFilePath(false)); }