From 04b2bdcc7976ef04bc089b69994a4237fb717953 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 10 Apr 2015 18:57:52 +0300
Subject: [PATCH] Added test for "import packages" code style setting

---
 .../shortenRefs/ClassNameConflictNoPackageImport.kt         | 5 +++++
 .../shortenRefs/ClassNameConflictNoPackageImport.kt.after   | 5 +++++
 .../jetbrains/kotlin/addImport/AddImportTestGenerated.java  | 1 +
 .../copy/JavaToKotlinCopyPasteConversionTestGenerated.java  | 1 +
 .../kotlin/shortenRefs/ShortenRefsTestGenerated.java        | 6 ++++++
 5 files changed, 18 insertions(+)
 create mode 100644 idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt
 create mode 100644 idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt.after

diff --git a/idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt b/idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt
new file mode 100644
index 00000000000..fa2247c65ad
--- /dev/null
+++ b/idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt
@@ -0,0 +1,5 @@
+// IMPORT_PACKAGES: false
+
+fun foo(array: Array<String>){}
+
+val v: <selection>java.lang.reflect.Array</selection>
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt.after b/idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt.after
new file mode 100644
index 00000000000..9e3f2c8c62a
--- /dev/null
+++ b/idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt.after
@@ -0,0 +1,5 @@
+// IMPORT_PACKAGES: false
+
+fun foo(array: Array<String>){}
+
+val v: java.lang.reflect.Array
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java
index bd21706542f..9aa297accc2 100644
--- a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.addImport;
 
 import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
index 78ed2d9f22a..fc94b3e35bc 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.idea.conversion.copy;
 
 import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
diff --git a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
index f76494c8ff3..59d1d5af4c8 100644
--- a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
@@ -41,6 +41,12 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
         doTest(fileName);
     }
 
+    @TestMetadata("ClassNameConflictNoPackageImport.kt")
+    public void testClassNameConflictNoPackageImport() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("classObject.kt")
     public void testClassObject() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/classObject.kt");