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

test comparison: avoid double lines when trace starts with failure message when we don't detect comparison

Browse Source
This commit is contained in:
Anna Kozlova
2015-07-21 13:12:09 +02:00
parent d700f77747
commit f5536744fe
1 changed files with 4 additions and 5 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 -5
View File
@@ -67,13 +67,14 @@ public class ComparisonFailureData {
Map attrs,
Throwable throwable) {
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);
if (notification != null) {
attrs.put("expected", notification.getExpected());
attrs.put("actual", notification.getActual());
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);
@@ -89,8 +90,6 @@ public class ComparisonFailureData {
attrs.put("message", comparisonFailureMessage);
}
else {
attrs.put("details", trace);
Throwable throwableCause = null;
try {
throwableCause = throwable.getCause();