From fd893ba49920d6dd031d48801765d9a6b88418f5 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 15 Oct 2015 21:19:38 +0300 Subject: [PATCH] Fix test data for reconcile package with directory test (cherry picked from commit b926e02) --- .../changeToDefaultPackage/after/usagesWithFqNames.java | 2 +- .../changeToDefaultPackage/after/usagesWithImports.java | 2 +- .../changeToDefaultPackage/before/usagesWithFqNames.java | 2 +- .../changeToDefaultPackage/before/usagesWithImports.java | 2 +- .../after/target/usagesWithFqNames.java | 2 +- .../after/target/usagesWithImports.java | 2 +- .../after/usages/usagesWithFqNames.java | 4 ++-- .../after/usages/usagesWithImports.java | 2 +- .../before/target/usagesWithFqNames.java | 2 +- .../before/target/usagesWithImports.java | 2 +- .../before/usages/usagesWithFqNames.java | 2 +- .../before/usages/usagesWithImports.java | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithFqNames.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithFqNames.java index 4eed85888e6..30e11bcfc8e 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithFqNames.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithFqNames.java @@ -1,6 +1,6 @@ class Test { static void test() { new Foo(); - _DefaultPackage.foo(); + TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.java index 852ffc06cc5..5a08c4bdb23 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/after/usagesWithImports.java @@ -1,4 +1,4 @@ -import static _DefaultPackage.foo; +import static TestKt.foo; class Test { static void test() { diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithFqNames.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithFqNames.java index 3e30c6c2267..e7b22b1c331 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithFqNames.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithFqNames.java @@ -1,6 +1,6 @@ class Test { static void test() { new source.Foo(); - source.SourcePackage.foo(); + source.TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithImports.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithImports.java index e1ff38b1908..2f4a73c1fbf 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithImports.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/before/usagesWithImports.java @@ -1,5 +1,5 @@ import source.Foo; -import static source.SourcePackage.foo; +import static source.TestKt.foo; class Test { static void test() { diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithFqNames.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithFqNames.java index 42a5fe007f3..3d930cf6c9f 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithFqNames.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithFqNames.java @@ -3,6 +3,6 @@ package target; class Test { static void test() { new Foo(); - TargetPackage.foo(); + TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.java index 0e07fe87e3a..6015ab42f46 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/target/usagesWithImports.java @@ -1,6 +1,6 @@ package target; -import static target.TargetPackage.foo; +import static target.TestKt.foo; class Test { static void test() { diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithFqNames.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithFqNames.java index 201ecd0a871..bda9a2c0e16 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithFqNames.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithFqNames.java @@ -1,11 +1,11 @@ package usages; import target.Foo; -import target.TargetPackage; +import target.TestKt; class Test { static void test() { new Foo(); - TargetPackage.foo(); + TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithImports.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithImports.java index 4301144239c..e51f9857914 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithImports.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/after/usages/usagesWithImports.java @@ -1,7 +1,7 @@ package usages; import target.Foo; -import static target.TargetPackage.foo; +import static target.TestKt.foo; class Test { static void test() { diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithFqNames.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithFqNames.java index 52c2498143c..e07f576448f 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithFqNames.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithFqNames.java @@ -3,6 +3,6 @@ package target; class Test { static void test() { new source.Foo(); - source.SourcePackage.foo(); + source.TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithImports.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithImports.java index f83a0941af6..811bc3ef183 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithImports.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/target/usagesWithImports.java @@ -1,7 +1,7 @@ package target; import source.Foo; -import static source.SourcePackage.foo; +import static source.TestKt.foo; class Test { static void test() { diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithFqNames.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithFqNames.java index 41b1a04ff7d..5df0a0bb6fa 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithFqNames.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithFqNames.java @@ -3,6 +3,6 @@ package usages; class Test { static void test() { new source.Foo(); - source.SourcePackage.foo(); + source.TestKt.foo(); } } \ No newline at end of file diff --git a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithImports.java b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithImports.java index 59cb604e2c3..83c3d19096c 100644 --- a/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithImports.java +++ b/idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/before/usages/usagesWithImports.java @@ -1,7 +1,7 @@ package usages; import source.Foo; -import static source.SourcePackage.foo; +import static source.TestKt.foo; class Test { static void test() {