From 704ce121bce89fa836568a59d73e747651c7f901 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 16 Jan 2018 18:41:02 +0300
Subject: [PATCH] Use other property name in Java with Kotlin static import
 tests

---
 ...anionStaticPropertyDefaultGetterFromJava.test | 12 ++++++------
 ...onStaticPropertyOverloadedGetterFromJava.test | 16 ++++++++--------
 ...otlinStaticPropertyDefaultGetterFromJava.test | 16 ++++++++--------
 ...inStaticPropertyOverloadedGetterFromJava.test | 16 ++++++++--------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultGetterFromJava.test b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultGetterFromJava.test
index e620af55fa2..7e3791c5f06 100644
--- a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultGetterFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultGetterFromJava.test
@@ -1,5 +1,5 @@
 // FILE: bar/Foo.before.java
-// "Import static method..." "true"
+// "Import static method 'foo.Bar.getTestValue'" "true"
 // ERROR: Unresolved reference: getValue
 // ACTION: Create method 'foobar'
 // WITH_RUNTIME
@@ -8,7 +8,7 @@ package bar;
 public class Foo {
     public void main()
     {
-        getValue<caret>();
+        getTestValue<caret>();
     }
 }
 
@@ -18,23 +18,23 @@ package foo
 
 object Bar {
     companion object {
-        @JvmStatic val value = "foobar";
+        @JvmStatic val testValue = "foobar";
     }
 }
 
 // FILE: bar/Foo.after.java
-// "Import static method..." "true"
+// "Import static method 'foo.Bar.getTestValue'" "true"
 // ERROR: Unresolved reference: getValue
 // ACTION: Create method 'foobar'
 // WITH_RUNTIME
 package bar;
 
-import static foo.Bar.getValue;
+import static foo.Bar.getTestValue;
 
 public class Foo {
     public void main()
     {
-        getValue<caret>();
+        getTestValue<caret>();
     }
 }
 
diff --git a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedGetterFromJava.test b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedGetterFromJava.test
index 56c4bfb6eec..7499bbbeb3e 100644
--- a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedGetterFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedGetterFromJava.test
@@ -1,6 +1,6 @@
 // FILE: bar/Foo.before.java
-// "Import static method..." "true"
-// ERROR: Unresolved reference: getValue
+// "Import static method 'foo.Bar.getTestValue'" "true"
+// ERROR: Unresolved reference: getTestValue
 // ACTION: Create method 'foobar'
 // WITH_RUNTIME
 package bar;
@@ -8,7 +8,7 @@ package bar;
 public class Foo {
     public void main()
     {
-        getValue<caret>();
+        getTestValue<caret>();
     }
 }
 
@@ -18,25 +18,25 @@ package foo
 
 object Bar {
     companion object {
-        val value = "foobar"
+        val testValue = "foobar"
             @JvmStatic get() {
             }
     }
 }
 
 // FILE: bar/Foo.after.java
-// "Import static method..." "true"
-// ERROR: Unresolved reference: getValue
+// "Import static method 'foo.Bar.getTestValue'" "true"
+// ERROR: Unresolved reference: getTestValue
 // ACTION: Create method 'foobar'
 // WITH_RUNTIME
 package bar;
 
-import static foo.Bar.getValue;
+import static foo.Bar.getTestValue;
 
 public class Foo {
     public void main()
     {
-        getValue<caret>();
+        getTestValue<caret>();
     }
 }
 
diff --git a/idea/testData/quickfix/autoImports/importKotlinStaticPropertyDefaultGetterFromJava.test b/idea/testData/quickfix/autoImports/importKotlinStaticPropertyDefaultGetterFromJava.test
index 89c930bba38..c2acc490293 100644
--- a/idea/testData/quickfix/autoImports/importKotlinStaticPropertyDefaultGetterFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinStaticPropertyDefaultGetterFromJava.test
@@ -1,6 +1,6 @@
 // FILE: bar/Foo.before.java
-// "Import static method..." "true"
-// ERROR: Unresolved reference: getValue
+// "Import static method 'foo.Bar.getTestValue'" "true"
+// ERROR: Unresolved reference: getTestValue
 // ACTION: Create method 'foobar'
 // WITH_RUNTIME
 package bar;
@@ -8,7 +8,7 @@ package bar;
 public class Foo {
     public void main()
     {
-        getValue<caret>();
+        getTestValue<caret>();
     }
 }
 
@@ -17,22 +17,22 @@ public class Foo {
 package foo
 
 object Bar {
-    @JvmStatic val value = "foobar";
+    @JvmStatic val testValue = "foobar";
 }
 
 // FILE: bar/Foo.after.java
-// "Import static method..." "true"
-// ERROR: Unresolved reference: getValue
+// "Import static method 'foo.Bar.getTestValue'" "true"
+// ERROR: Unresolved reference: getTestValue
 // ACTION: Create method 'foobar'
 // WITH_RUNTIME
 package bar;
 
-import static foo.Bar.getValue;
+import static foo.Bar.getTestValue;
 
 public class Foo {
     public void main()
     {
-        getValue<caret>();
+        getTestValue<caret>();
     }
 }
 
diff --git a/idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedGetterFromJava.test b/idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedGetterFromJava.test
index b46e0b68d38..f09707dd1bc 100644
--- a/idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedGetterFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedGetterFromJava.test
@@ -1,6 +1,6 @@
 // FILE: bar/Foo.before.java
-// "Import static method..." "true"
-// ERROR: Unresolved reference: getValue
+// "Import static method 'foo.Bar.getTestValue'" "true"
+// ERROR: Unresolved reference: getTestValue
 // ACTION: Create method 'foobar'
 // WITH_RUNTIME
 package bar;
@@ -8,7 +8,7 @@ package bar;
 public class Foo {
     public void main()
     {
-        getValue<caret>();
+        getTestValue<caret>();
     }
 }
 
@@ -17,24 +17,24 @@ public class Foo {
 package foo
 
 object Bar {
-    val value = "foobar"
+    val testValue = "foobar"
         @JvmStatic get() {
         }
 }
 
 // FILE: bar/Foo.after.java
-// "Import static method..." "true"
-// ERROR: Unresolved reference: getValue
+// "Import static method 'foo.Bar.getTestValue'" "true"
+// ERROR: Unresolved reference: getTestValue
 // ACTION: Create method 'foobar'
 // WITH_RUNTIME
 package bar;
 
-import static foo.Bar.getValue;
+import static foo.Bar.getTestValue;
 
 public class Foo {
     public void main()
     {
-        getValue<caret>();
+        getTestValue<caret>();
     }
 }