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

print non-default-expected-actual error message for comparison failures (IDEA-142444)

Browse Source
This commit is contained in:
Anna Kozlova
2015-07-09 13:38:57 +03:00
parent fcc04aedd5
commit 9823b25588
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-runtime/src/com/intellij/rt/execution/junit/ComparisonFailureData.java
+4 -3
View File
@@ -71,8 +71,9 @@ public class ComparisonFailureData {
attrs.put("expected", notification.getExpected());
attrs.put("actual", notification.getActual());
final int failureIdx = trace.indexOf(failureMessage);
attrs.put("details", failureIdx > -1 ? trace.substring(failureIdx + failureMessage.length()) : trace);
final int failureIdx = failureMessage != null ? trace.indexOf(failureMessage) : -1;
final int failureMessageLength = failureMessage != null ? failureMessage.length() : 0;
attrs.put("details", failureIdx > -1 ? trace.substring(failureIdx + failureMessageLength) : trace);
final String filePath = notification.getFilePath();
if (filePath != null) {
attrs.put("expectedFile", filePath);
@@ -83,7 +84,7 @@ public class ComparisonFailureData {
comparisonFailureMessage = trace.substring(0, expectedIdx);
}
else {
comparisonFailureMessage = "Comparison Failure: ";
comparisonFailureMessage = (failureMessageLength > 0 ? failureMessage + "\n" : "") + "Comparison Failure: ";
}
attrs.put("message", comparisonFailureMessage);
}