From 4a5c2988971b29da40228070548bf7730c9d8566 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 29 Apr 2016 16:15:24 +0300 Subject: [PATCH] Revert another class of ComparisonFailure Idea throws this class but not org.junit.ComparisonFailure --- .../kotlin/idea/intentions/AbstractIntentionTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index 30697ca6246..e32ea57d036 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java @@ -31,6 +31,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Convertor; +import junit.framework.ComparisonFailure; import kotlin.jvm.functions.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; @@ -42,7 +43,6 @@ import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.junit.Assert; -import org.junit.ComparisonFailure; import java.io.File; import java.util.ArrayList; @@ -198,7 +198,8 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase { checkResultByFile(canonicalPathToExpectedFile); } catch (ComparisonFailure e) { - KotlinTestUtils.assertEqualsToFile(new File(canonicalPathToExpectedFile), getEditor().getDocument().getText()); + KotlinTestUtils + .assertEqualsToFile(new File(canonicalPathToExpectedFile), getEditor().getDocument().getText()); } } else {