From b66bbdf7a6cee615e301dc441c2b36d8b5442147 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 29 Apr 2019 12:47:49 +0300 Subject: [PATCH] [IDE-NI-MIGRATE] [BAD] Migrate testdata of Extraction tests Bad tests: - IntroduceTypeParameter.testDuplicates - IntroduceTypeParameter.testNullableType - IntroduceTypeParameter.testUserType - IntroduceTypeParameter.testFunctionType - IntroduceTypeParameter.testInClass - ExtractFunction.TypeParameters.testNoVarianceInFun - ExtractFunction.Parameters.CandidateTypes.testNonNullableTypes - ExtractFunction.Parameters.CandidateTypes.testMultipleTypes - ExtractFunction.ControlFlow.OutputValues.testGenericPair - IntroduceVariable.ExplicateTypeArguments.testDeeperNestedCall --- .../extractFunction/controlFlow/outputValues/genericPair.kt | 1 + .../controlFlow/outputValues/genericPair.kt.after | 1 + .../extractFunction/parameters/candidateTypes/multipleTypes.kt | 1 + .../parameters/candidateTypes/multipleTypes.kt.after | 1 + .../parameters/candidateTypes/nonNullableTypes.kt | 1 + .../parameters/candidateTypes/nonNullableTypes.kt.after | 1 + .../extractFunction/typeParameters/noVarianceInFun.kt | 1 + .../extractFunction/typeParameters/noVarianceInFun.kt.after | 1 + idea/testData/refactoring/introduceTypeParameter/duplicates.kt | 2 ++ .../refactoring/introduceTypeParameter/duplicates.kt.after | 2 ++ .../testData/refactoring/introduceTypeParameter/functionType.kt | 2 ++ .../refactoring/introduceTypeParameter/functionType.kt.after | 2 ++ idea/testData/refactoring/introduceTypeParameter/inClass.kt | 2 ++ .../refactoring/introduceTypeParameter/inClass.kt.after | 2 ++ .../testData/refactoring/introduceTypeParameter/nullableType.kt | 2 ++ .../refactoring/introduceTypeParameter/nullableType.kt.after | 2 ++ idea/testData/refactoring/introduceTypeParameter/userType.kt | 2 ++ .../refactoring/introduceTypeParameter/userType.kt.after | 2 ++ .../explicateTypeArguments/DeeperNestedCall.kt | 1 + .../explicateTypeArguments/DeeperNestedCall.kt.after | 1 + 20 files changed, 30 insertions(+) diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt index 8ea9fe5de79..c1a0d07ce56 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // WITH_RUNTIME // PARAM_TYPES: A?, kotlin.Any? // PARAM_TYPES: B, A diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after index 0f697b51de3..b39668d736d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // WITH_RUNTIME // PARAM_TYPES: A?, kotlin.Any? // PARAM_TYPES: B, A diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt index 1d3b83e1984..4acdb1ba92a 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // PARAM_TYPES: kotlin.String // PARAM_DESCRIPTOR: value-parameter p: kotlin.Any defined in foo diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt.after index 5c395748e02..35b8ac908d4 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt.after @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // PARAM_TYPES: kotlin.String // PARAM_DESCRIPTOR: value-parameter p: kotlin.Any defined in foo diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt index 2cf253f3cd2..c2f715a5241 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // PARAM_TYPES: X // PARAM_TYPES: kotlin.String, kotlin.Comparable, kotlin.CharSequence, java.io.Serializable, kotlin.Any // PARAM_DESCRIPTOR: value-parameter x: X defined in foo diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after index a6542c10221..fa45e26c2d2 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt.after @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // PARAM_TYPES: X // PARAM_TYPES: kotlin.String, kotlin.Comparable, kotlin.CharSequence, java.io.Serializable, kotlin.Any // PARAM_DESCRIPTOR: value-parameter x: X defined in foo diff --git a/idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt b/idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt index 4dd0ab516db..8474ae4ebb8 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt +++ b/idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // PARAM_DESCRIPTOR: val e: T? defined in EntityClass.foo // PARAM_TYPES: T?, Entity? // SIBLING: diff --git a/idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt.after index 004ba7e5381..0678cf19c24 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt.after @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // PARAM_DESCRIPTOR: val e: T? defined in EntityClass.foo // PARAM_TYPES: T?, Entity? // SIBLING: diff --git a/idea/testData/refactoring/introduceTypeParameter/duplicates.kt b/idea/testData/refactoring/introduceTypeParameter/duplicates.kt index 6edad23dcca..88b397493d5 100644 --- a/idea/testData/refactoring/introduceTypeParameter/duplicates.kt +++ b/idea/testData/refactoring/introduceTypeParameter/duplicates.kt @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A fun foo(x: List, f: (A) -> Int) { diff --git a/idea/testData/refactoring/introduceTypeParameter/duplicates.kt.after b/idea/testData/refactoring/introduceTypeParameter/duplicates.kt.after index 0698541b4d2..b0558aa4054 100644 --- a/idea/testData/refactoring/introduceTypeParameter/duplicates.kt.after +++ b/idea/testData/refactoring/introduceTypeParameter/duplicates.kt.after @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A fun foo(x: List, f: (T) -> Int) { diff --git a/idea/testData/refactoring/introduceTypeParameter/functionType.kt b/idea/testData/refactoring/introduceTypeParameter/functionType.kt index cb64520e6f3..815e1aa88e1 100644 --- a/idea/testData/refactoring/introduceTypeParameter/functionType.kt +++ b/idea/testData/refactoring/introduceTypeParameter/functionType.kt @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A fun foo(x: List<(A?) -> List>) { diff --git a/idea/testData/refactoring/introduceTypeParameter/functionType.kt.after b/idea/testData/refactoring/introduceTypeParameter/functionType.kt.after index 7255668a629..2f08d9a252a 100644 --- a/idea/testData/refactoring/introduceTypeParameter/functionType.kt.after +++ b/idea/testData/refactoring/introduceTypeParameter/functionType.kt.after @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A fun List> foo(x: List) { diff --git a/idea/testData/refactoring/introduceTypeParameter/inClass.kt b/idea/testData/refactoring/introduceTypeParameter/inClass.kt index 5eae9044045..07e04e2251a 100644 --- a/idea/testData/refactoring/introduceTypeParameter/inClass.kt +++ b/idea/testData/refactoring/introduceTypeParameter/inClass.kt @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A open class X(x: List, f: (A) -> Int) { diff --git a/idea/testData/refactoring/introduceTypeParameter/inClass.kt.after b/idea/testData/refactoring/introduceTypeParameter/inClass.kt.after index 3493f2792fb..6d03a639161 100644 --- a/idea/testData/refactoring/introduceTypeParameter/inClass.kt.after +++ b/idea/testData/refactoring/introduceTypeParameter/inClass.kt.after @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A open class X(x: List, f: (T) -> Int) { diff --git a/idea/testData/refactoring/introduceTypeParameter/nullableType.kt b/idea/testData/refactoring/introduceTypeParameter/nullableType.kt index 66b961def76..a727c7f4c30 100644 --- a/idea/testData/refactoring/introduceTypeParameter/nullableType.kt +++ b/idea/testData/refactoring/introduceTypeParameter/nullableType.kt @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A fun foo(x: List<A?>) { diff --git a/idea/testData/refactoring/introduceTypeParameter/nullableType.kt.after b/idea/testData/refactoring/introduceTypeParameter/nullableType.kt.after index 4d402f3b4a0..753961e7fff 100644 --- a/idea/testData/refactoring/introduceTypeParameter/nullableType.kt.after +++ b/idea/testData/refactoring/introduceTypeParameter/nullableType.kt.after @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A fun foo(x: List) { diff --git a/idea/testData/refactoring/introduceTypeParameter/userType.kt b/idea/testData/refactoring/introduceTypeParameter/userType.kt index 028e1260633..377323b290e 100644 --- a/idea/testData/refactoring/introduceTypeParameter/userType.kt +++ b/idea/testData/refactoring/introduceTypeParameter/userType.kt @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A fun foo(x: (List) -> Int) { diff --git a/idea/testData/refactoring/introduceTypeParameter/userType.kt.after b/idea/testData/refactoring/introduceTypeParameter/userType.kt.after index d20963ed9ea..ccce165bdfb 100644 --- a/idea/testData/refactoring/introduceTypeParameter/userType.kt.after +++ b/idea/testData/refactoring/introduceTypeParameter/userType.kt.after @@ -1,3 +1,5 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference + class A fun > foo(x: (T) -> Int) { diff --git a/idea/testData/refactoring/introduceVariable/explicateTypeArguments/DeeperNestedCall.kt b/idea/testData/refactoring/introduceVariable/explicateTypeArguments/DeeperNestedCall.kt index 3b709875367..c07a1ae65ee 100644 --- a/idea/testData/refactoring/introduceVariable/explicateTypeArguments/DeeperNestedCall.kt +++ b/idea/testData/refactoring/introduceVariable/explicateTypeArguments/DeeperNestedCall.kt @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // WITH_RUNTIME import java.util.ArrayList diff --git a/idea/testData/refactoring/introduceVariable/explicateTypeArguments/DeeperNestedCall.kt.after b/idea/testData/refactoring/introduceVariable/explicateTypeArguments/DeeperNestedCall.kt.after index 7bd4ce1dbe7..89211e65ce9 100644 --- a/idea/testData/refactoring/introduceVariable/explicateTypeArguments/DeeperNestedCall.kt.after +++ b/idea/testData/refactoring/introduceVariable/explicateTypeArguments/DeeperNestedCall.kt.after @@ -1,3 +1,4 @@ +// COMPILER_ARGUMENTS: -XXLanguage:-NewInference // WITH_RUNTIME import java.util.ArrayList