[Spec tests] Review fix tests for try-expression and if-expression

compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/p-6/neg/1.1.kt

@@ -0,0 +1,52 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// SKIP_TXT
+// FULL_JDK
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-218
+ * PLACE: expressions, conditional-expression -> paragraph 6 -> sentence 1
+ * NUMBER: 1
+ * DESCRIPTION: The type of the condition expression must be a subtype of kotlin.Boolean
+ * HELPERS: checkType
+ */
+
+// MODULE: libModule
+// FILE: libModule/JavaContainer.java
+package libModule;
+
+public class JavaContainer {
+    public static boolean ab;
+    public static final Boolean aB;
+    public static Object aO = false;
+}
+
+// MODULE: mainModule(libModule)
+// FILE: KotlinClass.kt
+package mainModule
+import libModule.*
+import checkSubtype
+
+/*
+ * TESTCASE NUMBER: 1
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-35517
+ */
+fun case1() {
+    val a: Any = true
+    if (<!TYPE_MISMATCH, TYPE_MISMATCH!>a<!>) { "true" } else "false"
+    checkSubtype<Boolean>(<!TYPE_MISMATCH!>a<!>)
+}
+
+/*
+ * TESTCASE NUMBER: 2
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-35517
+ */
+fun case2() {
+    val a = JavaContainer.aO
+    if (<!TYPE_MISMATCH, TYPE_MISMATCH!>a<!>) { "true" } else "false"
+    checkSubtype<Boolean>(<!TYPE_MISMATCH!>a<!>)
+}

compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/p-6/pos/1.1.kt

@@ -0,0 +1,58 @@
+// !LANGUAGE: +NewInference
+// !DIAGNOSTICS: -UNREACHABLE_CODE -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// SKIP_TXT
+// FULL_JDK
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-218
+ * PLACE: expressions, conditional-expression -> paragraph 6 -> sentence 1
+ * NUMBER: 1
+ * DESCRIPTION: The type of the condition expression must be a subtype of kotlin.Boolean
+ * HELPERS: checkType
+ */
+
+// MODULE: libModule
+// FILE: libModule/JavaContainer.java
+package libModule;
+
+public class JavaContainer {
+    public static boolean ab;
+    public static Boolean aB;
+    public static final Object aO = false;
+}
+
+// MODULE: mainModule(libModule)
+// FILE: KotlinClass.kt
+package mainModule
+import libModule.*
+import checkSubtype
+// TESTCASE NUMBER: 1
+fun case1() {
+    val a = JavaContainer.ab
+    if (a) { "true" } else "false"
+    checkSubtype<Boolean>(a)
+    checkSubtype<Boolean>(false)
+}
+
+// TESTCASE NUMBER: 2
+fun case2() {
+    val a = JavaContainer.aB
+    if (a) { "true" } else "false"
+    checkSubtype<Boolean>(a)
+}
+
+// TESTCASE NUMBER: 3
+fun case3() {
+    val a = JavaContainer.aO as Boolean
+    if (a) { "true" } else "false"
+    checkSubtype<Boolean>(a)
+}
+
+// TESTCASE NUMBER: 4
+fun case4(a: Nothing) {
+    checkSubtype<Boolean>(a)
+    if (a) { "true" } else "false"
+
+}

compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression/testsMap.json

@@ -0,0 +1,92 @@
+{
+  "6": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 2,
+          "description": "The type of the condition expression must be a subtype of kotlin.Boolean",
+          "unexpectedBehaviour": true
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-218",
+          "casesNumber": 4,
+          "description": "The type of the condition expression must be a subtype of kotlin.Boolean",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "4": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-152",
+          "casesNumber": 0,
+          "description": "Kt9929",
+          "path": "compiler/testData/diagnostics/tests/when/kt9929.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,
+          "description": "Kt9972",
+          "path": "compiler/testData/diagnostics/tests/when/kt9972.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,
+          "description": "Kt10439",
+          "path": "compiler/testData/diagnostics/tests/when/kt10439.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "5": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-152",
+          "casesNumber": 0,
+          "description": "Kt9929",
+          "path": "compiler/testData/diagnostics/tests/when/kt9929.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-152",
+          "casesNumber": 0,
+          "description": "Kt9972",
+          "path": "compiler/testData/diagnostics/tests/when/kt9972.kt",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-152",
+          "casesNumber": 0,
+          "description": "Kt10439",
+          "path": "compiler/testData/diagnostics/tests/when/kt10439.kt",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}