From c9d89414d0de220f227fcf30a1626e7de5d00b7e Mon Sep 17 00:00:00 2001 From: Georgii Ustinov Date: Thu, 10 Oct 2024 11:00:07 +0300 Subject: [PATCH] [Groovy] Convert Groovy files to Java. Refactoring and remove groovy runtime - CreateConstantFromJavaUsageTest - CreateEnumConstantFromJavaUsageTest - CreateFieldFromJavaUsageTest - CreateMethodFromJavaUsageTest - CreateMethodFromUsageTest - CreatePropertyFromJavaUsageTest - GrLoosePrecisionFixTest - GrMultipleAssignmentTest IDEA-327339 GitOrigin-RevId: 9508ffbfd882a5c8cc43008382bdc1e4348d7fd5 --- .../groovy/fixes/CreateConstantFromJavaUsageTest.java | 3 ++- .../groovy/fixes/CreateEnumConstantFromJavaUsageTest.java | 7 ++++--- .../plugins/groovy/fixes/CreateFieldFromJavaUsageTest.java | 7 ++++--- .../groovy/fixes/CreateMethodFromJavaUsageTest.java | 7 ++++--- .../plugins/groovy/fixes/CreateMethodFromUsageTest.java | 7 ++++--- .../groovy/fixes/CreatePropertyFromJavaUsageTest.java | 7 ++++--- .../plugins/groovy/fixes/GrLoosePrecisionFixTest.java | 7 ++++--- .../plugins/groovy/fixes/GrMultipleAssignmentTest.java | 7 ++++--- 8 files changed, 30 insertions(+), 22 deletions(-) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateConstantFromJavaUsageTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateConstantFromJavaUsageTest.java index 7c2f90a2edc7..a1a50d6b9e5d 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateConstantFromJavaUsageTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateConstantFromJavaUsageTest.java @@ -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 fixes = myFixture.filterAvailableIntentions(action); - assert fixes.size() == actionsCount; + Assert.assertEquals(fixes.size(), actionsCount); if (actionsCount == 0) return; myFixture.launchAction(fixes.get(0)); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateEnumConstantFromJavaUsageTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateEnumConstantFromJavaUsageTest.java index f0ef56122dbf..5e05d5f46682 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateEnumConstantFromJavaUsageTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateEnumConstantFromJavaUsageTest.java @@ -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 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); } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateFieldFromJavaUsageTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateFieldFromJavaUsageTest.java index d29e4382e69b..83723afdd039 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateFieldFromJavaUsageTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateFieldFromJavaUsageTest.java @@ -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 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); } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromJavaUsageTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromJavaUsageTest.java index b20603647092..34de2e4202a2 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromJavaUsageTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromJavaUsageTest.java @@ -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 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); } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromUsageTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromUsageTest.java index c9807d8e541f..57c1f6f66d87 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromUsageTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreateMethodFromUsageTest.java @@ -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 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); } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreatePropertyFromJavaUsageTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreatePropertyFromJavaUsageTest.java index 75473a341a30..5618dfd6236a 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreatePropertyFromJavaUsageTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/CreatePropertyFromJavaUsageTest.java @@ -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 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); } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrLoosePrecisionFixTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrLoosePrecisionFixTest.java index ef492e75a95d..90a0bbf4b677 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrLoosePrecisionFixTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrLoosePrecisionFixTest.java @@ -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 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); } } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrMultipleAssignmentTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrMultipleAssignmentTest.java index f4624636844c..1f76880ee4d0 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrMultipleAssignmentTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/fixes/GrMultipleAssignmentTest.java @@ -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 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); } } \ No newline at end of file