Fix 'optimizeImports' tests

2019-05-06 14:59:47 +07:00
parent 75fb74b262
commit e857425b35
14 changed files with 3 additions and 34 deletions
@@ -1,5 +0,0 @@
-import kotlin.Any
-
-fun foo(): Any  {
-    throw UnsupportedOperationException()
-}
@@ -1,3 +0,0 @@
-fun foo(): Any  {
-    throw UnsupportedOperationException()
-}
@@ -10,4 +10,3 @@ fun main(args: Array<String>) {
 }

 // For KT-3620 Don't auto-import kotlin.js.* and remove in `optimize imports`
-// JS
@@ -8,4 +8,3 @@ fun main(args: Array<String>) {
 }

 // For KT-3620 Don't auto-import kotlin.js.* and remove in `optimize imports`
-// JS
@@ -1,4 +1,3 @@
-// RUNTIME
 import kotlin.concurrent.fixedRateTimer
 import kotlin.concurrent.read
 import java.util.ArrayList
@@ -1,4 +1,3 @@
-// RUNTIME
 import java.util.ArrayList
 import kotlin.concurrent.fixedRateTimer

@@ -1,7 +1,6 @@
 import java.util.ArrayList
 import java.util.HashMap
 import kotlin.system.measureTimeMillis
-import kotlin.test.Asserter

 class Action {
    fun test() {
@@ -1,19 +1,13 @@
-import com.sun.corba.se.impl.util.JDKBridge
 import kotlin.collections.filter
 import java.lang.StringBuilder
-import java.net.HttpRetryException
 import java.util.ArrayList
 import java.util.HashMap
-import kotlin.test.Asserter
-import kotlin.Charsets
-import kotlin.Assertions
+import kotlin.text.Charsets
 import kotlin.system.measureTimeMillis

 class Action {
    fun test() {
        val chs = Charsets.UTF8
-        val traait : Asserter? = null
-        val objectImport : Assertions? = null
        measureTimeMillis({ println(HashMap<String, Int>().size) })
        val test : ArrayList<Int>? = null
    }
@@ -5,8 +5,6 @@ import kotlin.system.measureTimeMillis
 class Action {
    fun test() {
        val chs = Charsets.UTF8
-        val traait : Asserter? = null
-        val objectImport : Assertions? = null
        measureTimeMillis({ println(HashMap<String, Int>().size) })
        val test : ArrayList<Int>? = null
    }
@@ -0,0 +1,2 @@
+Additional checking of reference Getter: Charsets
+Additional checking of reference KtSimpleNameReference: Charsets
@@ -1,5 +1,4 @@
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
-// RUNTIME_WITH_FULL_JDK
 import java.lang.Character.*

 /**
@@ -1,5 +1,4 @@
 // NAME_COUNT_TO_USE_STAR_IMPORT: 1
-// RUNTIME_WITH_FULL_JDK
 import java.lang.Character.UPPERCASE_LETTER

 /**
@@ -174,11 +174,6 @@ public class JsOptimizeImportsTestGenerated extends AbstractJsOptimizeImportsTes
            runTest("idea/testData/editor/optimizeImports/common/TwoConstructors.kt");
        }

-        @TestMetadata("TypeAliasUsage.kt")
-        public void testTypeAliasUsage() throws Exception {
-            runTest("idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt");
-        }
-
        @TestMetadata("idea/testData/editor/optimizeImports/common/kt21515")
        @TestDataPath("$PROJECT_ROOT")
        @RunWith(JUnit3RunnerWithInners.class)
@@ -367,11 +367,6 @@ public class JvmOptimizeImportsTestGenerated extends AbstractJvmOptimizeImportsT
            runTest("idea/testData/editor/optimizeImports/common/TwoConstructors.kt");
        }

-        @TestMetadata("TypeAliasUsage.kt")
-        public void testTypeAliasUsage() throws Exception {
-            runTest("idea/testData/editor/optimizeImports/common/TypeAliasUsage.kt");
-        }
-
        @TestMetadata("idea/testData/editor/optimizeImports/common/kt21515")
        @TestDataPath("$PROJECT_ROOT")
        @RunWith(JUnit3RunnerWithInners.class)