azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dropping package facades:

Browse Source 
- fix testData for 'move' tests
(NB regression in **/onDemandStaticImport.java, see: https://youtrack.jetbrains.com/issue/KT-9624)
This commit is contained in:
Dmitry Petrov
2015-10-16 19:01:01 +03:00
parent 31a85132c6
commit a76fb328cb
54 changed files with 166 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/noImports.java
Vendored
+7 -7
View File
@@ -1,16 +1,16 @@
package a;
import b.BPackage;
import b.MainKt;
import b.Test;
class J {
void bar() {
Test t = new Test();
BPackage.test();
BPackage.test(t);
System.out.println(BPackage.getTEST());
System.out.println(BPackage.getTEST(t));
BPackage.setTEST("");
BPackage.setTEST(t, "");
MainKt.test();
MainKt.test(t);
System.out.println(MainKt.getTEST());
System.out.println(MainKt.getTEST(t));
MainKt.setTEST("");
MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/onDemandStaticImport.java
Vendored
+8 -6
View File
@@ -2,14 +2,16 @@ package a;
import b.Test;
import static a.MainKt.*;
class J {
void bar() {
Test t = new Test();
b.BPackage.test();
b.BPackage.test(t);
System.out.println(b.BPackage.getTEST());
System.out.println(b.BPackage.getTEST(t));
b.BPackage.setTEST("");
b.BPackage.setTEST(t, "");
b.MainKt.test();
b.MainKt.test(t);
System.out.println(b.MainKt.getTEST());
System.out.println(b.MainKt.getTEST(t));
b.MainKt.setTEST("");
b.MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/a/specificStaticImports.java
Vendored
+3 -3
View File
@@ -2,9 +2,9 @@ package a;
import b.Test;
import static b.BPackage.test;
import static b.BPackage.getTEST;
import static b.BPackage.setTEST;
import static b.MainKt.test;
import static b.MainKt.getTEST;
import static b.MainKt.setTEST;
class J {
void bar() {
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/noImports.java
Vendored
+7 -7
View File
@@ -1,16 +1,16 @@
package c;
import b.BPackage;
import b.MainKt;
import b.Test;
class J {
void bar() {
Test t = new Test();
BPackage.test();
BPackage.test(t);
System.out.println(BPackage.getTEST());
System.out.println(BPackage.getTEST(t));
BPackage.setTEST("");
BPackage.setTEST(t, "");
MainKt.test();
MainKt.test(t);
System.out.println(MainKt.getTEST());
System.out.println(MainKt.getTEST(t));
MainKt.setTEST("");
MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandImport.java
Vendored
+7 -7
View File
@@ -1,16 +1,16 @@
package c;
import b.BPackage;
import b.MainKt;
import b.Test;
class J {
void bar() {
Test t = new Test();
BPackage.test();
BPackage.test(t);
System.out.println(BPackage.getTEST());
System.out.println(BPackage.getTEST(t));
BPackage.setTEST("");
BPackage.setTEST(t, "");
MainKt.test();
MainKt.test(t);
System.out.println(MainKt.getTEST());
System.out.println(MainKt.getTEST(t));
MainKt.setTEST("");
MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/onDemandStaticImport.java
Vendored
+8 -6
View File
@@ -2,14 +2,16 @@ package c;
import b.Test;
import static a.MainKt.*;
class J {
void bar() {
Test t = new Test();
b.BPackage.test();
b.BPackage.test(t);
System.out.println(b.BPackage.getTEST());
System.out.println(b.BPackage.getTEST(t));
b.BPackage.setTEST("");
b.BPackage.setTEST(t, "");
b.MainKt.test();
b.MainKt.test(t);
System.out.println(b.MainKt.getTEST());
System.out.println(b.MainKt.getTEST(t));
b.MainKt.setTEST("");
b.MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificImports.java
Vendored
+7 -7
View File
@@ -1,16 +1,16 @@
package c;
import b.Test;
import b.BPackage;
import b.MainKt;
class J {
void bar() {
Test t = new Test();
BPackage.test();
BPackage.test(t);
System.out.println(BPackage.getTEST());
System.out.println(BPackage.getTEST(t));
BPackage.setTEST("");
BPackage.setTEST(t, "");
MainKt.test();
MainKt.test(t);
System.out.println(MainKt.getTEST());
System.out.println(MainKt.getTEST(t));
MainKt.setTEST("");
MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/after/c/specificStaticImports.java
Vendored
+3 -3
View File
@@ -2,9 +2,9 @@ package c;
import b.Test;
import static b.BPackage.test;
import static b.BPackage.getTEST;
import static b.BPackage.setTEST;
import static b.MainKt.test;
import static b.MainKt.getTEST;
import static b.MainKt.setTEST;
class J {
void bar() {
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/noImports.java
Vendored
+6 -6
View File
@@ -3,11 +3,11 @@ package a;
class J {
void bar() {
Test t = new Test();
APackage.test();
APackage.test(t);
System.out.println(APackage.getTEST());
System.out.println(APackage.getTEST(t));
APackage.setTEST("");
APackage.setTEST(t, "");
MainKt.test();
MainKt.test(t);
System.out.println(MainKt.getTEST());
System.out.println(MainKt.getTEST(t));
MainKt.setTEST("");
MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/onDemandStaticImport.java
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package a;
import static a.APackage.*;
import static a.MainKt.*;
class J {
void bar() {
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/a/specificStaticImports.java
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
package a;
import static a.APackage.test;
import static a.APackage.getTEST;
import static a.APackage.setTEST;
import static a.MainKt.test;
import static a.MainKt.getTEST;
import static a.MainKt.setTEST;
class J {
void bar() {
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/noImports.java
Vendored
+6 -6
View File
@@ -3,11 +3,11 @@ package c;
class J {
void bar() {
a.Test t = new a.Test();
a.APackage.test();
a.APackage.test(t);
System.out.println(a.APackage.getTEST());
System.out.println(a.APackage.getTEST(t));
a.APackage.setTEST("");
a.APackage.setTEST(t, "");
a.MainKt.test();
a.MainKt.test(t);
System.out.println(a.MainKt.getTEST());
System.out.println(a.MainKt.getTEST(t));
a.MainKt.setTEST("");
a.MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandImport.java
Vendored
+6 -6
View File
@@ -5,11 +5,11 @@ import a.*;
class J {
void bar() {
Test t = new Test();
APackage.test();
APackage.test(t);
System.out.println(APackage.getTEST());
System.out.println(APackage.getTEST(t));
APackage.setTEST("");
APackage.setTEST(t, "");
MainKt.test();
MainKt.test(t);
System.out.println(MainKt.getTEST());
System.out.println(MainKt.getTEST(t));
MainKt.setTEST("");
MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/onDemandStaticImport.java
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package c;
import static a.APackage.*;
import static a.MainKt.*;
class J {
void bar() {
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificImports.java
Vendored
+7 -7
View File
@@ -1,16 +1,16 @@
package c;
import a.Test;
import a.APackage;
import a.MainKt;
class J {
void bar() {
Test t = new Test();
APackage.test();
APackage.test(t);
System.out.println(APackage.getTEST());
System.out.println(APackage.getTEST(t));
APackage.setTEST("");
APackage.setTEST(t, "");
MainKt.test();
MainKt.test(t);
System.out.println(MainKt.getTEST());
System.out.println(MainKt.getTEST(t));
MainKt.setTEST("");
MainKt.setTEST(t, "");
}
}
idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/before/c/specificStaticImports.java
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
package c;
import static a.APackage.test;
import static a.APackage.getTEST;
import static a.APackage.setTEST;
import static a.MainKt.test;
import static a.MainKt.getTEST;
import static a.MainKt.setTEST;
class J {
void bar() {
idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/after/a/onDemandStaticImport.java
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+3 -1
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+3 -1
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+3 -1
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+2
View File
@@ -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
Vendored
+3 -3
View File
@@ -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
Vendored
+4 -2
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+4 -2
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+3 -3
View File
@@ -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
Vendored
+3 -3
View File
@@ -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
Vendored
+4 -2
View File
@@ -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
Vendored
+3 -3
View File
@@ -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
Vendored
+2 -2
View File
@@ -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() {