azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert another class of ComparisonFailure

Browse Source 
Idea throws this class but not org.junit.ComparisonFailure
This commit is contained in:
Nikolay Krasko
2016-04-29 16:15:24 +03:00
parent 31043f43e3
commit 4a5c298897
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
+3 -2
View File
@@ -31,6 +31,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.util.PathUtil; import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Convertor; import com.intellij.util.containers.Convertor;
import junit.framework.ComparisonFailure;
import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function0;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; 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.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.junit.Assert; import org.junit.Assert;
import org.junit.ComparisonFailure;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@@ -198,7 +198,8 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase {
checkResultByFile(canonicalPathToExpectedFile); checkResultByFile(canonicalPathToExpectedFile);
} }
catch (ComparisonFailure e) { catch (ComparisonFailure e) {
KotlinTestUtils.assertEqualsToFile(new File(canonicalPathToExpectedFile), getEditor().getDocument().getText()); KotlinTestUtils
.assertEqualsToFile(new File(canonicalPathToExpectedFile), getEditor().getDocument().getText());
} }
} }
else { else {