From d8a2cab7088da6bd15f9e2ee1939657afd5beece Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 5 Apr 2016 22:06:36 +0300
Subject: [PATCH] Bad merge in AbstactIntentionTest that made tests useless

---
 .../jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
index 23b0edf9e68..a0196b3570f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
@@ -171,7 +171,7 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase {
                         }
                 );
                 // Don't bother checking if it should have failed.
-                if (shouldFailString == null) {
+                if (shouldFailString.isEmpty()) {
                     for (Map.Entry<String, PsiFile> entry: pathToFiles.entrySet()) {
                         String filePath = entry.getKey();
                         String canonicalPathToExpectedFile = PathUtil.getCanonicalPath(filePath + ".after");