mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-02-04 23:39:07 +07:00
[Groovy] convert GrIntroduceParameterInClosureTest to Java (IDEA-327339)
GitOrigin-RevId: ff51490f3b17563fb0e8f5f0ff20d55a6595a621
This commit is contained in:
Bas Leijdekkers
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
510b16983c
commit
cf0f80b41b
@@ -1,20 +1,19 @@
|
||||
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
|
||||
package org.jetbrains.plugins.groovy.refactoring.introduceParameter
|
||||
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
package org.jetbrains.plugins.groovy.refactoring.introduceParameter;
|
||||
|
||||
import com.intellij.psi.impl.source.PostprocessReformattingAspect
|
||||
import com.intellij.refactoring.IntroduceParameterRefactoring
|
||||
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
|
||||
import groovy.transform.CompileStatic
|
||||
import org.jetbrains.annotations.Nullable
|
||||
import org.jetbrains.plugins.groovy.util.TestUtils
|
||||
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
|
||||
import com.intellij.refactoring.IntroduceParameterRefactoring;
|
||||
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.plugins.groovy.util.TestUtils;
|
||||
|
||||
/**
|
||||
* @author Max Medvedev
|
||||
*/
|
||||
@CompileStatic
|
||||
class GrIntroduceParameterInClosureTest extends LightJavaCodeInsightFixtureTestCase {
|
||||
public class GrIntroduceParameterInClosureTest extends LightJavaCodeInsightFixtureTestCase {
|
||||
@Override
|
||||
protected String getBasePath() {
|
||||
return TestUtils.getTestDataPath() + "refactoring/introduceParameterInClosure/"
|
||||
return TestUtils.getTestDataPath() + "refactoring/introduceParameterInClosure/";
|
||||
}
|
||||
|
||||
private void doTest(final int replaceFieldsWithGetters,
|
||||
@@ -22,98 +21,98 @@ class GrIntroduceParameterInClosureTest extends LightJavaCodeInsightFixtureTestC
|
||||
final boolean declareFinal,
|
||||
@Nullable final String conflicts,
|
||||
final boolean generateDelegate) {
|
||||
myFixture.configureByFile(getTestName(false) + ".groovy")
|
||||
myFixture.configureByFile(getTestName(false) + ".groovy");
|
||||
|
||||
GrIntroduceParameterTest.execute(replaceFieldsWithGetters, removeUnusedParameters, declareFinal, conflicts, generateDelegate,
|
||||
getProject(), myFixture.getEditor(), myFixture.getFile())
|
||||
getProject(), myFixture.getEditor(), myFixture.getFile());
|
||||
|
||||
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting()
|
||||
myFixture.getEditor().getSelectionModel().removeSelection()
|
||||
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
|
||||
myFixture.getEditor().getSelectionModel().removeSelection();
|
||||
|
||||
myFixture.checkResultByFile(getTestName(false) + "_after.groovy")
|
||||
myFixture.checkResultByFile(getTestName(false) + "_after.groovy");
|
||||
}
|
||||
|
||||
private void doTest(final int replaceFieldsWithGetters,
|
||||
final boolean removeUnusedParameters,
|
||||
final boolean declareFinal,
|
||||
@Nullable final String conflicts,
|
||||
final boolean generateDelegate,
|
||||
String before,
|
||||
String after) {
|
||||
myFixture.configureByText('before.groovy', before)
|
||||
final boolean removeUnusedParameters,
|
||||
final boolean declareFinal,
|
||||
@Nullable final String conflicts,
|
||||
final boolean generateDelegate,
|
||||
String before,
|
||||
String after) {
|
||||
myFixture.configureByText("before.groovy", before);
|
||||
|
||||
GrIntroduceParameterTest.execute(replaceFieldsWithGetters, removeUnusedParameters, declareFinal, conflicts, generateDelegate,
|
||||
getProject(), myFixture.getEditor(), myFixture.getFile())
|
||||
getProject(), myFixture.getEditor(), myFixture.getFile());
|
||||
|
||||
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting()
|
||||
myFixture.getEditor().getSelectionModel().removeSelection()
|
||||
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
|
||||
myFixture.getEditor().getSelectionModel().removeSelection();
|
||||
|
||||
myFixture.checkResult(after)
|
||||
myFixture.checkResult(after);
|
||||
}
|
||||
|
||||
void testSimpleClosure() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false)
|
||||
public void testSimpleClosure() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false);
|
||||
}
|
||||
|
||||
void testRemoveUnusedParam() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, null, false)
|
||||
public void testRemoveUnusedParam() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, null, false);
|
||||
}
|
||||
|
||||
void testLocalVarUsage() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false)
|
||||
public void testLocalVarUsage() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false);
|
||||
}
|
||||
|
||||
void testField() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, true, null, false)
|
||||
public void testField() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, true, null, false);
|
||||
}
|
||||
|
||||
void testReplaceWithGetter() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, true, null, false)
|
||||
public void testReplaceWithGetter() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, true, null, false);
|
||||
}
|
||||
|
||||
void testGetter() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, true, null, false)
|
||||
public void testGetter() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, true, null, false);
|
||||
}
|
||||
|
||||
void testReplaceGetterCall() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, true, null, false)
|
||||
public void testReplaceGetterCall() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_ALL, true, true, null, false);
|
||||
}
|
||||
|
||||
void testClosureRefWithoutCall() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false)
|
||||
public void testClosureRefWithoutCall() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false);
|
||||
}
|
||||
|
||||
void testClosureCall() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false)
|
||||
public void testClosureCall() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false);
|
||||
}
|
||||
|
||||
void testVarAssignedToClosure() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false)
|
||||
public void testVarAssignedToClosure() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false);
|
||||
}
|
||||
|
||||
void testCorrectOccurrencesForLocalVar() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false)
|
||||
public void testCorrectOccurrencesForLocalVar() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false);
|
||||
}
|
||||
|
||||
/*public void testDelegate() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, true);
|
||||
}
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, true);
|
||||
}
|
||||
|
||||
public void testDelegateRemoveUnusedParam() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, null, true);
|
||||
}*/
|
||||
|
||||
public void testDelegateRemoveUnusedParam() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false, null, true);
|
||||
}*/
|
||||
|
||||
void testStringPart0() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false, '''\
|
||||
def cl = {
|
||||
print 'a<selection>b</selection>c'
|
||||
}
|
||||
cl()
|
||||
''', '''\
|
||||
def cl = { String anObject ->
|
||||
print 'a' + anObject<caret> + 'c'
|
||||
}
|
||||
cl('b')
|
||||
''')
|
||||
public void testStringPart0() {
|
||||
doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false, """
|
||||
def cl = {
|
||||
print 'a<selection>b</selection>c'
|
||||
}
|
||||
cl()
|
||||
""", """
|
||||
def cl = { String anObject ->
|
||||
print 'a' + anObject<caret> + 'c'
|
||||
}
|
||||
cl('b')
|
||||
""");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user