From 6c67cb3d7ff8a10f77edc6016fd399083f03cb19 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 2 Nov 2018 15:23:17 +0300
Subject: [PATCH] Prioritize failure in expect file over stub validation
 problem in tests

---
 .../kotlin/idea/quickfix/AbstractQuickFixTest.kt   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt
index a803b4caa4e..0ab96feac72 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt
@@ -34,6 +34,7 @@ import org.jetbrains.kotlin.idea.test.*
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.junit.Assert
+import org.junit.ComparisonFailure
 import java.io.File
 import java.io.IOException
 
@@ -157,7 +158,14 @@ abstract class AbstractQuickFixTest : KotlinLightCodeInsightFixtureTestCase(), Q
                 fail("Action with text '" + actionHint.expectedText + "' not found\nAvailable actions: " +
                      myFixture.availableIntentions.joinToString(prefix = "[", postfix = "]") { it.text })
             }
-            myFixture.launchAction(intention!!)
+
+            val stubComparisonFailure: ComparisonFailure? = try {
+                myFixture.launchAction(intention!!)
+                null
+            } catch (comparisonFailure: ComparisonFailure) {
+                comparisonFailure
+            }
+
             UIUtil.dispatchAllInvocationEvents()
             UIUtil.dispatchAllInvocationEvents()
 
@@ -167,6 +175,10 @@ abstract class AbstractQuickFixTest : KotlinLightCodeInsightFixtureTestCase(), Q
             }
 
             myFixture.checkResultByFile(File(fileName).name + ".after")
+
+            if (stubComparisonFailure != null) {
+                throw stubComparisonFailure
+            }
         }
         else {
             assertNull("Action with text ${actionHint.expectedText} is present, but should not", intention)