From cb3ffa1a7eebebeb52c8be5eb7605256ba70d480 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Thu, 24 May 2012 12:53:44 +0400 Subject: [PATCH] IDEA-19061 Integrate the Rearranger-plugin into core-IDEA More tests have been refactored and enabled --- .../com/wrq/rearranger/RearrangerTest.groovy | 46 ++++++++----------- .../rearranger/util/RearrangerTestDsl.java | 2 +- .../util/SettingsConfigurationBuilder.groovy | 8 ++++ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy b/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy index 7487b73ca465..a0204dd778aa 100644 --- a/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy +++ b/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy @@ -495,7 +495,7 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { name: GetterSetterDefinition.GETTER_NAME_CORRECT_PREFIX, body: GetterSetterDefinition.GETTER_BODY_IMMATERIAL ) - setterCriteria( + 'setter criteria'( name: GetterSetterDefinition.SETTER_NAME_CORRECT_PREFIX, body: GetterSetterDefinition.SETTER_BODY_IMMATERIAL ) @@ -641,7 +641,7 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { name: GetterSetterDefinition.GETTER_NAME_CORRECT_PREFIX, body: GetterSetterDefinition.GETTER_BODY_RETURNS ) - setterCriteria( + 'setter criteria'( name: GetterSetterDefinition.SETTER_NAME_CORRECT_PREFIX, body: GetterSetterDefinition.SETTER_BODY_IMMATERIAL ) } @@ -691,7 +691,7 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { } } } public void testSpacingOptions() throws Exception { - /** + /* * From Thomas Singer: * I've enabled * - Force 0 blank lines before class close brace "}" @@ -869,29 +869,22 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { fieldRule.create { } } } -// public void testExcludeFromExtraction() throws Exception { -// configureByFile("/com/wrq/rearranger/RearrangementTest36.java"); -// final PsiFile file = getFile(); -// final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file); -// final RearrangerActionHandler rah = new RearrangerActionHandler(); -// rah.rearrangeDocument(getProject(), file, rs, doc); -// super.checkResultByFile("/com/wrq/rearranger/RearrangementTest36.java"); -// } -// -// public void testInterferingGSNames() throws Exception { -// configureByFile("/com/wrq/rearranger/RearrangementTest37.java"); -// final PsiFile file = getFile(); -// final Document doc = PsiDocumentManager.getInstance(getProject()).getDocument(file); -// final RearrangerActionHandler rah = new RearrangerActionHandler(); -// rs.setKeepGettersSettersTogether(true); -// rs.getDefaultGSDefinition().setGetterBodyCriterion(GetterSetterDefinition.GETTER_BODY_IMMATERIAL); -// rs.getDefaultGSDefinition().setGetterNameCriterion(GetterSetterDefinition.GETTER_NAME_CORRECT_PREFIX); -// rs.getDefaultGSDefinition().setSetterBodyCriterion(GetterSetterDefinition.SETTER_BODY_IMMATERIAL); -// rs.getDefaultGSDefinition().setSetterNameCriterion(GetterSetterDefinition.GETTER_NAME_CORRECT_PREFIX); -// rah.rearrangeDocument(getProject(), file, rs, doc); -// super.checkResultByFile("/com/wrq/rearranger/RearrangementResult37.java"); -// } -// + public void testExcludeFromExtraction() throws Exception { doTest('RearrangementTest36', 'RearrangementTest36') } + + public void testInterferingGSNames() throws Exception { + doTest('RearrangementTest37', 'RearrangementResult37') { + settings.configure { + 'keep together'( 'getters and setters' ) + 'getter criteria'( + name: GetterSetterDefinition.GETTER_NAME_CORRECT_PREFIX, + body: GetterSetterDefinition.GETTER_BODY_IMMATERIAL + ) + 'setter criteria'( + name: GetterSetterDefinition.SETTER_NAME_CORRECT_PREFIX, + body: GetterSetterDefinition.SETTER_BODY_IMMATERIAL + ) + } } } + // public void testInterferingGSNamesNoKGSTogether() throws Exception { // configureByFile("/com/wrq/rearranger/RearrangementTest37.java"); // final PsiFile file = getFile(); @@ -1360,7 +1353,6 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { doTest(srcFileName, expectedResultFileName, 'java', adjustment) } - private void doTest(@NotNull String srcFileName, @Nullable String expectedResultFileName, @Nullable String extension, @Nullable Closure adjustment = null) { diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestDsl.java b/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestDsl.java index 07bdde6296db..7af715290453 100644 --- a/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestDsl.java +++ b/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestDsl.java @@ -33,7 +33,7 @@ public enum RearrangerTestDsl { SORT, COMMENT, GETTER_CRITERIA("getter criteria"), - SETTER_CRITERIA("setterCriteria"), + SETTER_CRITERIA("setter criteria"), SPACING, PRECEDING_COMMENT("preceding comment"), TRAILING_COMMENT("trailing comment"), diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/util/SettingsConfigurationBuilder.groovy b/plugins/rearranger/test/src/com/wrq/rearranger/util/SettingsConfigurationBuilder.groovy index fe06eb05731d..4a5bcdc5ecc6 100644 --- a/plugins/rearranger/test/src/com/wrq/rearranger/util/SettingsConfigurationBuilder.groovy +++ b/plugins/rearranger/test/src/com/wrq/rearranger/util/SettingsConfigurationBuilder.groovy @@ -68,6 +68,14 @@ class SettingsConfigurationBuilder extends BuilderSupport { setIf(RearrangerTestDsl.ORDER, attributes, 'overloadedOrder', settings) setIf(RearrangerTestDsl.KEEP_TOGETHER, attributes, 'keepOverloadedMethodsTogether', settings) break + case RearrangerTestDsl.GETTER_CRITERIA.value: + setIf(RearrangerTestDsl.NAME, attributes, 'getterNameCriterion', settings.defaultGSDefinition) + setIf(RearrangerTestDsl.BODY, attributes, 'getterBodyCriterion', settings.defaultGSDefinition) + break + case RearrangerTestDsl.SETTER_CRITERIA.value: + setIf(RearrangerTestDsl.NAME, attributes, 'setterNameCriterion', settings.defaultGSDefinition) + setIf(RearrangerTestDsl.BODY, attributes, 'setterBodyCriterion', settings.defaultGSDefinition) + break default: setIf(RearrangerTestDsl.REARRANGE_INNER_CLASSES, attributes, 'rearrangeInnerClasses', settings) if (attributes[RearrangerTestDsl.CLASS_COMMENT.value]) {