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

Java: cleanup test

Browse Source 
GitOrigin-RevId: d5679c33a9ae8501227f38d23679e653ace4d591
This commit is contained in:
Bas Leijdekkers
2023-12-28 17:40:22 +00:00
committed by intellij-monorepo-bot
parent 488935ecea
commit cf79dfa709
4 changed files with 32 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/refactoring/introduceConstant/NonStaticContainerForCompilerConstant.java → java/java-tests/testData/refactoring/introduceConstant/NonStaticContainerForCompileTimeConstant.java
View File
java/java-tests/testData/refactoring/introduceConstant/NonStaticContainerForCompileTimeConstant_after.java
+9
View File
@@ -0,0 +1,9 @@
class Foo {
class Bar {
public static final String xxx = "42";
void foo() {
String str = xxx;
}
}
}
java/java-tests/testData/refactoring/introduceConstant/NonStaticContainerForCompilerConstant_after.java
-11
View File
@@ -1,11 +0,0 @@
import org.jetbrains.annotations.NonNls;
class Foo {
class Bar {
@NonNls
private static final String xxx = "42";
void foo() {
}
}
}
java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceConstantTest.java
+23 -49
View File
@@ -34,7 +34,7 @@ public class IntroduceConstantTest extends LightJavaCodeInsightTestCase {
doTest(false);
}
public void testNonStaticContainerForCompilerConstant() {
public void testNonStaticContainerForCompileTimeConstant() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
PsiLocalVariable local = PsiTreeUtil.getParentOfType(getFile().findElementAt(getEditor().getCaretModel().getOffset()), PsiLocalVariable.class);
new MockLocalToFieldHandler(getProject(), true, false){
@@ -49,14 +49,13 @@ public class IntroduceConstantTest extends LightJavaCodeInsightTestCase {
private void doTest(boolean makeEnumConstant) {
configureByFile(BASE_PATH + getTestName(false) + ".java");
convertLocal(makeEnumConstant);
PsiLocalVariable local = PsiTreeUtil.getParentOfType(getFile().findElementAt(getEditor().getCaretModel().getOffset()), PsiLocalVariable.class);
new MockLocalToFieldHandler(getProject(), true, makeEnumConstant).convertLocalToField(local, getEditor());
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
}
public void testFromEnumConstantInitializer() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testUnresolvedReferenceInEnum() {
@@ -66,9 +65,7 @@ public class IntroduceConstantTest extends LightJavaCodeInsightTestCase {
}
public void testFromEnumConstantInitializer1() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testFromEnumConstantInitializer2() {
@@ -82,44 +79,27 @@ public class IntroduceConstantTest extends LightJavaCodeInsightTestCase {
}
public void testAnonymousClassWithThrownClause() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testAnnotationDescription() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testTailingErrorUnacceptableWholeLineSelection() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
}
private void convertLocal(final boolean makeEnumConstant) {
PsiLocalVariable local = PsiTreeUtil.getParentOfType(getFile().findElementAt(getEditor().getCaretModel().getOffset()), PsiLocalVariable.class);
new MockLocalToFieldHandler(getProject(), true, makeEnumConstant).convertLocalToField(local, getEditor());
doTest();
}
public void testPartialStringLiteral() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testPartialStringLiteralConvertibleToInt() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testStringLiteralConvertibleToInt() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testPartialStringLiteralQualified() {
@@ -133,39 +113,27 @@ public class IntroduceConstantTest extends LightJavaCodeInsightTestCase {
}
public void testPartialStringLiteralAnchor() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testPartialStringLiteralAnchorFromAnnotation() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testIntroduceConstantFromThisCall() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testForwardReferences() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testArrayFromVarargs() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testWithMethodReferenceBySecondSearch() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
doTest();
}
public void testComments() {
@@ -237,4 +205,10 @@ public class IntroduceConstantTest extends LightJavaCodeInsightTestCase {
}
}.invoke(getProject(), getEditor(), getFile(), null);
}
private void doTest() {
configureByFile(BASE_PATH + getTestName(false) + ".java");
new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
}
}