Move: Update test data for tests with conflicts

Check refactoring result for the case when conflicts are ignored. Fix move destination when moving to another source root
2017-03-20 12:22:28 +03:00
parent 38f9e99d91
commit 9a3ace423a
59 changed files with 155 additions and 100 deletions
@@ -1,7 +1,7 @@
 public class A {
-    public static String X = "";
 }

 public class B {

+    private static String X = "";
 }
@@ -1,3 +1,3 @@
 fun bar(s: String) {
-    A.X = s
+    B.X = s
 }
@@ -1,5 +1,5 @@
 import A.*

 fun bar(s: String) {
-    X = s
+    B.X = s
 }
@@ -1,4 +1,4 @@
-import A.X as XX
+import B.X as XX

 fun bar(s: String) {
    XX = s