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

IDEA-19061 Integrate the Rearranger-plugin into core-IDEA

Browse Source 
More tests have been refactored and enabled
This commit is contained in:
Denis.Zhdanov
2012-05-24 15:35:49 +04:00
parent f486f0a08b
commit cb3ffa1a7e
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy
+19 -27
View File
@@ -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)
{
plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestDsl.java
+1 -1
View File
@@ -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"),
plugins/rearranger/test/src/com/wrq/rearranger/util/SettingsConfigurationBuilder.groovy
+8
View File
@@ -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]) {