Dropping package facades:

- fix testData for 'move' tests
(NB regression in **/onDemandStaticImport.java, see: https://youtrack.jetbrains.com/issue/KT-9624)

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package a;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.test(new Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/b/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package b;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.test(new a.Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/c/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package c;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.test(new a.Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/a/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package a;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.getTest(new Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/b/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package b;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.getTest(new a.Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/after/c/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package c;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.getTest(new a.Test());

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/a/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package a;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/b/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package b;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/after/c/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package c;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.test();

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/noImports.java

@@ -1,9 +1,9 @@
 package a;
 
-import b.DependencyKt;
+import b.TestKt;
 
 class J {
     void bar() {
-        DependencyKt.test();
+        TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/onDemandStaticImport.java

@@ -1,7 +1,9 @@
 package a;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
-        b.DependencyKt.test();
+        b.TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/a/specificStaticImports.java

@@ -1,6 +1,6 @@
 package a;
 
-import static b.DependencyKt.test;
+import static b.TestKt.test;
 
 class J {
     void bar() {

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/noImports.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        DependencyKt.test();
+        TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandImport.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        DependencyKt.test();
+        TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/onDemandStaticImport.java

@@ -1,7 +1,9 @@
 package b;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
-        b.DependencyKt.test();
+        b.TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificImports.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        DependencyKt.test();
+        TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/b/specificStaticImports.java

@@ -1,6 +1,6 @@
 package b;
 
-import static b.DependencyKt.test;
+import static b.TestKt.test;
 
 class J {
     void bar() {

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/noImports.java

@@ -1,9 +1,9 @@
 package c;
 
-import b.DependencyKt;
+import b.TestKt;
 
 class J {
     void bar() {
-        DependencyKt.test();
+        TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandImport.java

@@ -1,9 +1,9 @@
 package c;
 
-import b.DependencyKt;
+import b.TestKt;
 
 class J {
     void bar() {
-        DependencyKt.test();
+        TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/onDemandStaticImport.java

@@ -1,7 +1,9 @@
 package c;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
-        b.DependencyKt.test();
+        b.TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificImports.java

@@ -1,9 +1,9 @@
 package c;
 
-import b.DependencyKt;
+import b.TestKt;
 
 class J {
     void bar() {
-        DependencyKt.test();
+        TestKt.test();
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/after/c/specificStaticImports.java

@@ -1,6 +1,6 @@
 package c;
 
-import static b.DependencyKt.test;
+import static b.TestKt.test;
 
 class J {
     void bar() {

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/a/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package a;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.setTest("");

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/b/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package b;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.setTest("");

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/after/c/onDemandStaticImport.java

@@ -1,5 +1,7 @@
 package c;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
         b.DependencyKt.setTest("");

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/noImports.java

@@ -1,10 +1,10 @@
 package a;
 
-import b.DependencyKt;
+import b.TestKt;
 
 class J {
     void bar() {
-        DependencyKt.setTest("");
-        System.out.println(DependencyKt.getTest());
+        TestKt.setTest("");
+        System.out.println(TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/onDemandStaticImport.java

@@ -1,8 +1,10 @@
 package a;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
-        b.DependencyKt.setTest("");
-        System.out.println(b.DependencyKt.getTest());
+        b.TestKt.setTest("");
+        System.out.println(b.TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/a/specificStaticImports.java

@@ -1,7 +1,7 @@
 package a;
 
-import static b.DependencyKt.getTest;
-import static b.DependencyKt.setTest;
+import static b.TestKt.getTest;
+import static b.TestKt.setTest;
 
 class J {
     void bar() {

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/noImports.java

@@ -2,7 +2,7 @@ package b;
 
 class J {
     void bar() {
-        DependencyKt.setTest("");
-        System.out.println(DependencyKt.getTest());
+        TestKt.setTest("");
+        System.out.println(TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandImport.java

@@ -2,7 +2,7 @@ package b;
 
 class J {
     void bar() {
-        DependencyKt.setTest("");
-        System.out.println(DependencyKt.getTest());
+        TestKt.setTest("");
+        System.out.println(TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/onDemandStaticImport.java

@@ -1,8 +1,10 @@
 package b;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
-        b.DependencyKt.setTest("");
-        System.out.println(b.DependencyKt.getTest());
+        b.TestKt.setTest("");
+        System.out.println(b.TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificImports.java

@@ -2,7 +2,7 @@ package b;
 
 class J {
     void bar() {
-        DependencyKt.setTest("");
-        System.out.println(DependencyKt.getTest());
+        TestKt.setTest("");
+        System.out.println(TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/b/specificStaticImports.java

@@ -1,7 +1,7 @@
 package b;
 
-import static b.DependencyKt.getTest;
-import static b.DependencyKt.setTest;
+import static b.TestKt.getTest;
+import static b.TestKt.setTest;
 
 class J {
     void bar() {

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/noImports.java

@@ -1,10 +1,10 @@
 package c;
 
-import b.DependencyKt;
+import b.TestKt;
 
 class J {
     void bar() {
-        DependencyKt.setTest("");
-        System.out.println(DependencyKt.getTest());
+        TestKt.setTest("");
+        System.out.println(TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandImport.java

@@ -1,10 +1,10 @@
 package c;
 
-import b.DependencyKt;
+import b.TestKt;
 
 class J {
     void bar() {
-        DependencyKt.setTest("");
-        System.out.println(DependencyKt.getTest());
+        TestKt.setTest("");
+        System.out.println(TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/onDemandStaticImport.java

@@ -1,8 +1,10 @@
 package c;
 
+import static a.MainKt.*;
+
 class J {
     void bar() {
-        b.DependencyKt.setTest("");
-        System.out.println(b.DependencyKt.getTest());
+        b.TestKt.setTest("");
+        System.out.println(b.TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificImports.java

@@ -1,10 +1,10 @@
 package c;
 
-import b.DependencyKt;
+import b.TestKt;
 
 class J {
     void bar() {
-        DependencyKt.setTest("");
-        System.out.println(DependencyKt.getTest());
+        TestKt.setTest("");
+        System.out.println(TestKt.getTest());
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/after/c/specificStaticImports.java

@@ -1,7 +1,7 @@
 package c;
 
-import static b.DependencyKt.getTest;
-import static b.DependencyKt.setTest;
+import static b.TestKt.getTest;
+import static b.TestKt.setTest;
 
 class J {
     void bar() {