From 38191f4e9e60ad8d2b5e686427c5c7dc2bc552de Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Wed, 15 Mar 2017 19:12:09 +0300 Subject: [PATCH] IDEA-169404 Don't use ellipsis for empty folded methods - fix test data --- .../daemon/impl/DaemonRespondToChangesTest.java | 4 ++-- .../FoldingProcessingOnDocumentModificationTest.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java index 97a5ca1f258c..a801fc4fa87d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java @@ -2440,7 +2440,7 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase { waitForDaemon(); EditorTestUtil.executeAction(myEditor, IdeActions.ACTION_COLLAPSE_ALL_REGIONS); waitForDaemon(); - checkFoldingState("[FoldRegion +(25:33), placeholder='{...}']"); + checkFoldingState("[FoldRegion +(25:33), placeholder='{}']"); new WriteCommandAction(myProject) { @Override @@ -2449,7 +2449,7 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase { } }.execute(); waitForDaemon(); - checkFoldingState("[FoldRegion -(0:37), placeholder='/.../', FoldRegion +(27:35), placeholder='{...}']"); + checkFoldingState("[FoldRegion -(0:37), placeholder='/.../', FoldRegion +(27:35), placeholder='{}']"); EditorTestUtil.executeAction(myEditor, IdeActions.ACTION_EXPAND_ALL_REGIONS); waitForDaemon(); diff --git a/java/java-tests/testSrc/com/intellij/openapi/editor/impl/FoldingProcessingOnDocumentModificationTest.java b/java/java-tests/testSrc/com/intellij/openapi/editor/impl/FoldingProcessingOnDocumentModificationTest.java index cfe3f4d81a9a..6fda57c481b0 100644 --- a/java/java-tests/testSrc/com/intellij/openapi/editor/impl/FoldingProcessingOnDocumentModificationTest.java +++ b/java/java-tests/testSrc/com/intellij/openapi/editor/impl/FoldingProcessingOnDocumentModificationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,7 +80,7 @@ public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorT " }\n" + "}"); executeAction(IdeActions.ACTION_COLLAPSE_ALL_REGIONS); - checkFoldingState("[FoldRegion +(25:33), placeholder='{...}']"); + checkFoldingState("[FoldRegion +(25:33), placeholder='{}']"); new WriteCommandAction.Simple(getProject()) { @Override @@ -89,12 +89,12 @@ public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorT } }.execute().throwException(); - checkFoldingState("[FoldRegion -(0:37), placeholder='/.../', FoldRegion +(27:35), placeholder='{...}']"); + checkFoldingState("[FoldRegion -(0:37), placeholder='/.../', FoldRegion +(27:35), placeholder='{}']"); WriteCommandAction.runWriteCommandAction(getProject(), () -> myEditor.getDocument().deleteString(0, 2)); - checkFoldingState("[FoldRegion +(25:33), placeholder='{...}']"); + checkFoldingState("[FoldRegion +(25:33), placeholder='{}']"); } public void testInvalidRegionIsRemovedOnExpanding() throws Exception { @@ -104,7 +104,7 @@ public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorT " }\n" + "}"); executeAction(IdeActions.ACTION_COLLAPSE_ALL_REGIONS); - checkFoldingState("[FoldRegion +(25:33), placeholder='{...}']"); + checkFoldingState("[FoldRegion +(25:33), placeholder='{}']"); new WriteCommandAction.Simple(getProject()) { @Override @@ -113,7 +113,7 @@ public class FoldingProcessingOnDocumentModificationTest extends AbstractEditorT } }.execute().throwException(); - checkFoldingState("[FoldRegion -(0:37), placeholder='/.../', FoldRegion +(27:35), placeholder='{...}']"); + checkFoldingState("[FoldRegion -(0:37), placeholder='/.../', FoldRegion +(27:35), placeholder='{}']"); executeAction(IdeActions.ACTION_EXPAND_ALL_REGIONS); checkFoldingState("[FoldRegion -(0:37), placeholder='/.../']");