avoid junit notifications errors when throwable.getMessage() throws exceptions (sic! IDEA-69522 )

This commit is contained in:
anna
2011-06-28 21:09:16 +04:00
parent a213eaebf7
commit 6832563cad
@@ -75,8 +75,22 @@ public class Packet extends PacketWriter {
}
public Packet addThrowable(Throwable throwable) {
String filteredTrace = BaseTestRunner.getFilteredTrace(throwable);
String message = BaseTestRunner.getPreference("filterstack").equals("true") ? makeNewLinesCompatibleWithJUnit(throwableToString(throwable)) : throwableToString(throwable);
String filteredTrace;
try {
filteredTrace = BaseTestRunner.getFilteredTrace(throwable);
}
catch (Throwable e) {
filteredTrace = BaseTestRunner.getFilteredTrace(e);
}
String message;
try {
message = BaseTestRunner.getPreference("filterstack").equals("true") ? makeNewLinesCompatibleWithJUnit(throwableToString(throwable)) : throwableToString(throwable);
}
catch (Throwable e) {
message = throwableToString(e);
}
addLimitedString(message);
if (filteredTrace.startsWith(message))
filteredTrace = filteredTrace.substring(message.length());