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

[formatter] written test for IDEA-166923

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2017-01-25 12:39:07 +03:00
parent eda4e3548b
commit d97574e2cc
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java
+3 -3
View File
@@ -32,7 +32,7 @@ import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.*;
import com.intellij.psi.formatter.java.FormatterTestUtils.Action;
import com.intellij.formatting.FormatterTestUtils.Action;
import com.intellij.testFramework.LightIdeaTestCase;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.text.LineReader;
@@ -44,8 +44,8 @@ import java.io.File;
import java.io.IOException;
import java.util.List;
import static com.intellij.psi.formatter.java.FormatterTestUtils.ACTIONS;
import static com.intellij.psi.formatter.java.FormatterTestUtils.Action.*;
import static com.intellij.formatting.FormatterTestUtils.ACTIONS;
import static com.intellij.formatting.FormatterTestUtils.Action.*;
/**
* Base class for java formatter tests that holds utility methods.
java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatWithContextTest.kt
+1
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.psi.formatter.java
import com.intellij.formatting.FormatterTestUtils
import com.intellij.openapi.util.TextRange
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterAlignmentTest.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.TextRange;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.util.IncorrectOperationException;
import static com.intellij.psi.formatter.java.FormatterTestUtils.Action.REFORMAT_WITH_CONTEXT;
import static com.intellij.formatting.FormatterTestUtils.Action.REFORMAT_WITH_CONTEXT;
/**
* Is intended to hold specific java formatting tests for alignment settings (
java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaIndenterTest.java
+1
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.psi.formatter.java;
import com.intellij.formatting.FormatterTestUtils;
import com.intellij.openapi.util.TextRange;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
java/java-tests/testSrc/com/intellij/psi/formatter/java/FormatterTestUtils.java → platform/testFramework/src/com/intellij/formatting/FormatterTestUtils.java
+7 -7
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.psi.formatter.java;
package com.intellij.formatting;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
@@ -62,16 +62,16 @@ public class FormatterTestUtils {
}
}
public static void doTest(@NotNull Project project,
@NotNull String ext,
@NotNull String before,
@NotNull String after,
@NotNull Action action) {
public static void testFormatting(@NotNull Project project,
@NotNull String ext,
@NotNull String before,
@NotNull String after,
@NotNull Action action) {
String fileName = "FTU." + ext;
FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(fileName);
FormatData data = extractFormatData(before);
PsiFile file = PsiFileFactory.getInstance(project).createFileFromText(fileName, fileType, data.text);
PsiFile file = PsiFileFactory.getInstance(project).createFileFromText(fileName, fileType, data.text, System.currentTimeMillis(), true);
PsiDocumentManager manager = PsiDocumentManager.getInstance(project);
Document document = manager.getDocument(file);