From 3a31150df4543c9810fd1482d41cb87dba6526ec Mon Sep 17 00:00:00 2001 From: "anastasiia.spaseeva" Date: Mon, 6 Apr 2020 20:17:49 +0300 Subject: [PATCH] [Spec tests] Metadata refactoring: remove duplicated links in testMaps --- .../callable-references/testsMap.json | 14 - .../navigation-operators/testsMap.json | 7 - .../exhaustive-when-expressions/testsMap.json | 28 -- .../expressions/when-expression/testsMap.json | 406 ------------------ .../infix-function-call/testsMap.json | 14 - .../spec/utils/models/LinkedSpecTest.kt | 21 +- .../kotlin/spec/utils/parsers/CommonParser.kt | 19 +- 7 files changed, 14 insertions(+), 495 deletions(-) diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/call-and-property-access-expressions/callable-references/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/call-and-property-access-expressions/callable-references/testsMap.json index b0cc371f01d..5d21107a9a3 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/call-and-property-access-expressions/callable-references/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/call-and-property-access-expressions/callable-references/testsMap.json @@ -2,13 +2,6 @@ "11": { "pos": { "3": [ - { - "specVersion": "0.1-220", - "casesNumber": 0, - "description": "Callable reference as last expression in block", - "path": "compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-220", "casesNumber": 0, @@ -22,13 +15,6 @@ "3": { "pos": { "1": [ - { - "specVersion": "0.1-220", - "casesNumber": 0, - "description": "Bare type", - "path": "compiler/testData/diagnostics/tests/callableReference/bareType.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-220", "casesNumber": 0, diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/call-and-property-access-expressions/navigation-operators/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/call-and-property-access-expressions/navigation-operators/testsMap.json index b079c548a41..e183128aab6 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/call-and-property-access-expressions/navigation-operators/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/call-and-property-access-expressions/navigation-operators/testsMap.json @@ -2,13 +2,6 @@ "9": { "pos": { "2": [ - { - "specVersion": "0.1-220", - "casesNumber": 0, - "description": "Correct info after array like call", - "path": "compiler/testData/diagnostics/tests/callableReference/correctInfoAfterArrayLikeCall.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-220", "casesNumber": 0, diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json index 0061f2050a4..7266c00302a 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json @@ -452,13 +452,6 @@ "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Branch false bypass else", - "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -527,13 +520,6 @@ "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypass.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Branch false bypass", - "path": "compiler/testData/diagnostics/tests/when/BranchFalseBypass.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -686,13 +672,6 @@ "path": "compiler/testData/diagnostics/tests/when/BranchBypassVal.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Branch bypass val", - "path": "compiler/testData/diagnostics/tests/when/BranchBypassVal.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -721,13 +700,6 @@ "path": "compiler/testData/diagnostics/tests/when/BranchBypassVar.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Branch bypass var", - "path": "compiler/testData/diagnostics/tests/when/BranchBypassVar.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json index f19f8f8eb57..11bca87807e 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json @@ -414,13 +414,6 @@ "path": "compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "When and lambda with expected type", - "path": "compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -428,20 +421,6 @@ "path": "compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Reserved exhaustive when", - "path": "compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "When with nothing and lambdas", - "path": "compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -451,13 +430,6 @@ } ], "5": [ - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "When", - "path": "compiler/testData/diagnostics/tests/when/When.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -508,13 +480,6 @@ "path": "compiler/testData/diagnostics/tests/when/kt10811.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Kt10811", - "path": "compiler/testData/diagnostics/tests/when/kt10811.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -522,20 +487,6 @@ "path": "compiler/testData/diagnostics/tests/when/kt9972.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Kt9972", - "path": "compiler/testData/diagnostics/tests/when/kt9972.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Comma in when condition without argument", - "path": "compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -600,13 +551,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive platform enum else", - "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -621,20 +565,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Exhaustive with nullability check before", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Exhaustive with nullability check else", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -649,20 +579,6 @@ "path": "compiler/testData/diagnostics/tests/when/kt4434.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Kt4434", - "path": "compiler/testData/diagnostics/tests/when/kt4434.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Duplicated labels", - "path": "compiler/testData/diagnostics/tests/when/DuplicatedLabels.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -684,20 +600,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Exhaustive platform enum statement", - "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive platform enum", - "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -719,13 +621,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive nullable", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -740,20 +635,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive initialization", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Exhaustive with nullability check", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -768,20 +649,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Exhaustive with nullability check boolean", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive platform enum annotated", - "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -796,20 +663,6 @@ "path": "compiler/testData/diagnostics/tests/when/NoElseWhenStatement.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "No else when statement", - "path": "compiler/testData/diagnostics/tests/when/NoElseWhenStatement.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Kt10809", - "path": "compiler/testData/diagnostics/tests/when/kt10809.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -824,13 +677,6 @@ "path": "compiler/testData/diagnostics/tests/when/kt10439.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Kt10439", - "path": "compiler/testData/diagnostics/tests/when/kt10439.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -838,20 +684,6 @@ "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveBooleanNullable.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Non exhaustive boolean nullable", - "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveBooleanNullable.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive no initialization", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -866,13 +698,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Exhaustive return throw", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -880,20 +705,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveReturn.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Exhaustive return", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveReturn.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive platform enum null", - "path": "compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -912,20 +723,6 @@ "path": "compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "When type disjunctions", - "path": "compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive boolean nullable", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanNullable.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -940,13 +737,6 @@ "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Non exhaustive warning null", - "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -954,20 +744,6 @@ "path": "compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "No else returned unit", - "path": "compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "No else expected unit", - "path": "compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -989,13 +765,6 @@ "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Non exhaustive warning", - "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -1003,20 +772,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Exhaustive val over conditional init", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive boolean brackets", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanBrackets.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -1038,20 +793,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanComplex.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive boolean complex", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBooleanComplex.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "No else returned coercion to unit", - "path": "compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -1066,20 +807,6 @@ "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Non exhaustive warning false", - "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Non exhaustive warning for sealed class", - "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -1101,13 +828,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBoolean.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive boolean", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBoolean.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -1122,13 +842,6 @@ "path": "compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Non exhaustive platform enum", - "path": "compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -1136,20 +849,6 @@ "path": "compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "No else returned from lambda expected int", - "path": "compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Exhaustive var over conditional init", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -1164,13 +863,6 @@ "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Empty condition with expression enum", - "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -1178,20 +870,6 @@ "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive enum mixed", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Empty condition with expression", - "path": "compiler/testData/diagnostics/tests/when/EmptyConditionWithExpression.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -1206,13 +884,6 @@ "path": "compiler/testData/diagnostics/tests/when/PropertyNotInitialized.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Property not initialized", - "path": "compiler/testData/diagnostics/tests/when/PropertyNotInitialized.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -1220,20 +891,6 @@ "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Non exhaustive warning else", - "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Redundant else", - "path": "compiler/testData/diagnostics/tests/when/RedundantElse.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -1248,13 +905,6 @@ "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Non exhaustive with nullability check", - "path": "compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-152", "casesNumber": 0, @@ -1262,20 +912,6 @@ "path": "compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "No else no expected type", - "path": "compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive enum is", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -1290,20 +926,6 @@ "path": "compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "No else returned non unit", - "path": "compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Exhaustive break continue", - "path": "compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -1318,13 +940,6 @@ "path": "compiler/testData/diagnostics/tests/when/TopLevelSealed.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-152", - "casesNumber": 0, - "description": "Top level sealed", - "path": "compiler/testData/diagnostics/tests/when/TopLevelSealed.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -1332,20 +947,6 @@ "path": "compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Else on nullable enum", - "path": "compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Else on nullable enum with smart cast", - "path": "compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, @@ -1359,13 +960,6 @@ "9": { "pos": { "2": [ - { - "specVersion": "0.1-313", - "casesNumber": 0, - "description": "Annotated when statement", - "path": "compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 0, diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/testsMap.json index a4e0729229e..b6d07138fcb 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/testsMap.json +++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/testsMap.json @@ -241,20 +241,6 @@ "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.2.kt", "unexpectedBehaviour": false }, - { - "specVersion": "0.1-313", - "casesNumber": 4, - "description": "Local extension infix extension callables", - "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.2.kt", - "unexpectedBehaviour": false - }, - { - "specVersion": "0.1-313", - "casesNumber": 2, - "description": "Explicitly imported infix extension callables", - "path": "compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.3.kt", - "unexpectedBehaviour": false - }, { "specVersion": "0.1-313", "casesNumber": 2, diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/models/LinkedSpecTest.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/models/LinkedSpecTest.kt index 33ca143f332..01d3dc42d34 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/models/LinkedSpecTest.kt +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/models/LinkedSpecTest.kt @@ -41,7 +41,7 @@ class LinkedSpecTest( testArea: TestArea, testType: TestType, val place: SpecPlace, - val relevantPlaces: List?, + val relevantPlaces: Set?, testNumber: Int, description: String, cases: SpecTestCasesSet, @@ -51,25 +51,6 @@ class LinkedSpecTest( helpers: Set?, exception: TestsExceptionType? ) : AbstractSpecTest(testArea, testType, place.sections, testNumber, description, cases, unexpectedBehavior, issues, helpers, exception) { - companion object { - fun getInstanceForImplementationTest( - specVersion: String, - testArea: TestArea, - testType: TestType, - specPlaces: List, - filename: String - ): LinkedSpecTest { - val description = filename[0].toUpperCase() + - filename.substring(1).replace(Regex("""([A-Z])"""), " $1").toLowerCase() - - return LinkedSpecTest( - specVersion, testArea, testType, specPlaces.first(), - if (specPlaces.size > 1) specPlaces.subList(1, specPlaces.size) else null, 0, description, - SpecTestCasesSet(mutableMapOf(), mutableMapOf(), mutableMapOf()), - unexpectedBehavior = false, unspecifiedBehavior = false, issues = setOf(), helpers = null, exception = null - ) - } - } override fun checkPathConsistency(pathMatcher: Matcher) = testArea == TestArea.valueOf(pathMatcher.group("testArea").withUnderscores()) diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/CommonParser.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/CommonParser.kt index 0197ad49baa..ce02ff9c76a 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/CommonParser.kt +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/CommonParser.kt @@ -56,7 +56,7 @@ object CommonParser { private fun parseRelevantPlaces( placesMatcher: Matcher?, - relevantPlaces: MutableList + relevantPlaces: MutableSet ) { if (placesMatcher == null) return @@ -69,29 +69,36 @@ object CommonParser { } fun parseLinkedSpecTest(testFilePath: String, testFiles: TestFiles, isImplementationTest: Boolean = false): LinkedSpecTest { - val relevantAndAlternativePlaces = mutableListOf() + val relevantPlaces = mutableSetOf() val parsedTestFile = tryParseTestInfo(testFilePath, testFiles, SpecTestLinkedType.LINKED, isImplementationTest) val testInfoElements = parsedTestFile.testInfoElements parseRelevantPlaces( testInfoElements[LinkedSpecTestFileInfoElementType.PRIMARY_LINKS]?.additionalMatcher, - relevantAndAlternativePlaces + relevantPlaces ) parseRelevantPlaces( testInfoElements[LinkedSpecTestFileInfoElementType.SECONDARY_LINKS]?.additionalMatcher, - relevantAndAlternativePlaces + relevantPlaces ) val placeMatcher = testInfoElements[LinkedSpecTestFileInfoElementType.MAIN_LINK]?.additionalMatcher + val mainPlace: SpecPlace + if (placeMatcher != null) { + mainPlace = createSpecPlace(placeMatcher) + } else { + mainPlace = relevantPlaces.first() + relevantPlaces.remove(mainPlace) + } return LinkedSpecTest( testInfoElements[LinkedSpecTestFileInfoElementType.SPEC_VERSION]!!.content, parsedTestFile.testArea, parsedTestFile.testType, - if (placeMatcher != null) createSpecPlace(placeMatcher) else relevantAndAlternativePlaces.first(), - relevantAndAlternativePlaces, + mainPlace, + relevantPlaces, parsedTestFile.testNumber, parsedTestFile.testDescription, parsedTestFile.testCasesSet,