IDEA-325556 [Platform|TestFramework] fix: use getExpectedStringPresentation instead of getExpected where we expect text

The return type of `FileComparisonData.getExpected` is `Object`. In `Opentest4j` scenario, it can be FileInfo. So we need to use `FileComparisonData.getExpectedStringPresentation` instead.

GitOrigin-RevId: c32aaf1674072c3c21ccaf447c9d50296a9e38e3
This commit is contained in:
Sergei Vorobyov
2023-11-08 13:49:39 +01:00
committed by intellij-monorepo-bot
parent 56036d3a5e
commit a2047655a0
9 changed files with 11 additions and 23 deletions

View File

@@ -230,8 +230,8 @@ public class ComparisonFailureData {
private static ComparisonFailureData createFileComparisonFailure(Throwable assertion) {
if (assertion instanceof FileComparisonFailure) {
final FileComparisonFailure comparisonFailure = (FileComparisonFailure)assertion;
String actual = comparisonFailure.getActual();
String expected = comparisonFailure.getExpected();
String actual = comparisonFailure.getActualStringPresentation();
String expected = comparisonFailure.getExpectedStringPresentation();
if (actual != null && expected != null) {
return new ComparisonFailureData(expected, actual, comparisonFailure.getFilePath(), comparisonFailure.getActualFilePath());
}

View File

@@ -2,9 +2,7 @@
package com.intellij.rt.execution.junit;
public interface FileComparisonData {
Object getActual();
String getActualStringPresentation();
Object getExpected();
String getExpectedStringPresentation();
String getFilePath();
String getActualFilePath();

View File

@@ -40,16 +40,6 @@ public class FileComparisonFailure extends ComparisonFailure implements FileComp
return myActualFilePath;
}
@Override
public String getExpected() {
return myExpected;
}
@Override
public String getActual() {
return myActual;
}
@Override
public String getActualStringPresentation() {
return myActual;