[Spec tests] fix test parser exceptions handler

compiler/tests-spec/testData/codegen/box/linked/expressions/built-in-types-and-their-semantics/kotlin.nothing-1/p-1/pos/1.2.kt

@@ -6,7 +6,7 @@
  * SPEC VERSION: 0.1-213
  * PLACE: expressions, built-in-types-and-their-semantics, kotlin.nothing-1 -> paragraph 1 -> sentence 1
  * NUMBER: 2
- * DESCRIPTION:
+ * DESCRIPTION: check kotlin.Nothing type
  */
 
 fun box(): String {

compiler/tests-spec/testData/codegen/box/linked/expressions/built-in-types-and-their-semantics/kotlin.nothing-1/p-1/pos/1.3.kt

@@ -6,7 +6,7 @@
  * SPEC VERSION: 0.1-213
  * PLACE: expressions, built-in-types-and-their-semantics, kotlin.nothing-1 -> paragraph 1 -> sentence 1
  * NUMBER: 3
- * DESCRIPTION:
+ * DESCRIPTION: check kotlin.Nothing type
  */
 
 fun box(): String {

compiler/tests-spec/testData/codegen/box/linked/expressions/built-in-types-and-their-semantics/kotlin.nothing-1/p-1/pos/1.4.kt

@@ -6,7 +6,7 @@
  * SPEC VERSION: 0.1-213
  * PLACE: expressions, built-in-types-and-their-semantics, kotlin.nothing-1 -> paragraph 1 -> sentence 1
  * NUMBER: 4
- * DESCRIPTION:
+ * DESCRIPTION: check kotlin.Nothing type
  */
 
 

compiler/tests-spec/testData/codegen/box/linked/expressions/built-in-types-and-their-semantics/kotlin.nothing-1/p-1/pos/1.5.kt

@@ -6,7 +6,7 @@
  * SPEC VERSION: 0.1-213
  * PLACE: expressions, built-in-types-and-their-semantics, kotlin.nothing-1 -> paragraph 1 -> sentence 1
  * NUMBER: 5
- * DESCRIPTION:
+ * DESCRIPTION: check kotlin.Nothing type
  */
 
 

compiler/tests-spec/testData/codegen/box/linked/expressions/built-in-types-and-their-semantics/kotlin.nothing-1/p-1/pos/1.6.kt

@@ -6,7 +6,7 @@
  * SPEC VERSION: 0.1-213
  * PLACE: expressions, built-in-types-and-their-semantics, kotlin.nothing-1 -> paragraph 1 -> sentence 1
  * NUMBER: 6
- * DESCRIPTION:
+ * DESCRIPTION: check kotlin.Nothing type
  */
 
 

compiler/tests-spec/testData/codegen/box/linked/expressions/built-in-types-and-their-semantics/kotlin.nothing-1/p-1/pos/1.7.kt

@@ -7,7 +7,7 @@
  * SPEC VERSION: 0.1-213
  * PLACE: expressions, built-in-types-and-their-semantics, kotlin.nothing-1 -> paragraph 1 -> sentence 1
  * NUMBER: 7
- * DESCRIPTION:
+ * DESCRIPTION: check kotlin.Nothing type
  */
 
 import java.util.*

compiler/tests-spec/testData/codegen/box/linked/expressions/built-in-types-and-their-semantics/kotlin.nothing-1/p-1/pos/1.8.kt

@@ -6,7 +6,7 @@
  * SPEC VERSION: 0.1-213
  * PLACE: expressions, built-in-types-and-their-semantics, kotlin.nothing-1 -> paragraph 1 -> sentence 1
  * NUMBER: 8
- * DESCRIPTION:
+ * DESCRIPTION: check kotlin.Nothing type
  */
 
 fun box(): String {

compiler/tests-spec/testData/codegen/box/linked/expressions/built-in-types-and-their-semantics/kotlin.nothing-1/p-1/pos/1.9.kt

@@ -7,7 +7,7 @@
  * SPEC VERSION: 0.1-213
  * PLACE: expressions, built-in-types-and-their-semantics, kotlin.nothing-1 -> paragraph 1 -> sentence 1
  * NUMBER: 9
- * DESCRIPTION:
+ * DESCRIPTION: check kotlin.Nothing type
  */
 
 fun box(): String {

compiler/tests-spec/testData/codegen/box/linked/expressions/built-in-types-and-their-semantics/kotlin.nothing-1/testsMap.json

@@ -5,25 +5,25 @@
         {
           "specVersion": "0.1-213",
           "casesNumber": 0,
-          "description": "",
+          "description": "check kotlin.Nothing type",
           "unexpectedBehaviour": false
         },
         {
           "specVersion": "0.1-213",
           "casesNumber": 0,
-          "description": "",
+          "description": "check kotlin.Nothing type",
           "unexpectedBehaviour": false
         },
         {
           "specVersion": "0.1-213",
           "casesNumber": 0,
-          "description": "",
+          "description": "check kotlin.Nothing type",
           "unexpectedBehaviour": false
         },
         {
           "specVersion": "0.1-213",
           "casesNumber": 0,
-          "description": "",
+          "description": "check kotlin.Nothing type",
           "unexpectedBehaviour": false
         },
         {
@@ -35,25 +35,25 @@
         {
           "specVersion": "0.1-213",
           "casesNumber": 0,
-          "description": "",
+          "description": "check kotlin.Nothing type",
           "unexpectedBehaviour": false
         },
         {
           "specVersion": "0.1-213",
           "casesNumber": 0,
-          "description": "",
+          "description": "check kotlin.Nothing type",
           "unexpectedBehaviour": false
         },
         {
           "specVersion": "0.1-213",
           "casesNumber": 0,
-          "description": "",
+          "description": "check kotlin.Nothing type",
           "unexpectedBehaviour": false
         },
         {
           "specVersion": "0.1-213",
           "casesNumber": 0,
-          "description": "",
+          "description": "check kotlin.Nothing type",
           "unexpectedBehaviour": false
         },
         {

compiler/tests-spec/testData/codegen/box/linked/expressions/cast-expression/p-1/pos/1.1.kt

@@ -6,7 +6,7 @@
  * SPEC VERSION: 0.1-213
  * PLACE: expressions, cast-expression -> paragraph 1 -> sentence 1
  * NUMBER: 1
- * DESCRIPTION: check of the cast operators as or as?
+ * DESCRIPTION: check of the cast operators as or as?
  */
 
 fun box(): String {

compiler/tests-spec/testData/codegen/box/linked/expressions/cast-expression/testsMap.json

@@ -5,7 +5,7 @@
         {
           "specVersion": "0.1-213",
           "casesNumber": 0,
-          "description": " check of the cast operators as or as?",
+          "description": "check of the cast operators as or as?",
           "unexpectedBehaviour": false
         }
       ]

compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/p-1/neg/1.1.kt

@@ -9,7 +9,6 @@
  * PLACE: control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: check if-expressions must have both branches.
- * HELPERS:
  */
 
 // TESTCASE NUMBER: 1

compiler/tests-spec/testData/diagnostics/linked/control--and-data-flow-analysis/control-flow-graph/expressions-1/conditional-expressions/testsMap.json

@@ -5,7 +5,7 @@
         {
           "specVersion": "0.1-213",
           "casesNumber": 2,
-          "description": "* HELPERS: checkType",
+          "description": "check any if-statement in kotlin may be trivially turned into such an expression by replacing the missing branch with a kotlin.Unit object expression.",
           "unexpectedBehaviour": false
         }
       ],
@@ -13,7 +13,7 @@
         {
           "specVersion": "0.1-213",
           "casesNumber": 2,
-          "description": "* HELPERS:",
+          "description": "check if-expressions must have both branches.",
           "unexpectedBehaviour": false
         }
       ]
@@ -23,7 +23,7 @@
         {
           "specVersion": "0.1-213",
           "casesNumber": 2,
-          "description": "* HELPERS: checkType, functions",
+          "description": "check any if-statement in kotlin may be trivially turned into such an expression by replacing the missing branch with a kotlin.Unit object expression.",
           "unexpectedBehaviour": false
         }
       ],
@@ -31,7 +31,7 @@
         {
           "specVersion": "0.1-213",
           "casesNumber": 3,
-          "description": "* HELPERS: checkType, functions",
+          "description": "check if-expressions must have both branches.",
           "unexpectedBehaviour": false
         },
         {

compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/Patterns.kt

@@ -39,7 +39,7 @@ object CommonPatterns {
         """${SINGLE_LINE_COMMENT_REGEX.format("""[\w\s]+:""")}|${MULTILINE_COMMENT_REGEX.format(""" $ASTERISK_REGEX [\w\s]+:[\s\S]*?""")}"""
     val testAreaRegex = """(?<testArea>${TestArea.joinedValues})"""
     val testTypeRegex = """(?<testType>${TestType.joinedValues})"""
-    val testInfoElementPattern: Pattern = Pattern.compile("""(?: \* )?(?<name>[A-Z ]+?)(?::\s*(?<value>.*?))?\n""")
+    val testInfoElementPattern: Pattern = Pattern.compile("""(?: \* )?(?<name>[A-Z ]+?)(?::[ ]?(?<value>.*?))?\n""")
     val testPathBaseRegexTemplate = """^.*?$ps(?<testArea>diagnostics|psi|(?:codegen${ps}box))$ps%s"""
     val testPathRegexTemplate = """$testPathBaseRegexTemplate$ps(?<testType>pos|neg)$ps%s$"""
     val issuesPattern: Pattern = Pattern.compile("""(KT-[1-9]\d*)(,\s*KT-[1-9]\d*)*""")

compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/TestCasesParser.kt

@@ -13,6 +13,8 @@ import org.jetbrains.kotlin.spec.utils.models.SpecTestCaseInfoElementType
 import org.jetbrains.kotlin.spec.utils.models.SpecTestInfoElements
 import org.jetbrains.kotlin.spec.utils.parsers.TestCasePatterns.testCaseInfoPattern
 import org.jetbrains.kotlin.spec.utils.parsers.CommonParser.splitByComma
+import org.jetbrains.kotlin.spec.utils.validators.SpecTestValidationException
+import org.jetbrains.kotlin.spec.utils.validators.SpecTestValidationFailedReason
 import java.util.*
 
 private operator fun SpecTestCase.plusAssign(addTestCase: SpecTestCase) {
@@ -30,7 +32,13 @@ private fun SpecTestCase.save(
     caseInfoElements: SpecTestInfoElements<SpecTestInfoElementType>
 ) {
     val testCaseNumbers =
-        caseInfoElements[SpecTestCaseInfoElementType.TESTCASE_NUMBER]!!.content.splitByComma().map { it.trim().toInt() }
+        caseInfoElements[SpecTestCaseInfoElementType.TESTCASE_NUMBER]!!.content.splitByComma().map {
+            it.trim().toIntOrNull()
+                ?: throw SpecTestValidationException(
+                    SpecTestValidationFailedReason.TEST_CASE_NUMBER_FORMAT,
+                    "impossible to parse number '${it.trim()}'"
+                )
+        }
     val startPosition = this.ranges[0].first
 
     testCaseNumbers.forEach { testCaseNumber ->

compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/parsers/TestInfoParser.kt

@@ -31,33 +31,37 @@ data class ParsedTestFile(
 )
 
 fun parseTestInfo(testFilePath: String, testFiles: TestFiles, linkedTestType: SpecTestLinkedType): ParsedTestFile {
-    val patterns = linkedTestType.patterns.value
+    try {
-    val testInfoByFilenameMatcher = patterns.testPathPattern.matcher(testFilePath)
+        val patterns = linkedTestType.patterns.value
+        val testInfoByFilenameMatcher = patterns.testPathPattern.matcher(testFilePath)
 
-    if (!testInfoByFilenameMatcher.find())
+        if (!testInfoByFilenameMatcher.find())
-        throw SpecTestValidationException(SpecTestValidationFailedReason.FILENAME_NOT_VALID)
+            throw SpecTestValidationException(SpecTestValidationFailedReason.FILENAME_NOT_VALID)
 
-    val testInfoByContentMatcher = patterns.testInfoPattern.matcher(FileUtil.loadFile(File(testFilePath), true))
+        val testInfoByContentMatcher = patterns.testInfoPattern.matcher(FileUtil.loadFile(File(testFilePath), true))
 
-    if (!testInfoByContentMatcher.find())
+        if (!testInfoByContentMatcher.find())
-        throw SpecTestValidationException(SpecTestValidationFailedReason.TESTINFO_NOT_VALID)
+            throw SpecTestValidationException(SpecTestValidationFailedReason.TESTINFO_NOT_VALID)
 
-    val testInfoElements = CommonParser.parseTestInfoElements(
+        val testInfoElements = CommonParser.parseTestInfoElements(
-        arrayOf(*CommonInfoElementType.values(), *CommonSpecTestFileInfoElementType.values(), *linkedTestType.infoElements.value),
+            arrayOf(*CommonInfoElementType.values(), *CommonSpecTestFileInfoElementType.values(), *linkedTestType.infoElements.value),
-        testInfoByContentMatcher.group("infoElements")
+            testInfoByContentMatcher.group("infoElements")
-    )
+        )
-    val helpers = testInfoElements[CommonSpecTestFileInfoElementType.HELPERS]?.content?.splitByComma()?.toSet()
+        val helpers = testInfoElements[CommonSpecTestFileInfoElementType.HELPERS]?.content?.splitByComma()?.toSet()
 
-    return ParsedTestFile(
+        return ParsedTestFile(
-        testArea = TestArea.valueOf(testInfoByContentMatcher.group("testArea").withUnderscores()),
+            testArea = TestArea.valueOf(testInfoByContentMatcher.group("testArea").withUnderscores()),
-        testType = TestType.valueOf(testInfoByContentMatcher.group("testType")),
+            testType = TestType.valueOf(testInfoByContentMatcher.group("testType")),
-        testNumber = testInfoElements[CommonSpecTestFileInfoElementType.NUMBER]!!.content.toInt(),
+            testNumber = testInfoElements[CommonSpecTestFileInfoElementType.NUMBER]!!.content.toInt(),
-        testDescription = testInfoElements[CommonSpecTestFileInfoElementType.DESCRIPTION]!!.content,
+            testDescription = testInfoElements[CommonSpecTestFileInfoElementType.DESCRIPTION]!!.content,
-        testInfoElements = testInfoElements,
+            testInfoElements = testInfoElements,
-        testCasesSet = parseTestCases(testFiles),
+            testCasesSet = parseTestCases(testFiles),
-        unexpectedBehavior = testInfoElements.contains(CommonInfoElementType.UNEXPECTED_BEHAVIOUR),
+            unexpectedBehavior = testInfoElements.contains(CommonInfoElementType.UNEXPECTED_BEHAVIOUR),
-        issues = CommonParser.parseIssues(testInfoElements[CommonInfoElementType.ISSUES]),
+            issues = CommonParser.parseIssues(testInfoElements[CommonInfoElementType.ISSUES]),
-        helpers = helpers,
+            helpers = helpers,
-        exception = testInfoElements[CommonInfoElementType.EXCEPTION]?.content?.let { TestsExceptionType.fromValue(it) }
+            exception = testInfoElements[CommonInfoElementType.EXCEPTION]?.content?.let { TestsExceptionType.fromValue(it) }
-    )
+        )
+    } catch (e: Exception) {
+        error("Wrong format of file:\nfile://$testFilePath \n${e.message}")
+    }
 }

compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/validators/AbstractTestValidator.kt

@@ -23,10 +23,11 @@ enum class SpecTestValidationFailedReason(val description: String) {
     UNKNOWN_FRONTEND_EXCEPTION("Unknown frontend exception. Manual analysis is required."),
     UNMATCHED_FRONTEND_EXCEPTION("Unmatched frontend exception. Manual analysis is required."),
     UNKNOWN("Unknown validation error."),
-    INCONSISTENT_REASONS("Inconsistent fail reasons: all test cases should have one fail reason within one test.")
+    INCONSISTENT_REASONS("Inconsistent fail reasons: all test cases should have one fail reason within one test."),
+    TEST_CASE_NUMBER_FORMAT("Wrong format of testcase number: only integers are allowed.")
 }
 
-class SpecTestValidationException(reason: SpecTestValidationFailedReason, details: String = "") : Exception() {
+class SpecTestValidationException(reason: SpecTestValidationFailedReason, details: String = "") : Exception("${reason.description} \nDetails: $details") {
     val description = "${reason.description} $details"
 }