From 56c535d5057f4cf9840466022a65fb292d2f5b9a Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 18 Jul 2018 16:21:27 +0200
Subject: [PATCH] Fix test data

---
 .../importKotlinCompanionPropertyAsFieldFromJava.test     | 8 ++++----
 ...otlinCompanionStaticPropertyDefaultGetterFromJava.test | 2 +-
 ...otlinCompanionStaticPropertyDefaultSetterFromJava.test | 2 +-
 ...inCompanionStaticPropertyOverloadedGetterFromJava.test | 2 +-
 ...inCompanionStaticPropertyOverloadedSetterFromJava.test | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/idea/testData/quickfix/autoImports/importKotlinCompanionPropertyAsFieldFromJava.test b/idea/testData/quickfix/autoImports/importKotlinCompanionPropertyAsFieldFromJava.test
index f54d633145f..564447ff746 100644
--- a/idea/testData/quickfix/autoImports/importKotlinCompanionPropertyAsFieldFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinCompanionPropertyAsFieldFromJava.test
@@ -1,5 +1,5 @@
 // FILE: bar/Foo.before.java
-// "/(Static import|Import static) constant 'foo.Bar.Companion.foobar'/" "true"
+// "/(Static import|Import static) constant 'foo.Bar.foobar'/" "true"
 // ERROR: Unresolved reference: foobar
 // ACTION: Rename reference
 // ACTION: Create field 'foobar'
@@ -19,14 +19,14 @@ public class Foo {
 // FILE: foo/Bar.dependency.kt
 package foo
 
-object Bar {
+class Bar {
     companion object {
         @JvmField var foobar = "foobar"
     }
 }
 
 // FILE: bar/Foo.after.java
-// "/(Static import|Import static) constant 'foo.Bar.Companion.foobar'/" "true"
+// "/(Static import|Import static) constant 'foo.Bar.foobar'/" "true"
 // ERROR: Unresolved reference: foobar
 // ACTION: Rename reference
 // ACTION: Create field 'foobar'
@@ -35,7 +35,7 @@ object Bar {
 // WITH_RUNTIME
 package bar;
 
-import static foo.Bar.Companion.foobar;
+import static foo.Bar.foobar;
 
 public class Foo {
     public void main()
diff --git a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultGetterFromJava.test b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultGetterFromJava.test
index 7e3791c5f06..c6a6e1197c9 100644
--- a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultGetterFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultGetterFromJava.test
@@ -16,7 +16,7 @@ public class Foo {
 // FILE: foo/Bar.dependency.kt
 package foo
 
-object Bar {
+class Bar {
     companion object {
         @JvmStatic val testValue = "foobar";
     }
diff --git a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultSetterFromJava.test b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultSetterFromJava.test
index e2ecf2c5ce7..a14bf34697b 100644
--- a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultSetterFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyDefaultSetterFromJava.test
@@ -16,7 +16,7 @@ public class Foo {
 // FILE: foo/Bar.dependency.kt
 package foo
 
-object Bar {
+class Bar {
     companion object {
         @JvmStatic var variable: String;
     }
diff --git a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedGetterFromJava.test b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedGetterFromJava.test
index 7499bbbeb3e..65dd3546aea 100644
--- a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedGetterFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedGetterFromJava.test
@@ -16,7 +16,7 @@ public class Foo {
 // FILE: foo/Bar.dependency.kt
 package foo
 
-object Bar {
+class Bar {
     companion object {
         val testValue = "foobar"
             @JvmStatic get() {
diff --git a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedSetterFromJava.test b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedSetterFromJava.test
index e5e82a746f1..633832edc78 100644
--- a/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedSetterFromJava.test
+++ b/idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedSetterFromJava.test
@@ -16,7 +16,7 @@ public class Foo {
 // FILE: foo/Bar.dependency.kt
 package foo
 
-object Bar {
+class Bar {
     companion object {
         var variable: String
             @JvmStatic set(value) {