Fixed tests after adding error checking for intention tests.

idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt

@@ -1,8 +1,10 @@
+class Klass<T>
+
 fun test(obj: Any): String {
     return <caret>when (obj) {
         is String -> "string"
         is Int -> "int"
-        is Class<*> -> "class"
+        is Klass<*> -> "class"
         else -> "unknown"
     }
-}
+}

idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt.after

@@ -1,8 +1,10 @@
+class Klass<T>
+
 fun test(obj: Any): String {
     return <caret>when {
         obj is String -> "string"
         obj is Int -> "int"
-        obj is Class<*> -> "class"
+        obj is Klass<*> -> "class"
         else -> "unknown"
     }
-}
+}

idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt

@@ -1,8 +1,10 @@
+class Klass<T>
+
 fun test(obj: Any): String {
     return <caret>when {
         obj is String -> "string"
         obj is Int -> "int"
-        obj is Class<*> -> "class"
+        obj is Klass<*> -> "class"
         else -> "unknown"
     }
-}
+}

idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt.after

@@ -1,8 +1,10 @@
+class Klass<T>
+
 fun test(obj: Any): String {
     return <caret>when (obj) {
         is String -> "string"
         is Int -> "int"
-        is Class<*> -> "class"
+        is Klass<*> -> "class"
         else -> "unknown"
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt

@@ -1,33 +1,35 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
     <caret>when (n) {
         1 -> {
             res = "one"
-            println("A")
+            doSomething("A")
         }
         2 -> {
             res = "two"
-            println("B")
+            doSomething("B")
         }
         else -> {
             res = "unknown"
-            println("C")
+            doSomething("C")
         }
     }
 
     when (n) {
         1 -> {
-            println("A")
-            println("AA")
+            doSomething("A")
+            doSomething("AA")
         }
         2 -> {
-            println("B")
-            println("BB")
+            doSomething("B")
+            doSomething("BB")
         }
         else -> {
-            println("C")
-            println("CC")
+            doSomething("C")
+            doSomething("CC")
         }
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after

@@ -1,24 +1,26 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
     when (n) {
         1 -> {
             res = "one"
-            println("A")
-            println("A")
-            println("AA")
+            doSomething("A")
+            doSomething("A")
+            doSomething("AA")
         }
         2 -> {
             res = "two"
-            println("B")
-            println("B")
-            println("BB")
+            doSomething("B")
+            doSomething("B")
+            doSomething("BB")
         }
         else -> {
             res = "unknown"
-            println("C")
-            println("C")
-            println("CC")
+            doSomething("C")
+            doSomething("C")
+            doSomething("CC")
         }
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt

@@ -1,24 +1,26 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
     <caret>when (n) {
         1 -> {
             res = "one"
-            println("A")
+            doSomething("A")
         }
         2 -> {
             res = "two"
-            println("B")
+            doSomething("B")
         }
         else -> {
             res = "unknown"
-            println("C")
+            doSomething("C")
         }
     }
 
     when (n) {
-        1 -> println("AA")
-        2 -> println("BB")
-        else -> println("CC")
+        1 -> doSomething("AA")
+        2 -> doSomething("BB")
+        else -> doSomething("CC")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after

@@ -1,21 +1,23 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
     <caret>when (n) {
         1 -> {
             res = "one"
-            println("A")
-            println("AA")
+            doSomething("A")
+            doSomething("AA")
         }
         2 -> {
             res = "two"
-            println("B")
-            println("BB")
+            doSomething("B")
+            doSomething("BB")
         }
         else -> {
             res = "unknown"
-            println("C")
-            println("CC")
+            doSomething("C")
+            doSomething("CC")
         }
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt

@@ -1,4 +1,7 @@
 // IS_APPLICABLE: false
+
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -6,32 +9,32 @@ fun test(n: Int) {
         1 -> {
             res = "one"
             val x = "A"
-            println(x)
+            doSomething(x)
         }
         2 -> {
             res = "two"
             val x = "B"
-            println(x)
+            doSomething(x)
         }
         else -> {
             res = "unknown"
             val x = "C"
-            println(x)
+            doSomething(x)
         }
     }
 
     when (n) {
         1 -> {
             val x = "AA"
-            println(x)
+            doSomething(x)
         }
         2 -> {
             val x = "BB"
-            println(x)
+            doSomething(x)
         }
         else -> {
             val x = "CC"
-            println(x)
+            doSomething(x)
         }
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt

@@ -1,3 +1,5 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -5,32 +7,32 @@ fun test(n: Int) {
         1 -> {
             res = "one"
             val x = "A"
-            println(x)
+            doSomething(x)
         }
         2 -> {
             res = "two"
             val x = "B"
-            println(x)
+            doSomething(x)
         }
         else -> {
             res = "unknown"
             val x = "C"
-            println(x)
+            doSomething(x)
         }
     }
 
     when (n) {
         1 -> {
             val y = "AA"
-            println(y)
+            doSomething(y)
         }
         2 -> {
             val y = "BB"
-            println(y)
+            doSomething(y)
         }
         else -> {
             val y = "CC"
-            println(y)
+            doSomething(y)
         }
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after

@@ -1,3 +1,5 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -5,23 +7,23 @@ fun test(n: Int) {
         1 -> {
             res = "one"
             val x = "A"
-            println(x)
+            doSomething(x)
             val y = "AA"
-            println(y)
+            doSomething(y)
         }
         2 -> {
             res = "two"
             val x = "B"
-            println(x)
+            doSomething(x)
             val y = "BB"
-            println(y)
+            doSomething(y)
         }
         else -> {
             res = "unknown"
             val x = "C"
-            println(x)
+            doSomething(x)
             val y = "CC"
-            println(y)
+            doSomething(y)
         }
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt

@@ -1,10 +1,12 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     var res: String = ""
 
     <caret>when (n) {
-        1 -> println("A")
-        2 -> println("B")
-        else -> println("C")
+        1 -> doSomething("A")
+        2 -> doSomething("B")
+        else -> doSomething("C")
     }
 
     when (n) {
@@ -15,4 +17,4 @@ fun test(n: Int) {
             return
         }
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after

@@ -1,19 +1,21 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     var res: String = ""
 
     <caret>when (n) {
         1 -> {
-            println("A")
+            doSomething("A")
             res = "one"
         }
         2 -> {
-            println("B")
+            doSomething("B")
             res = "two"
         }
         else -> {
-            println("C")
+            doSomething("C")
             res = "unknown"
             return
         }
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt

@@ -1,4 +1,7 @@
 // IS_APPLICABLE: false
+
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     var res: String = ""
 
@@ -12,8 +15,8 @@ fun test(n: Int) {
     }
 
     when (n) {
-        1 -> println("A")
-        2 -> println("B")
-        else -> println("C")
+        1 -> doSomething("A")
+        2 -> doSomething("B")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithSubject.kt

@@ -1,3 +1,5 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -8,8 +10,8 @@ fun test(n: Int) {
     }
 
     when (n) {
-        1 -> println("A")
-        2 -> println("B")
-        else -> println("C")
+        1 -> doSomething("A")
+        2 -> doSomething("B")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithSubject.kt.after

@@ -1,18 +1,20 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
     when (n) {
         1 -> {
             res = "one"
-            println("A")
+            doSomething("A")
         }
         2 -> {
             res = "two"
-            println("B")
+            doSomething("B")
         }
         else -> {
             res = "unknown"
-            println("C")
+            doSomething("C")
         }
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -9,7 +11,7 @@ fun test(n: Int) {
     }
 
     when (n) {
-        1 -> println("A")
-        else -> println("C")
+        1 -> doSomething("A")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -9,9 +11,9 @@ fun test(n: Int) {
     }
 
     when (n) {
-        1 -> println("A")
-        2 -> println("B")
-        3 -> println("D")
-        else -> println("C")
+        1 -> doSomething("A")
+        2 -> doSomething("B")
+        3 -> doSomething("D")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -9,8 +11,8 @@ fun test(n: Int) {
     }
 
     when (n) {
-        2 -> println("B")
-        1 -> println("A")
-        else -> println("C")
+        2 -> doSomething("B")
+        1 -> doSomething("A")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -9,7 +11,7 @@ fun test(n: Int) {
     }
 
     when {
-        n == 1 -> println("A")
-        else -> println("C")
+        n == 1 -> doSomething("A")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -9,9 +11,9 @@ fun test(n: Int) {
     }
 
     when {
-        n == 1 -> println("A")
-        n == 2 -> println("B")
-        n == 3 -> println("D")
-        else -> println("C")
+        n == 1 -> doSomething("A")
+        n == 2 -> doSomething("B")
+        n == 3 -> doSomething("D")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -9,8 +11,8 @@ fun test(n: Int) {
     }
 
     when {
-        n == 2 -> println("B")
-        n == 1 -> println("A")
-        else -> println("C")
+        n == 2 -> doSomething("B")
+        n == 1 -> doSomething("A")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -9,8 +11,8 @@ fun test(n: Int) {
     }
 
     when {
-        n + 1 == 2 -> println("B")
-        n + 1 == 3 -> println("A")
-        else -> println("C")
+        n + 1 == 2 -> doSomething("B")
+        n + 1 == 3 -> doSomething("A")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -9,8 +11,8 @@ fun test(n: Int) {
     }
 
     when {
-        n == 1 -> println("A")
-        n == 2 -> println("B")
-        else -> println("C")
+        n == 1 -> doSomething("A")
+        n == 2 -> doSomething("B")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt

@@ -1,4 +1,6 @@
 // IS_APPLICABLE: false
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -9,8 +11,8 @@ fun test(n: Int) {
     }
 
     when (n + 1) {
-        1 -> println("A")
-        2 -> println("B")
-        else -> println("C")
+        1 -> doSomething("A")
+        2 -> doSomething("B")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt

@@ -1,3 +1,5 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
@@ -8,8 +10,8 @@ fun test(n: Int) {
     }
 
     when {
-        n == 1 -> println("A")
-        n == 2 -> println("B")
-        else -> println("C")
+        n == 1 -> doSomething("A")
+        n == 2 -> doSomething("B")
+        else -> doSomething("C")
     }
-}
+}

idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after

@@ -1,18 +1,20 @@
+fun doSomething<T>(a: T) {}
+
 fun test(n: Int) {
     val res: String
 
     <caret>when {
         n == 1 -> {
             res = "one"
-            println("A")
+            doSomething("A")
         }
         n == 2 -> {
             res = "two"
-            println("B")
+            doSomething("B")
         }
         else -> {
             res = "unknown"
-            println("C")
+            doSomething("C")
         }
     }
-}
+}