From 9c7b91cb006b6ca9399ae4bf104ee5f5ba46d2a8 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 6 Aug 2007 14:10:09 +0000
Subject: [PATCH] change LohMonitoringAppender.hasLogHappened() ->
verifyLogHasHappened()
SVN: 1238
---
.../cisd/common/logging/LogMonitoringAppender.java | 5 ++---
.../common/utilities/DirectoryScanningTimerTaskTest.java | 8 ++++----
.../systemsx/cisd/datamover/CopyActivityMonitorTest.java | 2 +-
3 files changed, 7 insertions(+), 8 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 cbf2a4739c2..87299fee299 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/logging/LogMonitoringAppender.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/logging/LogMonitoringAppender.java
@@ -109,9 +109,8 @@ public final class LogMonitoringAppender extends AppenderSkeleton
return false;
}
- public boolean hasLogHappened()
+ public void verifyLogHasHappened()
{
- return logHappened;
+ assert logHappened : "Following log snippet missed: " + messagePart;
}
-
}
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTaskTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTaskTest.java
index f48013d7a2a..94935be0a3e 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTaskTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/DirectoryScanningTimerTaskTest.java
@@ -319,7 +319,7 @@ public class DirectoryScanningTimerTaskTest
dir.delete();
assert dir.exists() == false;
scanner.run();
- assert appender.hasLogHappened();
+ appender.verifyLogHasHappened();
LogMonitoringAppender.removeAppender(appender);
}
@@ -338,7 +338,7 @@ public class DirectoryScanningTimerTaskTest
dir.deleteOnExit();
assert dir.isFile();
scanner.run();
- assert appender.hasLogHappened();
+ appender.verifyLogHasHappened();
dir.delete();
LogMonitoringAppender.removeAppender(appender);
}
@@ -360,8 +360,8 @@ public class DirectoryScanningTimerTaskTest
final DirectoryScanningTimerTask scanner =
new DirectoryScanningTimerTask(dir, EXCEPTION_THROWING_FILE_FILTER, mockPathHandler);
scanner.run();
- assert appender1.hasLogHappened();
- assert appender2.hasLogHappened();
+ appender1.verifyLogHasHappened();
+ appender2.verifyLogHasHappened();
file.delete();
dir.delete();
LogMonitoringAppender.removeAppender(appender1);
diff --git a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/CopyActivityMonitorTest.java b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/CopyActivityMonitorTest.java
index 9d12d92040f..ff2f52ade12 100644
--- a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/CopyActivityMonitorTest.java
+++ b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/CopyActivityMonitorTest.java
@@ -293,7 +293,7 @@ public class CopyActivityMonitorTest
monitor.stop();
LogMonitoringAppender.removeAppender(appender);
assert copyProcess.isTerminated();
- assert appender.hasLogHappened();
+ appender.verifyLogHasHappened();
}
private final class PathLastChangedCheckerStuck implements IPathLastChangedChecker
--
GitLab