MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

AppCode: initial folding tests + tests for OC-8400 fix + correctly merge @import and #import in one block

Browse Source
This commit is contained in:
Anton Makeev
2013-10-05 22:30:52 +02:00
parent e7a8a0d273
commit 7b4ed133ad
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+5 -5
View File
@@ -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 ? "<fold text=\'" + border.getText() + "\'" +
(doCheckCollapseStatus ? " expand=\'" +
(withCollapseStatus ? " expand=\'" +
border.isExpanded() +
"\'" : "") +
">" : 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);
}