From 7b4ed133add3c2e5461e4b0914867285673528b7 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Sat, 5 Oct 2013 22:30:52 +0200 Subject: [PATCH] AppCode: initial folding tests + tests for OC-8400 fix + correctly merge @import and #import in one block --- .../fixtures/impl/CodeInsightTestFixtureImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index d2995a92a4ed..aacb21bd4692 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -1852,9 +1852,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig } } - private String getFoldingDescription(@NotNull String content, @NotNull String initialFileName, - boolean doCheckCollapseStatus) { - configureByText(FileTypeManager.getInstance().getFileTypeByFileName(initialFileName), content); + public String getFoldingDescription(boolean withCollapseStatus) { CodeFoldingManager.getInstance(getProject()).buildInitialFoldings(myEditor); final FoldingModel model = myEditor.getFoldingModel(); @@ -1870,7 +1868,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig StringBuilder result = new StringBuilder(myEditor.getDocument().getText()); for (Border border : borders) { result.insert(border.getOffset(), border.isSide() == Border.LEFT ? "" : END_FOLD); @@ -1891,7 +1889,9 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig expectedContent = StringUtil.replace(expectedContent, "\r", ""); final String cleanContent = expectedContent.replaceAll(START_FOLD, "").replaceAll(END_FOLD, ""); - final String actual = getFoldingDescription(cleanContent, verificationFileName, doCheckCollapseStatus); + + configureByText(FileTypeManager.getInstance().getFileTypeByFileName(verificationFileName), cleanContent); + final String actual = getFoldingDescription(doCheckCollapseStatus); Assert.assertEquals(expectedContent, actual); }