From 2f9de646f0fd022049eec89994ff92209b9a3312 Mon Sep 17 00:00:00 2001
From: Georgii Ustinov <georgii.ustinov@jetbrains.com>
Date: Thu, 10 Oct 2024 11:19:01 +0300
Subject: [PATCH] [Groovy] Convert Groovy files to Java. Refactor and remove
 groovy runtime.

- GrailsLightVariableInfoTest
- LogbackTest
- SwingBuilderTest

IDEA-327339

GitOrigin-RevId: 20860311e6314cf6373342374e80fbb80a26b83a
---
 .../jetbrains/plugins/groovy/ext/logback/LogbackTest.java | 8 ++------
 .../plugins/groovy/ext/swing/SwingBuilderTest.java        | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/ext/logback/LogbackTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/ext/logback/LogbackTest.java
index 3c49bff6dcb0..1195bb6451e1 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/ext/logback/LogbackTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/ext/logback/LogbackTest.java
@@ -7,7 +7,6 @@ import com.intellij.pom.PomTargetPsiElement;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture;
 import com.intellij.util.containers.ContainerUtil;
-import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.java.JavaResourceRootType;
 import org.jetbrains.plugins.groovy.LibraryLightProjectDescriptor;
@@ -16,9 +15,7 @@ import org.jetbrains.plugins.groovy.RepositoryTestLibrary;
 import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.GrUnresolvedAccessInspection;
 import org.junit.Assert;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 import static org.jetbrains.plugins.groovy.GroovyProjectDescriptors.LIB_GROOVY_LATEST;
 
@@ -78,8 +75,7 @@ public class LogbackTest extends LightGroovyTestCase {
       logger("", ERROR, ['<caret>'])
       """);
     myFixture.completeBasic();
-    assert DefaultGroovyMethods.equals(DefaultGroovyMethods.toSet(new ArrayList<>(Arrays.asList("FOO_APP", "BAR_APP"))),
-                                       DefaultGroovyMethods.toSet(getFixture().getLookupElementStrings()));
+    Assert.assertEquals(Set.of("FOO_APP", "BAR_APP"), new HashSet<>(getFixture().getLookupElementStrings()));
   }
 
   public void testTargetNavigation() {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/ext/swing/SwingBuilderTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/ext/swing/SwingBuilderTest.java
index 9d4de1ff3a49..a5b51bb0bb0d 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/ext/swing/SwingBuilderTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/ext/swing/SwingBuilderTest.java
@@ -19,7 +19,7 @@ public final class SwingBuilderTest extends LightProjectTest implements ResolveT
   @Test
   public void swingBuilderMethod() {
     PsiMethod method = resolveTest("new groovy.swing.SwingBuilder().<caret>frame()", PsiMethod.class);
-    assert !method.isPhysical();
+    Assert.assertFalse(method.isPhysical());
   }
 
   @Test