From 1d6d957eba1fc46949426d1521e9e1826ee260f9 Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Mon, 15 Jul 2024 18:31:45 +0200 Subject: [PATCH] IDEA-355257 [TestFramework] fix: removed usage of the Junit 4 comparison failure inside the ComparisonFailureData 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 --- .../execution/junit/ComparisonFailureData.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java b/java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java index 17fcfa10c8c4..cde335d8d828 100644 --- a/java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java +++ b/java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java @@ -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)) {