From 3329136c9c2436bca48ed950c2368fb0bd6ebce1 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 7 Apr 2015 18:13:01 +0300 Subject: [PATCH] Fix test data for quickfix tests Depending on Module and ModuleBuilder from runtime --- .../afterAddFunctionParameterLongNameRuntime.kt | 10 +++++----- .../beforeAddFunctionParameterLongNameRuntime.kt | 2 +- .../afterWrongGetterParameterTypeLongNameRuntime.kt | 8 ++++---- .../beforeWrongGetterParameterTypeLongNameRuntime.kt | 6 +++--- ...iteralParameterTypeToFunctionTypeLongNameRuntime.kt | 10 +++++----- ...turnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt | 8 ++++---- ...fterExpectedParameterTypeMismatchLongNameRuntime.kt | 8 ++++---- ...iteralParameterTypeToFunctionTypeLongNameRuntime.kt | 4 ++-- ...turnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt | 6 +++--- ...foreExpectedParameterTypeMismatchLongNameRuntime.kt | 4 ++-- .../casts/afterTypeMismatchLongNameRuntime.kt | 10 +++++----- .../casts/beforeTypeMismatchLongNameRuntime.kt | 6 +++--- .../afterChangeParameterTypeLongNameRuntime.kt | 8 ++++---- .../beforeChangeParameterTypeLongNameRuntime.kt | 4 ++-- 14 files changed, 47 insertions(+), 47 deletions(-) diff --git a/idea/testData/quickfix/changeSignature/afterAddFunctionParameterLongNameRuntime.kt b/idea/testData/quickfix/changeSignature/afterAddFunctionParameterLongNameRuntime.kt index f99c4b6f72e..5aee2c1851a 100644 --- a/idea/testData/quickfix/changeSignature/afterAddFunctionParameterLongNameRuntime.kt +++ b/idea/testData/quickfix/changeSignature/afterAddFunctionParameterLongNameRuntime.kt @@ -1,10 +1,10 @@ // "Add parameter to function 'foo'" "true" // DISABLE-ERRORS -import kotlin.modules.ModuleBuilder +import java.util.LinkedHashSet -fun foo(x: Int, moduleBuilder: ModuleBuilder) { - foo(, kotlin.modules.ModuleBuilder("", "")); - foo(1, kotlin.modules.ModuleBuilder("", "")); - foo(2, kotlin.modules.ModuleBuilder("", "")); +fun foo(x: Int, linkedHashSet: LinkedHashSet) { + foo(, java.util.LinkedHashSet()); + foo(1, java.util.LinkedHashSet()); + foo(2, java.util.LinkedHashSet()); } \ No newline at end of file diff --git a/idea/testData/quickfix/changeSignature/beforeAddFunctionParameterLongNameRuntime.kt b/idea/testData/quickfix/changeSignature/beforeAddFunctionParameterLongNameRuntime.kt index 16d375e6495..6a3ddd3e31b 100644 --- a/idea/testData/quickfix/changeSignature/beforeAddFunctionParameterLongNameRuntime.kt +++ b/idea/testData/quickfix/changeSignature/beforeAddFunctionParameterLongNameRuntime.kt @@ -4,5 +4,5 @@ fun foo(x: Int) { foo(,); foo(1); - foo(2, kotlin.modules.ModuleBuilder("", "")); + foo(2, java.util.LinkedHashSet()); } \ No newline at end of file diff --git a/idea/testData/quickfix/typeAddition/afterWrongGetterParameterTypeLongNameRuntime.kt b/idea/testData/quickfix/typeAddition/afterWrongGetterParameterTypeLongNameRuntime.kt index 22765abb03d..83901a35fa0 100644 --- a/idea/testData/quickfix/typeAddition/afterWrongGetterParameterTypeLongNameRuntime.kt +++ b/idea/testData/quickfix/typeAddition/afterWrongGetterParameterTypeLongNameRuntime.kt @@ -1,8 +1,8 @@ -// "Change getter type to Module" "true" +// "Change getter type to HashSet" "true" -import kotlin.modules.Module +import java.util.HashSet class A() { - val i: kotlin.modules.Module - get(): Module = kotlin.modules.ModuleBuilder("", "") + val i: java.util.HashSet + get(): HashSet = java.util.LinkedHashSet() } diff --git a/idea/testData/quickfix/typeAddition/beforeWrongGetterParameterTypeLongNameRuntime.kt b/idea/testData/quickfix/typeAddition/beforeWrongGetterParameterTypeLongNameRuntime.kt index a0d95d92625..7687df89d74 100644 --- a/idea/testData/quickfix/typeAddition/beforeWrongGetterParameterTypeLongNameRuntime.kt +++ b/idea/testData/quickfix/typeAddition/beforeWrongGetterParameterTypeLongNameRuntime.kt @@ -1,6 +1,6 @@ -// "Change getter type to Module" "true" +// "Change getter type to HashSet" "true" class A() { - val i: kotlin.modules.Module - get(): Any = kotlin.modules.ModuleBuilder("", "") + val i: java.util.HashSet + get(): Any = java.util.LinkedHashSet() } diff --git a/idea/testData/quickfix/typeMismatch/afterChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/afterChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt index 93e13b4bb21..561adf2f89a 100644 --- a/idea/testData/quickfix/typeMismatch/afterChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/afterChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt @@ -1,10 +1,10 @@ -// "Change type from 'String' to '(ModuleBuilder) -> Module'" "true" +// "Change type from 'String' to '(LinkedHashSet) -> HashSet'" "true" -import kotlin.modules.Module -import kotlin.modules.ModuleBuilder +import java.util.HashSet +import java.util.LinkedHashSet -fun foo(f: ((kotlin.modules.ModuleBuilder) -> kotlin.modules.Module) -> String) { +fun foo(f: ((java.util.LinkedHashSet) -> java.util.HashSet) -> String) { foo { - (f: (ModuleBuilder) -> Module) -> "42" + (f: (LinkedHashSet) -> HashSet) -> "42" } } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt index 8f0fa00ed02..3c680718e8e 100644 --- a/idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/afterChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt @@ -1,6 +1,6 @@ -// "Change 'bar' function return type to 'Module'" "true" +// "Change 'bar' function return type to 'HashSet'" "true" -import kotlin.modules.Module +import java.util.HashSet -fun bar(): Module = kotlin.modules.ModuleBuilder("", "") -fun foo(): kotlin.modules.Module = bar() \ No newline at end of file +fun bar(): HashSet = java.util.LinkedHashSet() +fun foo(): java.util.HashSet = bar() \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/afterExpectedParameterTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/afterExpectedParameterTypeMismatchLongNameRuntime.kt index ce444b2b913..71047972818 100644 --- a/idea/testData/quickfix/typeMismatch/afterExpectedParameterTypeMismatchLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/afterExpectedParameterTypeMismatchLongNameRuntime.kt @@ -1,9 +1,9 @@ -// "Change type from 'String' to 'Module'" "true" +// "Change type from 'String' to 'HashSet'" "true" -import kotlin.modules.Module +import java.util.HashSet -fun foo(f: (kotlin.modules.Module) -> String) { +fun foo(f: (java.util.HashSet) -> String) { foo { - (x: Module) -> "" + (x: HashSet) -> "" } } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt index e8cc4332aa3..7e9e824e73a 100644 --- a/idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt @@ -1,6 +1,6 @@ -// "Change type from 'String' to '(ModuleBuilder) -> Module'" "true" +// "Change type from 'String' to '(LinkedHashSet) -> HashSet'" "true" -fun foo(f: ((kotlin.modules.ModuleBuilder) -> kotlin.modules.Module) -> String) { +fun foo(f: ((java.util.LinkedHashSet) -> java.util.HashSet) -> String) { foo { (f: String) -> "42" } diff --git a/idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt index 03883440b26..ccd870121b5 100644 --- a/idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt @@ -1,4 +1,4 @@ -// "Change 'bar' function return type to 'Module'" "true" +// "Change 'bar' function return type to 'HashSet'" "true" -fun bar(): Any = kotlin.modules.ModuleBuilder("", "") -fun foo(): kotlin.modules.Module = bar() \ No newline at end of file +fun bar(): Any = java.util.LinkedHashSet() +fun foo(): java.util.HashSet = bar() \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatchLongNameRuntime.kt index b401cf85aab..b362d569f6a 100644 --- a/idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatchLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatchLongNameRuntime.kt @@ -1,6 +1,6 @@ -// "Change type from 'String' to 'Module'" "true" +// "Change type from 'String' to 'HashSet'" "true" -fun foo(f: (kotlin.modules.Module) -> String) { +fun foo(f: (java.util.HashSet) -> String) { foo { (x: String) -> "" } diff --git a/idea/testData/quickfix/typeMismatch/casts/afterTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/casts/afterTypeMismatchLongNameRuntime.kt index ea4693ffe9b..cb6916de012 100644 --- a/idea/testData/quickfix/typeMismatch/casts/afterTypeMismatchLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/casts/afterTypeMismatchLongNameRuntime.kt @@ -1,9 +1,9 @@ -// "Cast expression 'module' to 'ModuleBuilder'" "true" +// "Cast expression 'module' to 'LinkedHashSet'" "true" // DISABLE-ERRORS -import kotlin.modules.ModuleBuilder +import java.util.LinkedHashSet -fun foo(): kotlin.modules.ModuleBuilder { - val module: kotlin.modules.Module = kotlin.modules.ModuleBuilder("", "") - return module as ModuleBuilder +fun foo(): java.util.LinkedHashSet { + val module: java.util.HashSet = java.util.LinkedHashSet() + return module as LinkedHashSet } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatchLongNameRuntime.kt index c80cfeec3b0..f487e639726 100644 --- a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatchLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatchLongNameRuntime.kt @@ -1,7 +1,7 @@ -// "Cast expression 'module' to 'ModuleBuilder'" "true" +// "Cast expression 'module' to 'LinkedHashSet'" "true" // DISABLE-ERRORS -fun foo(): kotlin.modules.ModuleBuilder { - val module: kotlin.modules.Module = kotlin.modules.ModuleBuilder("", "") +fun foo(): java.util.LinkedHashSet { + val module: java.util.HashSet = java.util.LinkedHashSet() return module } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeParameterTypeLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeParameterTypeLongNameRuntime.kt index 01520787701..eb6d84bc2bd 100644 --- a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeParameterTypeLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/afterChangeParameterTypeLongNameRuntime.kt @@ -1,8 +1,8 @@ -// "Change parameter 'x' type of function 'bar.foo' to '(Module) -> Int'" "true" +// "Change parameter 'x' type of function 'bar.foo' to '(HashSet) -> Int'" "true" package bar -import kotlin.modules.Module +import java.util.HashSet -fun foo(w: Int = 0, x: (Module) -> Int, y: Int = 0, z: (Int) -> Int = {42}) { - foo(1, { a: kotlin.modules.Module -> 42}, 1) +fun foo(w: Int = 0, x: (HashSet) -> Int, y: Int = 0, z: (Int) -> Int = {42}) { + foo(1, { a: java.util.HashSet -> 42}, 1) } diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeParameterTypeLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeParameterTypeLongNameRuntime.kt index b9e56eae730..f1ce5c68525 100644 --- a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeParameterTypeLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeParameterTypeLongNameRuntime.kt @@ -1,5 +1,5 @@ -// "Change parameter 'x' type of function 'bar.foo' to '(Module) -> Int'" "true" +// "Change parameter 'x' type of function 'bar.foo' to '(HashSet) -> Int'" "true" package bar fun foo(w: Int = 0, x: Int, y: Int = 0, z: (Int) -> Int = {42}) { - foo(1, { a: kotlin.modules.Module -> 42}, 1) + foo(1, { a: java.util.HashSet -> 42}, 1) }