[Groovy] Fix broken tests in GroovyMoveClassToInnerTest

IDEA-354899

GitOrigin-RevId: 02835f0e96765f1c510527140144f67a282fa6fa

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>");
   }
 

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class1.groovy

@@ -0,0 +1,4 @@
+package pack1;
+
+class Class1 {
+}

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack1/Class2.groovy

@@ -0,0 +1,5 @@
+package pack1
+
+class Class2 {
+   Class1 c1;
+}

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/after/pack2/A.groovy

@@ -0,0 +1,7 @@
+package pack2
+
+import groovy.transform.PackageScope
+
+@PackageScope
+class A {
+}

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class1.groovy

@@ -1,4 +1,4 @@
 package pack1;
 
-public class Class1 {
+class Class1 {
 }

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveIntoPackageLocalClass/before/pack1/Class2.groovy

@@ -1,4 +1,4 @@
-package pack1;
+package pack1
 
 class Class2 {
    Class1 c1;

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 {
 }

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack1/Class1.groovy

@@ -0,0 +1,7 @@
+package pack1
+
+import groovy.transform.PackageScope;
+
+@PackageScope
+class Class1 {
+}

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;
+}

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/after/pack2/A.groovy

@@ -0,0 +1,4 @@
+package pack2;
+
+class A {
+}

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 {
 }

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;
 }

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveOfPackageLocalClass/before/pack2/A.groovy

@@ -1,4 +1,4 @@
 package pack2;
 
-public class A {
+class A {
 }

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() {
+  }
+}

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()
+   }
+}

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/after/pack2/A.groovy

@@ -0,0 +1,4 @@
+package pack2
+
+public class A {
+}

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() {
   }
 }

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()
    }
 }

plugins/groovy/testdata/refactoring/move/moveClassToInner/moveWithPackageLocalMember/before/pack2/A.groovy

@@ -1,4 +1,4 @@
-package pack2;
+package pack2
 
 public class A {
 }

plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/after/pack1/Class2.groovy

@@ -0,0 +1,7 @@
+package pack1
+
+import groovy.transform.PackageScope
+
+@PackageScope
+class Class2 {
+}

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
+    }
+}

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
 }

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 {
 }

plugins/groovy/testdata/refactoring/move/moveClassToInner/packageLocalClass/before/pack2/A.groovy

@@ -1,4 +1,4 @@
-package pack2;
+package pack2
 
-public class A {
+class A {
 }