From 7fe8abacd6213294feb87918fdd1894e524a95af Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Fri, 31 May 2024 18:20:17 +0200 Subject: [PATCH] IJPL-155979 [TestFramework] replaced usages of FileComparisonFailure and FileComparisonData by FileComparisonFailedError GitOrigin-RevId: 6ea7df95ce2d230f3b90cd55e6069b9bf29e6d2b --- .../codeInsight/JavaCodeInsightTestCase.java | 4 ++-- .../com/intellij/debugger/impl/OutputChecker.java | 4 ++-- .../testFramework/buildScriptTestUtils.kt | 4 ++-- .../testFramework/assertions/JdomAssert.kt | 4 ++-- .../intellij/testFramework/assertions/snapshot.kt | 6 +++--- .../com/intellij/testFramework/EditorTestUtil.java | 4 ++-- .../src/com/intellij/testFramework/EqualsToFile.kt | 4 ++-- .../testFramework/ExpectedHighlightingData.java | 6 +++--- .../LightPlatformCodeInsightTestCase.java | 6 +++--- .../intellij/testFramework/PlatformTestUtil.java | 6 +++--- .../com/intellij/testFramework/UsefulTestCase.java | 6 +++--- .../hierarchy/HierarchyViewTestFixture.java | 10 +++++----- .../fixtures/impl/CodeInsightTestFixtureImpl.java | 8 ++++---- .../utils/inlays/InlayParameterHintsTest.kt | 4 ++-- .../util/io/impl/DirectoryContentSpecImpl.kt | 4 ++-- .../AbstractKotlinHighlightVisitorTest.java | 6 ++---- .../kotlin/idea/AbstractWorkSelectionTest.kt | 14 ++++++-------- .../AbstractKotlinPsiBasedTestFrameworkTest.kt | 9 ++++----- .../idea/codeInsight/AbstractLineMarkersTest.kt | 6 ++---- .../generate/AbstractCodeInsightActionTest.kt | 5 ++--- .../hints/AbstractKotlinInlayHintsProviderTest.kt | 8 +++++--- .../moveUpDown/AbstractCodeMoverTest.kt | 4 ++-- .../surroundWith/AbstractSurroundWithTest.java | 5 ++--- .../idea/folding/AbstractKotlinFoldingTest.java | 6 ++---- .../idea/highlighter/AbstractHighlightingTest.java | 14 ++++++-------- .../highlighter/CompiledFilesHighlightingTest.kt | 14 ++++++-------- .../inspections/AbstractLocalInspectionTest.kt | 5 ++--- .../idea/intentions/AbstractIntentionTestBase.kt | 5 ++--- .../idea/quickfix/AbstractQuickFixMultiFileTest.kt | 5 ++--- .../quickfix/AbstractQuickFixMultiModuleTest.kt | 5 ++--- .../BaseKotlinChangeSignatureTest.kt | 5 ++--- .../intellij/maven/testFramework/MavenTestCase.kt | 5 ++--- 32 files changed, 91 insertions(+), 110 deletions(-) diff --git a/java/testFramework/src/com/intellij/codeInsight/JavaCodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/JavaCodeInsightTestCase.java index 301888ab5f54..1872d491380c 100644 --- a/java/testFramework/src/com/intellij/codeInsight/JavaCodeInsightTestCase.java +++ b/java/testFramework/src/com/intellij/codeInsight/JavaCodeInsightTestCase.java @@ -28,6 +28,7 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiDocumentManager; @@ -35,7 +36,6 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiPackage; import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.search.ProjectScope; -import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.*; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import com.intellij.util.ArrayUtil; @@ -404,7 +404,7 @@ public abstract class JavaCodeInsightTestCase extends JavaPsiTestCase { String actualText = StringUtil.convertLineSeparators(myFile.getText()); if (!Objects.equals(expectedText, actualText)) { - throw new FileComparisonFailure("Text mismatch in file " + filePath, expectedText, actualText, vFile.getPath()); + throw new FileComparisonFailedError("Text mismatch in file " + filePath, expectedText, actualText, vFile.getPath()); } EditorTestUtil.verifyCaretAndSelectionState(myEditor, caretState); diff --git a/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java b/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java index 1c4e60f723bc..c5fdd783d51c 100644 --- a/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java +++ b/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java @@ -21,8 +21,8 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtilRt; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.project.IntelliJProjectConfiguration; -import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.util.PathUtil; import com.intellij.util.Producer; import com.intellij.util.UriUtil; @@ -192,7 +192,7 @@ public class OutputChecker { System.out.println("Rest from actual text is: \"" + actual.substring(len) + "\""); } - throw new FileComparisonFailure(null, expected, actual, outFile.getPath()); + throw new FileComparisonFailedError(null, expected, actual, outFile.getPath()); } } } diff --git a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/buildScriptTestUtils.kt b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/buildScriptTestUtils.kt index bc4634e6b8a0..09fd93aae3a0 100644 --- a/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/buildScriptTestUtils.kt +++ b/platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/buildScriptTestUtils.kt @@ -7,7 +7,7 @@ import com.intellij.openapi.util.io.NioFiles import com.intellij.platform.buildScripts.testFramework.binaryReproducibility.BuildArtifactsReproducibilityTest import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope import com.intellij.platform.runtime.product.ProductMode -import com.intellij.rt.execution.junit.FileComparisonData +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.testFramework.TestLoggerFactory import com.intellij.util.ExceptionUtilRt import io.opentelemetry.api.trace.Span @@ -188,7 +188,7 @@ private suspend fun doRunTestBuild(context: BuildContext, traceSpanName: String? throw e } catch (e: Throwable) { - if (e !is FileComparisonData) { + if (e !is FileComparisonFailedError) { span.recordException(e) } span.setStatus(StatusCode.ERROR) diff --git a/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/JdomAssert.kt b/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/JdomAssert.kt index 5beb7bcff7de..cee24f9c11d7 100644 --- a/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/JdomAssert.kt +++ b/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/JdomAssert.kt @@ -5,7 +5,7 @@ import com.intellij.configurationStore.deserialize import com.intellij.configurationStore.serialize import com.intellij.openapi.util.JDOMUtil import com.intellij.openapi.util.text.StringUtilRt -import com.intellij.rt.execution.junit.FileComparisonFailure +import com.intellij.platform.testFramework.core.FileComparisonFailedError import org.assertj.core.api.AbstractAssert import org.assertj.core.internal.Objects import org.intellij.lang.annotations.Language @@ -29,7 +29,7 @@ class JdomAssert(actual: Element?) : AbstractAssert(actual val expected = JDOMUtil.load(file) if (!JDOMUtil.areElementsEqual(actual, expected)) { - throw FileComparisonFailure(null, StringUtilRt.convertLineSeparators(Files.readString(file)), JDOMUtil.writeElement(actual!!), file.toString()) + throw FileComparisonFailedError(null, StringUtilRt.convertLineSeparators(Files.readString(file)), JDOMUtil.writeElement(actual!!), file.toString()) } return this } diff --git a/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/snapshot.kt b/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/snapshot.kt index 715fb957d65d..51d4c9b8f6ae 100644 --- a/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/snapshot.kt +++ b/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/snapshot.kt @@ -5,7 +5,7 @@ import com.intellij.concurrency.ConcurrentCollectionFactory import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.util.text.StringUtilRt -import com.intellij.rt.execution.junit.FileComparisonFailure +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.testFramework.UsefulTestCase import com.intellij.util.io.readChars import com.intellij.util.io.write @@ -62,7 +62,7 @@ internal fun loadSnapshotContent(snapshotFile: Path, convertLineSeparators: Bool return content } -@Throws(FileComparisonFailure::class) +@Throws(FileComparisonFailedError::class) fun compareFileContent(actual: Any, snapshotFile: Path, updateIfMismatch: Boolean = isUpdateSnapshotIfMismatch(), writeIfNotFound: Boolean = true) { val actualContent = if (actual is CharSequence) getNormalizedActualContent(actual) else dumpData(actual).trimEnd() @@ -95,7 +95,7 @@ fun compareFileContent(actual: Any, snapshotFile: Path, updateIfMismatch: Boolea "Expected: '${expected.contextAround(firstMismatch, 10)}'\n" + "Actual : '${actualContent.contextAround(firstMismatch, 10)}'\n" + "Inspect your code changes or run with `-Dtest.update.snapshots` to update" - throw FileComparisonFailure(message, expected.toString(), actualContent.toString(), snapshotFile.toString()) + throw FileComparisonFailedError(message, expected.toString(), actualContent.toString(), snapshotFile.toString()) } } diff --git a/platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java index dbee53ef1c1d..aac68f16ba96 100644 --- a/platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java @@ -46,12 +46,12 @@ import com.intellij.openapi.util.*; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.encoding.EncodingManager; import com.intellij.openapi.vfs.encoding.EncodingProjectManager; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.psi.FileViewProvider; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageEditorUtil; import com.intellij.psi.tree.IElementType; -import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.fixtures.CodeInsightTestFixture; import com.intellij.util.SmartList; import com.intellij.util.ThrowableRunnable; @@ -488,7 +488,7 @@ public final class EditorTestUtil { String actual = CaretAndSelectionMarkup.renderActualState(editor); if (expectedFilePath != null) { if (!expected.equals(actual)) { - throw new FileComparisonFailure(e.getMessage(), expected, actual, expectedFilePath); + throw new FileComparisonFailedError(e.getMessage(), expected, actual, expectedFilePath); } } else { assertEquals(e.getMessage(), expected, actual); diff --git a/platform/testFramework/src/com/intellij/testFramework/EqualsToFile.kt b/platform/testFramework/src/com/intellij/testFramework/EqualsToFile.kt index d9389bcd7e41..8ea53f658828 100644 --- a/platform/testFramework/src/com/intellij/testFramework/EqualsToFile.kt +++ b/platform/testFramework/src/com/intellij/testFramework/EqualsToFile.kt @@ -17,7 +17,7 @@ package com.intellij.testFramework import com.intellij.openapi.util.text.StringUtil -import com.intellij.rt.execution.junit.FileComparisonFailure +import com.intellij.platform.testFramework.core.FileComparisonFailedError import junit.framework.TestCase import java.io.File @@ -37,6 +37,6 @@ fun assertEqualsToFile(description: String, expected: File, actual: String) { val actualText = StringUtil.convertLineSeparators(actual.trim()).trimTrailingWhitespacesAndAddNewlineAtEOF() if (expectedText != actualText) { - throw FileComparisonFailure(description, expectedText, actualText, expected.absolutePath) + throw FileComparisonFailedError(description, expectedText, actualText, expected.absolutePath) } } diff --git a/platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java b/platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java index a3e0bf832e65..228406e69532 100644 --- a/platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java +++ b/platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java @@ -20,10 +20,10 @@ import com.intellij.openapi.util.text.LineColumn; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.Strings; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.SmartPsiElementPointer; -import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.fixtures.CodeInsightTestFixture; import com.intellij.util.DocumentUtil; import com.intellij.util.MathUtil; @@ -425,7 +425,7 @@ public class ExpectedHighlightingData { filePath = file.getUserData(VfsTestUtil.TEST_DATA_FILE_PATH); } } - throw new FileComparisonFailure(failMessage.toString(), myText, getActualLineMarkerFileText(markerInfos), filePath); + throw new FileComparisonFailedError(failMessage.toString(), myText, getActualLineMarkerFileText(markerInfos), filePath); } } @@ -600,7 +600,7 @@ public class ExpectedHighlightingData { // uncomment to overwrite, don't forget to revert on commit! //VfsTestUtil.overwriteTestData(filePath, actual); //return; - throw new FileComparisonFailure(failMessage, myText, actual, filePath); + throw new FileComparisonFailedError(failMessage, myText, actual, filePath); } assertEquals(failMessage + "\n", myText, actual); fail(failMessage); diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java index 66eb8a6f063f..65d720ef83a0 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java @@ -37,11 +37,11 @@ import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.encoding.EncodingProjectManager; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; -import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.util.ThrowableRunnable; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -443,7 +443,7 @@ public abstract class LightPlatformCodeInsightTestCase extends LightPlatformTest String fileText1 = myFile.getText(); String failMessage = getMessage("Text mismatch", message); if (filePath != null && !newFileText.equals(fileText1)) { - throw new FileComparisonFailure(failMessage, newFileText, fileText1, filePath); + throw new FileComparisonFailedError(failMessage, newFileText, fileText1, filePath); } assertEquals(failMessage, newFileText, fileText1); @@ -469,7 +469,7 @@ public abstract class LightPlatformCodeInsightTestCase extends LightPlatformTest String fileText1 = editor.getDocument().getText(); String failMessage = getMessage("Text mismatch", message); if (filePath != null && !newFileText.equals(fileText1)) { - throw new FileComparisonFailure(failMessage, newFileText, fileText1, filePath); + throw new FileComparisonFailedError(failMessage, newFileText, fileText1, filePath); } assertEquals(failMessage, newFileText, fileText1); diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java index eb2dddc4d341..329c3afc0903 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java @@ -59,9 +59,9 @@ import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileFilter; import com.intellij.openapi.vfs.ex.temp.TempFileSystem; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.psi.*; import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference; -import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.common.TestApplicationKt; import com.intellij.testFramework.fixtures.IdeaTestExecutionPolicy; import com.intellij.ui.ClientProperty; @@ -817,8 +817,8 @@ public final class PlatformTestUtil { assertArrayEquals(fileExpected.getPath(), fileExpected.contentsToByteArray(), fileActual.contentsToByteArray()); } else if (!StringUtil.equals(expected, actual)) { - throw new FileComparisonFailure("Text mismatch in the file " + fileExpected.getName(), expected, actual, - fileActual.getUserData(VfsTestUtil.TEST_DATA_FILE_PATH)); + throw new FileComparisonFailedError("Text mismatch in the file " + fileExpected.getName(), expected, actual, + fileActual.getUserData(VfsTestUtil.TEST_DATA_FILE_PATH)); } } } diff --git a/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java b/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java index 949bc10e51fd..ea0e565f629b 100644 --- a/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java @@ -23,10 +23,10 @@ import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileVisitor; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.impl.source.PostprocessReformattingAspect; -import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.common.TestApplicationKt; import com.intellij.testFramework.common.ThreadUtil; import com.intellij.testFramework.fixtures.IdeaTestExecutionPolicy; @@ -987,7 +987,7 @@ public abstract class UsefulTestCase extends TestCase { String expected = StringUtil.convertLineSeparators(trimBeforeComparing ? fileText.trim() : fileText); String actual = StringUtil.convertLineSeparators(trimBeforeComparing ? actualText.trim() : actualText); if (!Objects.equals(expected, actual)) { - throw new FileComparisonFailure(messageProducer == null ? null : messageProducer.get(), expected, actual, filePath); + throw new FileComparisonFailedError(messageProducer == null ? null : messageProducer.get(), expected, actual, filePath); } } @@ -997,7 +997,7 @@ public abstract class UsefulTestCase extends TestCase { public static void assertTextEquals(@Nullable String message, @NotNull String expectedText, @NotNull String actualText) { if (!expectedText.equals(actualText)) { - throw new FileComparisonFailure(Strings.notNullize(message), expectedText, actualText, null); + throw new FileComparisonFailedError(Strings.notNullize(message), expectedText, actualText, null); } } diff --git a/platform/testFramework/src/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestFixture.java b/platform/testFramework/src/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestFixture.java index e9e0ae6e3bdd..6ff9ac8a1bec 100644 --- a/platform/testFramework/src/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestFixture.java +++ b/platform/testFramework/src/com/intellij/testFramework/codeInsight/hierarchy/HierarchyViewTestFixture.java @@ -6,7 +6,7 @@ import com.intellij.ide.hierarchy.HierarchyTreeStructure; import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.rt.execution.junit.FileComparisonFailure; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -40,7 +40,7 @@ public final class HierarchyViewTestFixture { * @param treeStructure tree structure to check * @param expectedFile an XML file containing expected structure * @throws IOException if expectedFile reading failed - * @throws FileComparisonFailure if content doesn't match + * @throws FileComparisonFailedError if content doesn't match */ public static void doHierarchyTest(@NotNull HierarchyTreeStructure treeStructure, @NotNull File expectedFile) throws IOException { @@ -63,9 +63,9 @@ public final class HierarchyViewTestFixture { catch (Throwable e) { String actual = dump(treeStructure, null, comparator, 0); if (!expectedStructure.equals(actual)) { - throw new FileComparisonFailure("XML structure comparison for your convenience, actual failure details BELOW", - expectedStructure, actual, - expectedFile == null ? null : expectedFile.getAbsolutePath()); + throw new FileComparisonFailedError("XML structure comparison for your convenience, actual failure details BELOW", + expectedStructure, actual, + expectedFile == null ? null : expectedFile.getAbsolutePath()); } throw new RuntimeException(e); } diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index e0088fdba331..e20640fa4972 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -108,6 +108,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.readOnlyHandler.ReadonlyStatusHandlerImpl; import com.intellij.openapi.vfs.*; import com.intellij.openapi.vfs.impl.VirtualFilePointerTracker; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.profile.codeInspection.ProjectInspectionProfileManager; import com.intellij.psi.*; import com.intellij.psi.impl.PsiManagerEx; @@ -124,7 +125,6 @@ import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectori import com.intellij.refactoring.rename.*; import com.intellij.refactoring.rename.api.RenameTarget; import com.intellij.refactoring.rename.impl.RenameKt; -import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.*; import com.intellij.testFramework.fixtures.*; import com.intellij.testFramework.utils.inlays.CaretAndInlaysInfo; @@ -1886,7 +1886,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig if (!Objects.equals(expectedText, actualText)) { if (loader.filePath == null) { - throw new FileComparisonFailure(expectedFile, expectedText, actualText, null); + throw new FileComparisonFailedError(expectedFile, expectedText, actualText, null); } if (loader.caretState.hasExplicitCaret()) { @@ -1900,7 +1900,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig expectedText = stripTrailingSpaces(expectedText); } } - throw new FileComparisonFailure(expectedFile, expectedText, actualText, loader.filePath); + throw new FileComparisonFailedError(expectedFile, expectedText, actualText, loader.filePath); } EditorTestUtil.verifyCaretAndSelectionState(editor, loader.caretState, expectedFile, loader.filePath); @@ -2021,7 +2021,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig } String actual = getFoldingDescription(doCheckCollapseStatus); if (!expectedContent.equals(actual)) { - throw new FileComparisonFailure(verificationFile.getName(), expectedContent, actual, verificationFile.getPath()); + throw new FileComparisonFailedError(verificationFile.getName(), expectedContent, actual, verificationFile.getPath()); } } diff --git a/platform/testFramework/src/com/intellij/testFramework/utils/inlays/InlayParameterHintsTest.kt b/platform/testFramework/src/com/intellij/testFramework/utils/inlays/InlayParameterHintsTest.kt index fef0ae48a7cb..332b5ef8945d 100644 --- a/platform/testFramework/src/com/intellij/testFramework/utils/inlays/InlayParameterHintsTest.kt +++ b/platform/testFramework/src/com/intellij/testFramework/utils/inlays/InlayParameterHintsTest.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Inlay import com.intellij.openapi.editor.VisualPosition import com.intellij.openapi.util.TextRange -import com.intellij.rt.execution.junit.FileComparisonFailure +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.testFramework.VfsTestUtil import com.intellij.testFramework.fixtures.CodeInsightTestFixture import junit.framework.ComparisonFailure @@ -87,7 +87,7 @@ class InlayHintsChecker(private val myFixture: CodeInsightTestFixture) { entries.asReversed().forEach { proposedText.insert(it.first, it.second) } VfsTestUtil.TEST_DATA_FILE_PATH.get(file.virtualFile)?.let { originalPath -> - throw FileComparisonFailure("Hints differ", originalText, proposedText.toString(), originalPath) + throw FileComparisonFailedError("Hints differ", originalText, proposedText.toString(), originalPath) } ?: throw ComparisonFailure("Hints differ", originalText, proposedText.toString()) } diff --git a/platform/testFramework/src/com/intellij/util/io/impl/DirectoryContentSpecImpl.kt b/platform/testFramework/src/com/intellij/util/io/impl/DirectoryContentSpecImpl.kt index 47a7115369c1..09b0024b8f5a 100644 --- a/platform/testFramework/src/com/intellij/util/io/impl/DirectoryContentSpecImpl.kt +++ b/platform/testFramework/src/com/intellij/util/io/impl/DirectoryContentSpecImpl.kt @@ -3,7 +3,7 @@ package com.intellij.util.io.impl import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.CharsetToolkit -import com.intellij.rt.execution.junit.FileComparisonFailure +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.util.io.* import org.junit.Assert.assertEquals import org.junit.ComparisonFailure @@ -236,7 +236,7 @@ private fun assertDirectoryContentMatches(file: Path, val (expected, actual) = if (expectedDataIsInSpec) specString to fileString else fileString to specString val (expectedPath, actualPath) = if (expectedDataIsInSpec) specFilePath to null else null to specFilePath errorReporter.reportError(relativePath, - FileComparisonFailure("File content mismatch$place:", expected, actual, expectedPath, actualPath)) + FileComparisonFailedError("File content mismatch$place:", expected, actual, expectedPath, actualPath)) } } else { diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/AbstractKotlinHighlightVisitorTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/AbstractKotlinHighlightVisitorTest.java index 575639474024..0d3c32c2f77a 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/AbstractKotlinHighlightVisitorTest.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/checkers/AbstractKotlinHighlightVisitorTest.java @@ -8,7 +8,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.rt.execution.junit.FileComparisonData; import com.intellij.spellchecker.inspections.SpellCheckingInspection; import com.intellij.testFramework.ExpectedHighlightingData; import com.intellij.testFramework.fixtures.impl.JavaCodeInsightTestFixtureImpl; @@ -112,10 +111,9 @@ public abstract class AbstractKotlinHighlightVisitorTest extends KotlinLightCode data.init(); return ((JavaCodeInsightTestFixtureImpl)myFixture).collectAndCheckHighlighting(data); } - catch (AssertionError e) { - if (!(e instanceof FileComparisonData fcf)) throw e; + catch (FileComparisonFailedError fcf) { throw new FileComparisonFailedError( - e.getMessage(), + fcf.getMessage(), fcf.getExpectedStringPresentation(), fcf.getActualStringPresentation(), new File(fcf.getFilePath()).getAbsolutePath() diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/AbstractWorkSelectionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/AbstractWorkSelectionTest.kt index eccc99e08bf2..361e631765c8 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/AbstractWorkSelectionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/AbstractWorkSelectionTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.kotlin.idea -import com.intellij.rt.execution.junit.FileComparisonData +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.CodeInsightTestUtil import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase @@ -20,14 +20,12 @@ abstract class AbstractWorkSelectionTest : KotlinLightCodeInsightFixtureTestCase try { CodeInsightTestUtil.doWordSelectionTest(myFixture, dirName + File.separator + "0.kt", *afterFiles) + } catch (error: FileComparisonFailedError) { + wrapToFileComparisonFailure(error.filePath!!) } catch (error: AssertionError) { - if (error is FileComparisonData) { - wrapToFileComparisonFailure(error.filePath) - } else { - val message = error.message - val path = message!!.substring(0, message.indexOf(":")) - wrapToFileComparisonFailure(path) - } + val message = error.message + val path = message!!.substring(0, message.indexOf(":")) + wrapToFileComparisonFailure(path) } } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractKotlinPsiBasedTestFrameworkTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractKotlinPsiBasedTestFrameworkTest.kt index b2d4342119c4..8f821d57ff3e 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractKotlinPsiBasedTestFrameworkTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractKotlinPsiBasedTestFrameworkTest.kt @@ -5,7 +5,7 @@ import com.intellij.execution.RunManager import com.intellij.execution.impl.RunManagerImpl import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl import com.intellij.java.codeInsight.navigation.MockGradleRunConfiguration -import com.intellij.rt.execution.junit.FileComparisonData +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.testFramework.ExtensionTestUtil.maskExtensions import com.intellij.testIntegration.TestFramework import org.jetbrains.kotlin.idea.testIntegration.framework.KotlinPsiBasedTestFramework @@ -19,7 +19,7 @@ abstract class AbstractKotlinPsiBasedTestFrameworkTest : AbstractLineMarkersTest doRunTest(false) { try { super.doTest(path) {} - } catch (e: AssertionError) { + } catch (e: FileComparisonFailedError) { checkSuppressions("LIGHT_CLASS_FALLBACK", e) } } @@ -41,7 +41,7 @@ abstract class AbstractKotlinPsiBasedTestFrameworkTest : AbstractLineMarkersTest runManager.selectedConfiguration = runnerAndConfigurationSettings try { super.doTest(path) {} - } catch (e : AssertionError) { + } catch (e : FileComparisonFailedError) { checkSuppressions("DISABLED_WITH_GRADLE_CONFIGURATION", e) } finally { @@ -49,8 +49,7 @@ abstract class AbstractKotlinPsiBasedTestFrameworkTest : AbstractLineMarkersTest } } - private fun checkSuppressions(suppressionName : String, e: AssertionError) { - if (e !is FileComparisonData) throw e + private fun checkSuppressions(suppressionName : String, e: FileComparisonFailedError) { val lines = e.actualStringPresentation.split("\n") e.message?.let { msg -> val regex = "^${Regex.escapeReplacement(dataFile().name)}: missing \\((\\d+):".toRegex() diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.kt index 421b7047b3f9..4bc2e4a23ec5 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.kt @@ -16,7 +16,6 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile -import com.intellij.rt.execution.junit.FileComparisonData import com.intellij.testFramework.ExpectedHighlightingData import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.UsefulTestCase @@ -225,14 +224,13 @@ abstract class AbstractLineMarkersTest : KotlinLightCodeInsightFixtureTestCase() throw AssertionError("Some line markers are expected, but nothing is present at all") } } catch (error: AssertionError) { - if (error is FileComparisonData) { + if (error is FileComparisonFailedError) { throw error } try { val actualTextWithTestData = TagsTestDataUtil.insertInfoTags(markers, true, documentToAnalyze.text) KotlinTestUtils.assertEqualsToFile(expectedFile, actualTextWithTestData) - } catch (failure: AssertionError) { - if (failure !is FileComparisonData) throw failure + } catch (failure: FileComparisonFailedError) { throw FileComparisonFailedError( error.message + "\n" + failure.message, failure.expectedStringPresentation, diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt index b70576ec6139..52ab13ef6447 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt @@ -7,8 +7,8 @@ import com.intellij.openapi.actionSystem.AnAction import com.intellij.openapi.actionSystem.Presentation import com.intellij.openapi.actionSystem.ex.ActionUtil import com.intellij.openapi.util.io.FileUtil +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.refactoring.util.CommonRefactoringUtil -import com.intellij.rt.execution.junit.FileComparisonData import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.TestActionEvent import junit.framework.TestCase @@ -95,8 +95,7 @@ abstract class AbstractCodeInsightActionTest : KotlinLightCodeInsightFixtureTest myFixture.checkResult(FileUtil.loadFile(afterFile, true)) checkExtra() } - } catch (e: AssertionError) { - if (e !is FileComparisonData) throw e + } catch (e: FileComparisonFailedError) { KotlinTestUtils.assertEqualsToFile(afterFile, myFixture.editor) } catch (e: CommonRefactoringUtil.RefactoringErrorHintException) { KotlinTestUtils.assertEqualsToFile(conflictFile, e.message!!) diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/AbstractKotlinInlayHintsProviderTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/AbstractKotlinInlayHintsProviderTest.kt index cd927a365339..c4c86c7a2b1f 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/AbstractKotlinInlayHintsProviderTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/AbstractKotlinInlayHintsProviderTest.kt @@ -10,7 +10,6 @@ import com.intellij.psi.util.startOffset import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.utils.inlays.declarative.DeclarativeInlayHintsProviderTestCase import com.intellij.util.ThrowableRunnable -import junit.framework.ComparisonFailure import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor @@ -87,10 +86,13 @@ abstract class AbstractKotlinInlayHintsProviderTest : DeclarativeInlayHintsProvi try { doTestProvider("${file.name.substringBefore(".")}.kt", fileContents, inlayHintsProvider, options) - } catch (e: ComparisonFailure) { + } catch (e: FileComparisonFailedError) { throw FileComparisonFailedError( e.message, - e.expected, e.actual, file.absolutePath, null + e.expectedStringPresentation, + e.actualStringPresentation, + file.absolutePath, + null ) } } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt index be4e7b39b3e0..ba1572cbe9e4 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt @@ -13,7 +13,7 @@ import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.editor.actionSystem.EditorAction import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.util.io.FileUtil -import junit.framework.ComparisonFailure +import com.intellij.platform.testFramework.core.FileComparisonFailedError import junit.framework.TestCase import org.jetbrains.kotlin.formatter.FormatSettingsUtil import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover @@ -114,7 +114,7 @@ abstract class AbstractCodeMoverTest : KotlinLightCodeInsightFixtureTestCase() { val afterFile = File("$path.after") try { myFixture.checkResultByFile(afterFile.toRelativeString(testDataDirectory)) - } catch (e: ComparisonFailure) { + } catch (e: FileComparisonFailedError) { KotlinTestUtils.assertEqualsToFile(afterFile, editor) } } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/surroundWith/AbstractSurroundWithTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/surroundWith/AbstractSurroundWithTest.java index b0335d880fe5..fd5fae402f3b 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/surroundWith/AbstractSurroundWithTest.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/surroundWith/AbstractSurroundWithTest.java @@ -8,8 +8,8 @@ import com.intellij.lang.surroundWith.SurroundDescriptor; import com.intellij.lang.surroundWith.Surrounder; import com.intellij.openapi.editor.SelectionModel; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.psi.PsiElement; -import com.intellij.rt.execution.junit.FileComparisonData; import kotlin.io.FilesKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -119,8 +119,7 @@ public abstract class AbstractSurroundWithTest extends KotlinLightCodeInsightFix try { String localPath = FilesKt.toRelativeString(new File(filePath), getTestDataDirectory()); myFixture.checkResultByFile(localPath); - } catch (AssertionError exception) { - if (!(exception instanceof FileComparisonData)) throw exception; + } catch (FileComparisonFailedError exception) { KotlinTestUtils.assertEqualsToFile(new File(filePath), getEditor()); } } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java index a06cdfe95573..e8a4dc6d50de 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java @@ -7,7 +7,6 @@ import com.intellij.codeInsight.folding.impl.JavaCodeFoldingSettingsImpl; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.rt.execution.junit.FileComparisonData; import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import org.jetbrains.annotations.NotNull; @@ -26,10 +25,9 @@ public abstract class AbstractKotlinFoldingTest extends KotlinLightCodeInsightFi protected void doTest(@NotNull String path) { try { myFixture.testFolding(path); - } catch (AssertionError e) { - if (!(e instanceof FileComparisonData fcf)) throw e; + } catch (FileComparisonFailedError fcf) { throw new FileComparisonFailedError( - e.getMessage(), + fcf.getMessage(), fcf.getExpectedStringPresentation(), fcf.getActualStringPresentation(), new File(fcf.getFilePath()).getAbsolutePath() diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java index 91e6d4c5a8f6..4e3fe137c88b 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java @@ -6,7 +6,7 @@ import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInspection.InspectionProfileEntry; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.rt.execution.junit.FileComparisonData; +import com.intellij.platform.testFramework.core.FileComparisonFailedError; import com.intellij.testFramework.ExpectedHighlightingData; import com.intellij.testFramework.InspectionTestUtil; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; @@ -74,14 +74,12 @@ public abstract class AbstractHighlightingTest extends KotlinLightCodeInsightFix return Unit.INSTANCE; }); } - catch (AssertionError e) { - if (e instanceof FileComparisonData) { - List highlights = - DaemonCodeAnalyzerImpl.getHighlights(myFixture.getDocument(myFixture.getFile()), null, myFixture.getProject()); - String text = myFixture.getFile().getText(); + catch (FileComparisonFailedError e) { + List highlights = + DaemonCodeAnalyzerImpl.getHighlights(myFixture.getDocument(myFixture.getFile()), null, myFixture.getProject()); + String text = myFixture.getFile().getText(); - System.out.println(TagsTestDataUtil.insertInfoTags(highlights, text)); - } + System.out.println(TagsTestDataUtil.insertInfoTags(highlights, text)); throw e; } }); diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/CompiledFilesHighlightingTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/CompiledFilesHighlightingTest.kt index d61ae0c96f71..65cd2400ed26 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/CompiledFilesHighlightingTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/CompiledFilesHighlightingTest.kt @@ -11,8 +11,8 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileManager +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.psi.PsiManager -import com.intellij.rt.execution.junit.FileComparisonData import com.intellij.testFramework.ExpectedHighlightingData import com.intellij.testFramework.TestDataPath import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl @@ -130,13 +130,11 @@ class CompiledFilesHighlightingTest: KotlinLightCodeInsightFixtureTestCase() { check() } } - } catch (e: AssertionError) { - if (e is FileComparisonData) { - val highlights = - DaemonCodeAnalyzerImpl.getHighlights(myFixture.getDocument(myFixture.getFile()), null, myFixture.getProject()) - val text = myFixture.getFile().getText() - println(TagsTestDataUtil.insertInfoTags(highlights, text)) - } + } catch (e: FileComparisonFailedError) { + val highlights = + DaemonCodeAnalyzerImpl.getHighlights(myFixture.getDocument(myFixture.getFile()), null, myFixture.getProject()) + val text = myFixture.getFile().getText() + println(TagsTestDataUtil.insertInfoTags(highlights, text)) throw e } } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/AbstractLocalInspectionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/AbstractLocalInspectionTest.kt index b6eb2820b648..babf11ef12f2 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/AbstractLocalInspectionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/AbstractLocalInspectionTest.kt @@ -16,8 +16,8 @@ import com.intellij.openapi.application.runReadAction import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.util.JDOMUtil import com.intellij.openapi.util.io.FileUtil +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.profile.codeInspection.ProjectInspectionProfileManager -import com.intellij.rt.execution.junit.FileComparisonData import com.intellij.testFramework.PlatformTestUtil.dispatchAllEventsInIdeEventQueue import com.intellij.testFramework.PsiTestUtil import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl @@ -351,8 +351,7 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa dispatchAllEventsInIdeEventQueue() try { myFixture.checkResultByFile("${afterFileAbsolutePath.fileName}") - } catch (e: AssertionError) { - if (e !is FileComparisonData) throw e + } catch (e: FileComparisonFailedError) { KotlinTestUtils.assertEqualsToFile( File(testDataDirectory, "${afterFileAbsolutePath.fileName}"), editor.document.text diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTestBase.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTestBase.kt index 3b7c5ca63cfc..84cb66df662c 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTestBase.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTestBase.kt @@ -16,10 +16,10 @@ import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.ThrowableComputable import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.text.StringUtil +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.psi.PsiFile import com.intellij.refactoring.BaseRefactoringProcessor import com.intellij.refactoring.util.CommonRefactoringUtil -import com.intellij.rt.execution.junit.FileComparisonData import com.intellij.testFramework.PsiTestUtil import com.intellij.util.ThrowableRunnable import junit.framework.TestCase @@ -242,8 +242,7 @@ abstract class AbstractIntentionTestBase : KotlinLightCodeInsightFixtureTestCase if (filePath == mainFilePath) { try { myFixture.checkResultByFile(canonicalPathToExpectedFile) - } catch (e: AssertionError) { - if (e !is FileComparisonData) throw e + } catch (e: FileComparisonFailedError) { KotlinTestUtils.assertEqualsToFile(afterFile, editor.document.text) } } else { diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt index 474835d15e56..014c11c77eab 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt @@ -18,8 +18,8 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.psi.PsiFile -import com.intellij.rt.execution.junit.FileComparisonData import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl import com.intellij.util.ArrayUtil import com.intellij.util.PathUtil @@ -246,8 +246,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest val afterMain = findAfterFile(mainFile.path) try { myFixture.checkResultByFile(afterMain.name) - } catch (e: AssertionError) { - if (e !is FileComparisonData) throw e + } catch (e: FileComparisonFailedError) { KotlinTestUtils.assertEqualsToFile(afterMain, editor) } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt index 437d2b1bb0bc..3ef095a28e64 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt @@ -9,8 +9,8 @@ import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.TestDialog import com.intellij.openapi.ui.TestDialogManager import com.intellij.openapi.vfs.VirtualFile +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.psi.PsiFile -import com.intellij.rt.execution.junit.FileComparisonData import com.intellij.testFramework.IdeaTestUtil import com.intellij.testFramework.UsefulTestCase import junit.framework.TestCase @@ -178,8 +178,7 @@ abstract class AbstractQuickFixMultiModuleTest : AbstractMultiModuleTest(), Quic setActiveEditor(editedFile.findExistingEditor() ?: createEditor(editedFile.virtualFile)) try { checkResultByFile(afterFileInTestData.relativeTo(File(testDataPath)).path) - } catch (e: AssertionError) { - if (e !is FileComparisonData) throw e + } catch (e: FileComparisonFailedError) { KotlinTestUtils.assertEqualsToFile(afterFileInTestData, editor) } } diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/test/org/jetbrains/kotlin/idea/refactoring/changeSignature/BaseKotlinChangeSignatureTest.kt b/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/test/org/jetbrains/kotlin/idea/refactoring/changeSignature/BaseKotlinChangeSignatureTest.kt index 245b176ad1fb..b4afee89a39c 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/test/org/jetbrains/kotlin/idea/refactoring/changeSignature/BaseKotlinChangeSignatureTest.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.common.tests/test/org/jetbrains/kotlin/idea/refactoring/changeSignature/BaseKotlinChangeSignatureTest.kt @@ -8,6 +8,7 @@ import com.intellij.codeInsight.TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED import com.intellij.lang.LanguageRefactoringSupport import com.intellij.openapi.actionSystem.ex.ActionUtil import com.intellij.openapi.util.text.StringUtil +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.psi.* import com.intellij.psi.impl.java.stubs.index.JavaFullClassNameIndex import com.intellij.psi.search.searches.MethodReferencesSearch @@ -19,7 +20,6 @@ import com.intellij.refactoring.changeSignature.ChangeSignatureProcessor import com.intellij.refactoring.changeSignature.ParameterInfoImpl import com.intellij.refactoring.util.CanonicalTypes import com.intellij.refactoring.util.CommonRefactoringUtil -import com.intellij.rt.execution.junit.FileComparisonData import com.intellij.testFramework.LightProjectDescriptor import com.intellij.util.VisibilityUtil import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod @@ -242,8 +242,7 @@ public @interface NotNull { val afterFilePath: String = getAfterFilePath(file) try { myFixture.checkResultByFile(file, afterFilePath, true) - } catch (e: AssertionError) { - if (e !is FileComparisonData) throw e + } catch (e: FileComparisonFailedError) { KotlinTestUtils.assertEqualsToFile(File(testDataDirectory, afterFilePath), psiFile.text) } diff --git a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt index 50729dbfa449..ad47e048d2bf 100644 --- a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt +++ b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt @@ -27,7 +27,7 @@ import com.intellij.openapi.util.ThrowableComputable import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VirtualFile -import com.intellij.rt.execution.junit.FileComparisonData +import com.intellij.platform.testFramework.core.FileComparisonFailedError import com.intellij.testFramework.* import com.intellij.testFramework.TemporaryDirectory.Companion.generateTemporaryPath import com.intellij.testFramework.fixtures.IdeaProjectTestFixture @@ -726,8 +726,7 @@ abstract class MavenTestCase : UsefulTestCase() { try { assertSameLinesWithFile(filePath!!, expectedText!!) } - catch (e: AssertionError) { - if (e !is FileComparisonData) throw e + catch (e: FileComparisonFailedError) { val expected: String = e.expectedStringPresentation val actual: String = e.actualStringPresentation assertUnorderedElementsAreEqual(expected.split("\n".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray(),