From b1466c2651dc1dfeec2705c06f6565f99657b8d1 Mon Sep 17 00:00:00 2001 From: Georgii Ustinov Date: Mon, 8 Jul 2024 15:40:30 +0300 Subject: [PATCH] [Java. Code Formatting] Add migration test to JavaCodeStyleSettingsTest IDEA-110857 GitOrigin-RevId: 99e5f481fd6a1351728d8194f56421bb23c07be1 --- .../testData/codeStyle/firstMigration.xml | 5 +++++ .../codeStyle/JavaCodeStyleSettingsTest.java | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 java/java-tests/testData/codeStyle/firstMigration.xml diff --git a/java/java-tests/testData/codeStyle/firstMigration.xml b/java/java-tests/testData/codeStyle/firstMigration.xml new file mode 100644 index 000000000000..d6dcd017c0fe --- /dev/null +++ b/java/java-tests/testData/codeStyle/firstMigration.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java index 4ec9971563d1..66e9d7c40c02 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java @@ -136,6 +136,24 @@ public class JavaCodeStyleSettingsTest extends CodeStyleTestCase { accessor.set(value); } + public void testFirstMigration() throws SchemeImportException { + CodeStyleSettings initialSettings = createTestScheme().getCodeStyleSettings(); + + CommonCodeStyleSettings initialCommonCodeStyleSettings = initialSettings.getCommonSettings(JavaLanguage.INSTANCE); + JavaCodeStyleSettings initialCustomCodeStyleSettings = initialSettings.getCustomSettings(JavaCodeStyleSettings.class); + + assertEquals(0, initialCommonCodeStyleSettings.BLANK_LINES_AROUND_FIELD); + assertEquals(0, initialCustomCodeStyleSettings.BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS); + + CodeStyleSettings settings = importSettings(); + + CommonCodeStyleSettings commonSettings = settings.getCommonSettings(JavaLanguage.INSTANCE); + JavaCodeStyleSettings customSettings = settings.getCustomSettings(JavaCodeStyleSettings.class); + + assertEquals(7, commonSettings.BLANK_LINES_AROUND_FIELD); + assertEquals(7, customSettings.BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS); + } + private static boolean isPrimitiveOrString(Class type) { return type.isPrimitive() || type.equals(String.class); }