MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-355257 [TestFramework] fix: removed usage of the Junit 4 comparison failure inside the ComparisonFailureData

Browse Source 
The ComparisonFailureData cannot depend on the Junit 3-5 classes. It should be universal over all Java test frameworks. Also, artifacts for these Junit classes existed only in compile time. That is the reason of hidden class is not found exception.

The deprecated FileComparisonFailure extends the FileComparisonData for two years. This interface is covered by the ComparisonFailureData.createFileComparisonData function. Also, the old one ComparisonFailureData.createFileComparisonFailure converts the FileComparisonFailure using the functions from the FileComparisonData interface. Therefore, we can remove the createFileComparisonFailure function without any functional loose.

Ps. The FileComparisonFailure planned to be removed in IDEA 2025.1 (IJPL-156277).

GitOrigin-RevId: 2aa1967fe0732d2add105020aab56fbc65cb3d6c
This commit is contained in:
Sergei Vorobyov
2024-07-15 18:31:45 +02:00
committed by intellij-monorepo-bot
parent 93d8608a3f
commit 1d6d957eba
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java
View File

@@ -212,9 +212,6 @@ public class ComparisonFailureData {
failureData = createFileComparisonData(assertion);
if (failureData != null) return failureData;
failureData = createFileComparisonFailure(assertion);
if (failureData != null) return failureData;
failureData = createJunitComparisonFailure(assertion);
if (failureData != null) return failureData;
@@ -234,19 +231,6 @@ public class ComparisonFailureData {
return null;
}
@SuppressWarnings("deprecation")
private static ComparisonFailureData createFileComparisonFailure(Throwable assertion) {
if (assertion instanceof FileComparisonFailure) {
final FileComparisonFailure comparisonFailure = (FileComparisonFailure)assertion;
String actual = comparisonFailure.getActualStringPresentation();
String expected = comparisonFailure.getExpectedStringPresentation();
if (actual != null && expected != null) {
return new ComparisonFailureData(expected, actual, comparisonFailure.getFilePath(), comparisonFailure.getActualFilePath());
}
}
return null;
}
private static ComparisonFailureData createOpentest4jAssertion(Throwable assertion) {
try {
if (isInstance(assertion.getClass(), OPENTEST4J_ASSERTION)) {