MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-155979 [TestFramework] replaced usages of FileComparisonFailure and FileComparisonData by FileComparisonFailedError

Browse Source 
GitOrigin-RevId: 6ea7df95ce2d230f3b90cd55e6069b9bf29e6d2b
This commit is contained in:
Sergei Vorobyov
2024-05-31 18:20:17 +02:00
committed by intellij-monorepo-bot
parent da91d002bd
commit 7fe8abacd6
32 changed files with 91 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/testFramework/src/com/intellij/codeInsight/JavaCodeInsightTestCase.java
View File

@@ -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);

4
java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java
View File

@@ -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());
}
}
}