Optimize Imports tests: Switch to generated approach

Move test and rename test data
Delete unused testdata
Rewrite OptimizeImportOnFlyTest

idea/testData/editor/optimizeImports/JavaStaticField/JavaStaticField.after.kt

@@ -1,5 +1,5 @@
-import MyJavaClass.TEST
-
-fun main() {
-    TEST
-}
+import MyJavaClass.TEST
+
+fun main() {
+    TEST
+}

idea/testData/editor/optimizeImports/JavaStaticField/JavaStaticField.kt

@@ -1,6 +1,6 @@
-import MyJavaClass
-import MyJavaClass.TEST
-
-fun main() {
-    TEST
-}
+import MyJavaClass
+import MyJavaClass.TEST
+
+fun main() {
+    TEST
+}

idea/testData/editor/optimizeImports/JavaStaticField/MyJavaClass.java

@@ -1,3 +1,3 @@
-public class MyJavaClass {
-    public static String TEST = "test";
-}
+public class MyJavaClass {
+    public static String TEST = "test";
+}

idea/testData/editor/optimizeImports/KotlinPackage/KotlinPackage.after.kt

@@ -1,3 +1,3 @@
-import test1.test2
-
-val s: test2.test3.Class1? = null
+import test1.test2
+
+val s: test2.test3.Class1? = null

idea/testData/editor/optimizeImports/KotlinPackage/KotlinPackage.kt

@@ -1,6 +1,6 @@
-import test1
-import test1.test2
-import test1.test2.test3
-import test1.test2.test3.Class1
-
-val s: test2.test3.Class1? = null
+import test1
+import test1.test2
+import test1.test2.test3
+import test1.test2.test3.Class1
+
+val s: test2.test3.Class1? = null

idea/testData/editor/optimizeImports/KotlinPackage/kotlinClass.kt

@@ -1,4 +1,4 @@
-package test1.test2.test3
-
-public class Class1 {
-}
+package test1.test2.test3
+
+public class Class1 {
+}

idea/testData/editor/optimizeImports/SortImports.kt

@@ -1,10 +0,0 @@
-package sometest
-
-import java.util.HashSet
-import java.util.ArrayList
-
-class Action {
-    fun test(hash: HashSet<Int>) {
-        val test : ArrayList<Int>? = null
-    }
-}

idea/testData/editor/optimizeImports/SortImports_after.kt

@@ -1,10 +0,0 @@
-package sometest
-
-import java.util.ArrayList
-import java.util.HashSet
-
-class Action {
-    fun test(hash: HashSet<Int>) {
-        val test : ArrayList<Int>? = null
-    }
-}

idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt

@@ -1 +0,0 @@
-import java.util.ArrayList

idea/testData/editor/optimizeImports/onFly/OptimizeImportsOnFly.kt.after

@@ -1 +0,0 @@
-import java.util.HashSet