1 files changed, 13 insertions, 12 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java b/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
index 89f707fbef..a99abe4b94 100644
--- a/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
@@ -155,7 +155,7 @@ public class LogMonitorTest extends TestCase
 
         String notLogged = "This text was not logged";
 
-        validateLogDoesNotContainMessage(_monitor, notLogged);
+        validateLogDoesNotContainsMessage(_monitor, notLogged);
     }
 
     public void testWaitForMessage_Timeout() throws IOException
@@ -168,27 +168,28 @@ public class LogMonitorTest extends TestCase
 
         // Verify that we can time out waiting for a message
         assertFalse("Message was logged ",
-                    _monitor.waitForMessage(message, TIME_OUT / 2));
+                    _monitor.waitForMessage(message, TIME_OUT / 2, false));
 
         // Verify that the message did eventually get logged.
         assertTrue("Message was never logged.",
                     _monitor.waitForMessage(message, TIME_OUT));
     }
 
-    public void testDiscardPoint() throws IOException
+    public void testReset() throws IOException
     {
-        String firstMessage = getName() + ": Test Message1";
-        Logger.getRootLogger().warn(firstMessage);
+        String message = getName() + ": Test Message";
+
+        Logger.getRootLogger().warn(message);
+
+        validateLogContainsMessage(_monitor, message);
 
-        validateLogContainsMessage(_monitor, firstMessage);
+        String LOG_RESET_TEXT = "Log Monitor Reset";
 
-        _monitor.markDiscardPoint();
+        validateLogDoesNotContainsMessage(_monitor, LOG_RESET_TEXT);
 
-        validateLogDoesNotContainMessage(_monitor, firstMessage);
+        _monitor.reset();
 
-        String secondMessage = getName() + ": Test Message2";
-        Logger.getRootLogger().warn(secondMessage);
-        validateLogContainsMessage(_monitor, secondMessage);
+        assertEquals("", _monitor.readFile());
     }
 
     public void testRead() throws IOException
@@ -213,7 +214,7 @@ public class LogMonitorTest extends TestCase
      *
      * @throws IOException if a problems occurs
      */
-    protected void validateLogDoesNotContainMessage(LogMonitor log, String message)
+    protected void validateLogDoesNotContainsMessage(LogMonitor log, String message)
             throws IOException
     {
         List<String> results = log.findMatches(message);