MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Groovy] Convert Groovy files to Java. Refactoring and remove groovy runtime

Browse Source 
- CreateConstantFromJavaUsageTest
- CreateEnumConstantFromJavaUsageTest
- CreateFieldFromJavaUsageTest
- CreateMethodFromJavaUsageTest
- CreateMethodFromUsageTest
- CreatePropertyFromJavaUsageTest
- GrLoosePrecisionFixTest
- GrMultipleAssignmentTest

IDEA-327339

GitOrigin-RevId: 9508ffbfd882a5c8cc43008382bdc1e4348d7fd5
This commit is contained in:
Georgii Ustinov
2024-10-10 11:00:07 +03:00
committed by intellij-monorepo-bot
parent cf9de7effe
commit c9d89414d0
8 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateConstantFromJavaUsageTest.java
View File

@@ -7,6 +7,7 @@ import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.lang.highlighting.GrHighlightingTestBase;
import org.jetbrains.plugins.groovy.util.TestUtils;
import org.junit.Assert;
import java.util.List;
@@ -33,7 +34,7 @@ public class CreateConstantFromJavaUsageTest extends GrHighlightingTestBase {
myFixture.enableInspections(getCustomInspections());
List<IntentionAction> fixes = myFixture.filterAvailableIntentions(action);
assert fixes.size() == actionsCount;
Assert.assertEquals(fixes.size(), actionsCount);
if (actionsCount == 0) return;
myFixture.launchAction(fixes.get(0));

7
plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateEnumConstantFromJavaUsageTest.java
View File

@@ -3,9 +3,10 @@ package org.jetbrains.plugins.groovy.fixes;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.plugins.groovy.lang.highlighting.GrHighlightingTestBase;
import org.jetbrains.plugins.groovy.util.TestUtils;
import org.junit.Assert;
import java.util.List;
@@ -28,8 +29,8 @@ public class CreateEnumConstantFromJavaUsageTest extends GrHighlightingTestBase
private void doTest() {
List<IntentionAction> fixes = myFixture.filterAvailableIntentions("Create enum constant");
assert fixes.size() == 1;
myFixture.launchAction(DefaultGroovyMethods.first(fixes));
Assert.assertEquals(1, fixes.size());
myFixture.launchAction(ContainerUtil.getFirstItem(fixes));
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
myFixture.checkResultByFile(BEFORE, AFTER, true);
}

7
plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateFieldFromJavaUsageTest.java
View File

@@ -3,9 +3,10 @@ package org.jetbrains.plugins.groovy.fixes;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.plugins.groovy.lang.highlighting.GrHighlightingTestBase;
import org.jetbrains.plugins.groovy.util.TestUtils;
import org.junit.Assert;
import java.util.List;
@@ -28,8 +29,8 @@ public class CreateFieldFromJavaUsageTest extends GrHighlightingTestBase {
private void doTest() {
List<IntentionAction> fixes = myFixture.filterAvailableIntentions("Create field");
assert !fixes.isEmpty();
myFixture.launchAction(DefaultGroovyMethods.first(fixes));
Assert.assertFalse(fixes.isEmpty());
myFixture.launchAction(ContainerUtil.getFirstItem(fixes));
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
myFixture.checkResultByFile(BEFORE, AFTER, true);
}

7
plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromJavaUsageTest.java
View File

@@ -3,9 +3,10 @@ package org.jetbrains.plugins.groovy.fixes;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.plugins.groovy.lang.highlighting.GrHighlightingTestBase;
import org.jetbrains.plugins.groovy.util.TestUtils;
import org.junit.Assert;
import java.util.List;
@@ -25,10 +26,10 @@ public class CreateMethodFromJavaUsageTest extends GrHighlightingTestBase {
private void doTest(String action, int actionCount) {
List<IntentionAction> fixes = myFixture.filterAvailableIntentions(action);
assert fixes.size() == actionCount;
Assert.assertEquals(fixes.size(), actionCount);
if (actionCount == 0) return;
myFixture.launchAction(DefaultGroovyMethods.first(fixes));
myFixture.launchAction(ContainerUtil.getFirstItem(fixes));
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
myFixture.checkResultByFile(BEFORE, AFTER, true);
}

7
plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromUsageTest.java
View File

@@ -3,11 +3,12 @@ package org.jetbrains.plugins.groovy.fixes;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyAssignabilityCheckInspection;
import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.GrUnresolvedAccessInspection;
import org.jetbrains.plugins.groovy.lang.highlighting.GrHighlightingTestBase;
import org.jetbrains.plugins.groovy.util.TestUtils;
import org.junit.Assert;
import java.util.List;
@@ -26,10 +27,10 @@ public class CreateMethodFromUsageTest extends GrHighlightingTestBase {
private void doTest(String action, int actionCount, String[] files) {
myFixture.configureByFiles(files);
List<IntentionAction> fixes = myFixture.filterAvailableIntentions(action);
assert fixes.size() == actionCount;
Assert.assertEquals(fixes.size(), actionCount);
if (actionCount == 0) return;
myFixture.launchAction(DefaultGroovyMethods.first(fixes));
myFixture.launchAction(ContainerUtil.getFirstItem(fixes));
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
myFixture.checkResultByFile(BEFORE, AFTER, true);
}

7
plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreatePropertyFromJavaUsageTest.java
View File

@@ -3,9 +3,10 @@ package org.jetbrains.plugins.groovy.fixes;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.psi.impl.source.PostprocessReformattingAspect;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.plugins.groovy.lang.highlighting.GrHighlightingTestBase;
import org.jetbrains.plugins.groovy.util.TestUtils;
import org.junit.Assert;
import java.util.List;
@@ -30,10 +31,10 @@ public class CreatePropertyFromJavaUsageTest extends GrHighlightingTestBase {
private void doTest(String action, int actionCount) {
List<IntentionAction> fixes = myFixture.filterAvailableIntentions(action);
assert fixes.size() == actionCount;
Assert.assertEquals(fixes.size(), actionCount);
if (actionCount == 0) return;
myFixture.launchAction(DefaultGroovyMethods.first(fixes));
myFixture.launchAction(ContainerUtil.getFirstItem(fixes));
PostprocessReformattingAspect.getInstance(getProject()).doPostponedFormatting();
myFixture.checkResultByFile(BEFORE, AFTER, true);
}

7
plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrLoosePrecisionFixTest.java
View File

@@ -3,10 +3,11 @@ package org.jetbrains.plugins.groovy.fixes;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.testFramework.LightProjectDescriptor;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.GroovyProjectDescriptors;
import org.jetbrains.plugins.groovy.lang.highlighting.GrHighlightingTestBase;
import org.junit.Assert;
import java.util.List;
@@ -98,8 +99,8 @@ public class GrLoosePrecisionFixTest extends GrHighlightingTestBase {
myFixture.configureByText("_.groovy", before);
myFixture.enableInspections(getCustomInspections());
List<IntentionAction> fixes = myFixture.getAllQuickFixes("_.groovy");
assert fixes.size() == 1 : before;
myFixture.launchAction(DefaultGroovyMethods.first(fixes));
Assert.assertEquals(before, 1, fixes.size());
myFixture.launchAction(ContainerUtil.getFirstItem(fixes));
myFixture.checkResult(after);
}
}

7
plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrMultipleAssignmentTest.java
View File

@@ -4,11 +4,12 @@ package org.jetbrains.plugins.groovy.fixes;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInspection.InspectionProfileEntry;
import com.intellij.testFramework.LightProjectDescriptor;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.GroovyProjectDescriptors;
import org.jetbrains.plugins.groovy.codeInspection.assignment.GroovyAssignabilityCheckInspection;
import org.jetbrains.plugins.groovy.lang.highlighting.GrHighlightingTestBase;
import org.junit.Assert;
import java.util.List;
@@ -80,8 +81,8 @@ public class GrMultipleAssignmentTest extends GrHighlightingTestBase {
myFixture.configureByText("_.groovy", before);
myFixture.enableInspections(getCustomInspections());
List<IntentionAction> fixes = myFixture.getAllQuickFixes("_.groovy");
assert fixes.size() == 1 : before;
myFixture.launchAction(DefaultGroovyMethods.first(fixes));
Assert.assertEquals(before, 1, fixes.size());
myFixture.launchAction(ContainerUtil.getFirstItem(fixes));
myFixture.checkResult(after);
}
}