From a42d45e87f1c849644873df6ebb2970b8624342b Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 1 Nov 2007 14:56:42 +0000
Subject: [PATCH] improve error message

SVN: 2339
---
 .../common/logging/LogMonitoringAppender.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/logging/LogMonitoringAppender.java b/common/sourceTest/java/ch/systemsx/cisd/common/logging/LogMonitoringAppender.java
index 28d3c8a7ec3..2e638dfe31d 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/logging/LogMonitoringAppender.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/logging/LogMonitoringAppender.java
@@ -36,6 +36,7 @@ public final class LogMonitoringAppender extends AppenderSkeleton
 
     private static Map<LogMonitoringAppender, String> appenderMap = new HashMap<LogMonitoringAppender, String>();
 
+    private final StringBuilder eventRecorder = new StringBuilder();
     private final String messagePart;
 
     private LogMonitoringAppender(String messagePart)
@@ -91,7 +92,14 @@ public final class LogMonitoringAppender extends AppenderSkeleton
     @Override
     protected void append(LoggingEvent event)
     {
-        if (event.getMessage().toString().contains(messagePart) || getThrowableStr(event).contains(messagePart))
+        String eventMessage = event.getMessage().toString();
+        eventRecorder.append("event message: ").append(eventMessage).append('\n');
+        String throwableStr = getThrowableStr(event);
+        if (throwableStr.length() > 0)
+        {
+            eventRecorder.append("event throwable: ").append(throwableStr).append('\n');
+        }
+        if (eventMessage.contains(messagePart) || throwableStr.contains(messagePart))
         {
             logHappened = true;
         }
@@ -111,12 +119,13 @@ public final class LogMonitoringAppender extends AppenderSkeleton
 
     public void verifyLogHasNotHappened()
     {
-        assert logHappened == false : "Following log snipped was found but shouldn't have: " + messagePart;
+        assert logHappened == false : "Log snippet '" + messagePart + "' has been unexpectedly found in log:\n"
+                + eventRecorder;
     }
     
     public void verifyLogHasHappened()
     {
-        assert logHappened : "Following log snippet has been missed: " + messagePart;
+        assert logHappened : "Log snippet '" + messagePart + "' has been missed in log:\n" + eventRecorder;
     }
     
     public void reset()
-- 
GitLab