From deceb093d8650de01cab09ba369fa14c032c2783 Mon Sep 17 00:00:00 2001
From: Georgii Ustinov <georgii.ustinov@jetbrains.com>
Date: Fri, 21 Jun 2024 10:16:10 +0300
Subject: [PATCH] [Groovy] Fix broken tests in GroovyMoveClassToInnerTest

IDEA-354899

GitOrigin-RevId: 02835f0e96765f1c510527140144f67a282fa6fa
---
 .../move/GroovyMoveClassToInnerTest.java         | 16 ++++++++--------
 .../after/pack1/Class1.groovy                    |  4 ++++
 .../after/pack1/Class2.groovy                    |  5 +++++
 .../after/pack2/A.groovy                         |  7 +++++++
 .../before/pack1/Class1.groovy                   |  2 +-
 .../before/pack1/Class2.groovy                   |  2 +-
 .../before/pack2/A.groovy                        |  5 ++++-
 .../after/pack1/Class1.groovy                    |  7 +++++++
 .../after/pack1/Class2.groovy                    |  8 ++++++++
 .../moveOfPackageLocalClass/after/pack2/A.groovy |  4 ++++
 .../before/pack1/Class1.groovy                   |  5 ++++-
 .../before/pack1/Class2.groovy                   |  5 ++++-
 .../before/pack2/A.groovy                        |  2 +-
 .../after/pack1/Class1.groovy                    |  9 +++++++++
 .../after/pack1/Class2.groovy                    |  8 ++++++++
 .../after/pack2/A.groovy                         |  4 ++++
 .../before/pack1/Class1.groovy                   |  7 +++++--
 .../before/pack1/Class2.groovy                   |  8 ++++----
 .../before/pack2/A.groovy                        |  2 +-
 .../packageLocalClass/after/pack1/Class2.groovy  |  7 +++++++
 .../packageLocalClass/after/pack2/A.groovy       |  9 +++++++++
 .../packageLocalClass/before/pack1/Class1.groovy |  6 +++---
 .../packageLocalClass/before/pack1/Class2.groovy |  5 ++++-
 .../packageLocalClass/before/pack2/A.groovy      |  4 ++--
 24 files changed, 114 insertions(+), 27 deletions(-)
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class1.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class2.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack2/A.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack1/Class1.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack1/Class2.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack2/A.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack1/Class1.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack1/Class2.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack2/A.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/after/pack1/Class2.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/after/pack2/A.groovy

diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassToInnerTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassToInnerTest.java
index 4a13c9cdf4c3..610bced8e7ea 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassToInnerTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveClassToInnerTest.java
@@ -92,23 +92,23 @@ public class GroovyMoveClassToInnerTest extends GroovyMoveTestBase {
     doTest("pack2.A", "pack1.Class1");
   }
 
-  void _testPackageLocalClass() throws Exception {
-    doTestConflicts("pack1.Class1", "pack2.A", "Field <b><code>Class1.c2</code></b> uses a package-private class <b><code>pack1.Class2</code></b>.");
+  public void testPackageLocalClass() {
+    doTest("pack2.A", "pack1.Class1");
   }
 
-  void _testMoveIntoPackageLocalClass() throws Exception {
-    doTestConflicts("pack1.Class1", "pack2.A", "Class <b><code>Class1</code></b> will no longer be accessible from field <b><code>Class2.c1</code></b>");
+  public void testMoveIntoPackageLocalClass() {
+    doTestConflicts("pack1.Class1", "pack2.A", "Class <b><code>pack1.Class1</code></b> will no longer be accessible from class <b><code>pack1.Class2</code></b>");
   }
 
-  void _testMoveOfPackageLocalClass() throws Exception {
-    doTestConflicts("pack1.Class1", "pack2.A", "Class <b><code>Class1</code></b> will no longer be accessible from field <b><code>Class2.c1</code></b>");
+  public void testMoveOfPackageLocalClass() {
+    doTestConflicts("pack1.Class1", "pack2.A", "Class <b><code>pack1.Class1</code></b> will no longer be accessible from class <b><code>pack1.Class2</code></b>");
   }
 
-  public void testMoveIntoPrivateInnerClass() throws Exception {
+  public void testMoveIntoPrivateInnerClass() {
     doTestConflicts("pack1.Class1", "pack1.A.PrivateInner", "Class <b><code>pack1.Class1</code></b> will no longer be accessible from class <b><code>pack1.Class2</code></b>");
   }
 
-  void _testMoveWithPackageLocalMember() throws Exception {
+  public void testMoveWithPackageLocalMember() {
     doTestConflicts("pack1.Class1", "pack2.A", "Method <b><code>Class1.doStuff()</code></b> will no longer be accessible from method <b><code>Class2.test()</code></b>");
   }
 
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class1.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class1.groovy
new file mode 100644
index 000000000000..8dce4418d1b1
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class1.groovy
@@ -0,0 +1,4 @@
+package pack1;
+
+class Class1 {
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class2.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class2.groovy
new file mode 100644
index 000000000000..e8edb94ac125
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class2.groovy
@@ -0,0 +1,5 @@
+package pack1
+
+class Class2 {
+   Class1 c1;
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack2/A.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack2/A.groovy
new file mode 100644
index 000000000000..34ccd9a8040d
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack2/A.groovy
@@ -0,0 +1,7 @@
+package pack2
+
+import groovy.transform.PackageScope
+
+@PackageScope
+class A {
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class1.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class1.groovy
index 37758f6a5609..8dce4418d1b1 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class1.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class1.groovy
@@ -1,4 +1,4 @@
 package pack1;
 
-public class Class1 {
+class Class1 {
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class2.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class2.groovy
index 64c3f5bd8577..e8edb94ac125 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class2.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class2.groovy
@@ -1,4 +1,4 @@
-package pack1;
+package pack1
 
 class Class2 {
    Class1 c1;
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack2/A.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack2/A.groovy
index b3f0fbe32f63..34ccd9a8040d 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack2/A.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack2/A.groovy
@@ -1,4 +1,7 @@
-package pack2;
+package pack2
 
+import groovy.transform.PackageScope
+
+@PackageScope
 class A {
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack1/Class1.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack1/Class1.groovy
new file mode 100644
index 000000000000..8d1ca8b57c25
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack1/Class1.groovy
@@ -0,0 +1,7 @@
+package pack1
+
+import groovy.transform.PackageScope;
+
+@PackageScope
+class Class1 {
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack1/Class2.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack1/Class2.groovy
new file mode 100644
index 000000000000..bb999bf64f7c
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack1/Class2.groovy
@@ -0,0 +1,8 @@
+package pack1
+
+import groovy.transform.PackageScope;
+
+@PackageScope
+class Class2 {
+   Class1 c1;
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack2/A.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack2/A.groovy
new file mode 100644
index 000000000000..b3f0fbe32f63
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack2/A.groovy
@@ -0,0 +1,4 @@
+package pack2;
+
+class A {
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class1.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class1.groovy
index 8dce4418d1b1..8d1ca8b57c25 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class1.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class1.groovy
@@ -1,4 +1,7 @@
-package pack1;
+package pack1
 
+import groovy.transform.PackageScope;
+
+@PackageScope
 class Class1 {
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class2.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class2.groovy
index 64c3f5bd8577..bb999bf64f7c 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class2.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack1/Class2.groovy
@@ -1,5 +1,8 @@
-package pack1;
+package pack1
 
+import groovy.transform.PackageScope;
+
+@PackageScope
 class Class2 {
    Class1 c1;
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack2/A.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack2/A.groovy
index e1886e55ac9c..b3f0fbe32f63 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack2/A.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack2/A.groovy
@@ -1,4 +1,4 @@
 package pack2;
 
-public class A {
+class A {
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack1/Class1.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack1/Class1.groovy
new file mode 100644
index 000000000000..c34c65557cc3
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack1/Class1.groovy
@@ -0,0 +1,9 @@
+package pack1
+
+import groovy.transform.PackageScope
+
+class Class1 {
+  @PackageScope
+  void doStuff() {
+  }
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack1/Class2.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack1/Class2.groovy
new file mode 100644
index 000000000000..8ef9c6f1ce82
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack1/Class2.groovy
@@ -0,0 +1,8 @@
+package pack1
+
+class Class2 {
+   void test() {
+     Class1 c1 = new Class1()
+     c1.doStuff()
+   }
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack2/A.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack2/A.groovy
new file mode 100644
index 000000000000..f27bba931ab7
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack2/A.groovy
@@ -0,0 +1,4 @@
+package pack2
+
+public class A {
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class1.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class1.groovy
index 4480d5f2eeac..c34c65557cc3 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class1.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class1.groovy
@@ -1,6 +1,9 @@
-package pack1;
+package pack1
 
-public class Class1 {
+import groovy.transform.PackageScope
+
+class Class1 {
+  @PackageScope
   void doStuff() {
   }
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class2.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class2.groovy
index 53e253b75287..8ef9c6f1ce82 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class2.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack1/Class2.groovy
@@ -1,8 +1,8 @@
-package pack1;
+package pack1
 
 class Class2 {
-   public void test() {
-     Class1 c1 = new Class1();
-     c1.doStuff();
+   void test() {
+     Class1 c1 = new Class1()
+     c1.doStuff()
    }
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack2/A.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack2/A.groovy
index e1886e55ac9c..f27bba931ab7 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack2/A.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack2/A.groovy
@@ -1,4 +1,4 @@
-package pack2;
+package pack2
 
 public class A {
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/after/pack1/Class2.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/after/pack1/Class2.groovy
new file mode 100644
index 000000000000..20a744dd14ed
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/after/pack1/Class2.groovy
@@ -0,0 +1,7 @@
+package pack1
+
+import groovy.transform.PackageScope
+
+@PackageScope
+class Class2 {
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/after/pack2/A.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/after/pack2/A.groovy
new file mode 100644
index 000000000000..3c6aa470f086
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/after/pack2/A.groovy
@@ -0,0 +1,9 @@
+package pack2
+
+import pack1.Class2
+
+class A {
+    static class Class1 {
+      private Class2 c2
+    }
+}
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack1/Class1.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack1/Class1.groovy
index 49899f51c5ab..3d812f8f2310 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack1/Class1.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack1/Class1.groovy
@@ -1,5 +1,5 @@
-package pack1;
+package pack1
 
-public class Class1 {
-  private Class2 c2;
+class Class1 {
+  private Class2 c2
 }
\ No newline at end of file
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack1/Class2.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack1/Class2.groovy
index 19c120284319..20a744dd14ed 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack1/Class2.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack1/Class2.groovy
@@ -1,4 +1,7 @@
-package pack1;
+package pack1
 
+import groovy.transform.PackageScope
+
+@PackageScope
 class Class2 {
 }
diff --git a/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack2/A.groovy b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack2/A.groovy
index e1886e55ac9c..7c0ac27cc702 100644
--- a/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack2/A.groovy
+++ b/plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack2/A.groovy
@@ -1,4 +1,4 @@
-package pack2;
+package pack2
 
-public class A {
+class A {
 }