added test for TimeEvaluator #149

Author: FreeAndNil

src/log4net.Tests/Core/EvaluatorTest.cs

@@ -20,6 +20,8 @@
 */
 
 using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
 using log4net.Appender;
 using log4net.Core;
 using log4net.Tests.Appender;
@@ -53,14 +55,16 @@ public void SetupRepository()
       m_bufferingForwardingAppender.Threshold = Level.All;
     }
 
+    private ILogger GetLogger([CallerMemberName] string name = "") => m_hierarchy.GetLogger(name);
+
     [Test]
     public void TestLevelEvaluator()
     {
       m_bufferingForwardingAppender.Evaluator = new LevelEvaluator(Level.Info);
       m_bufferingForwardingAppender.ActivateOptions();
       log4net.Config.BasicConfigurator.Configure(m_hierarchy, m_bufferingForwardingAppender);
 
-      ILogger logger = m_hierarchy.GetLogger("TestLevelEvaluator");
+      ILogger logger = GetLogger();
 
       logger.Log(typeof(EvaluatorTest), Level.Debug, "Debug message logged", null);
       logger.Log(typeof(EvaluatorTest), Level.Debug, "Debug message logged", null);
@@ -69,6 +73,44 @@ public void TestLevelEvaluator()
       logger.Log(typeof(EvaluatorTest), Level.Info, "Info message logged", null);
       Assert.AreEqual(3, m_countingAppender.Counter, "Test 3 events flushed on Info message.");
     }
+    
+    [Test]
+    public void TestTimeEvaluatorWhenElapsed()
+    {
+      m_bufferingForwardingAppender.Evaluator = new TimeEvaluator(1);
+      m_bufferingForwardingAppender.ActivateOptions();
+      log4net.Config.BasicConfigurator.Configure(m_hierarchy, m_bufferingForwardingAppender);
+
+      ILogger logger = GetLogger();
+
+      logger.Log(typeof(EvaluatorTest), Level.Debug, "Debug message logged", null);
+      logger.Log(typeof(EvaluatorTest), Level.Debug, "Debug message logged", null);
+      Assert.AreEqual(0, m_countingAppender.Counter, "Test 2 events buffered");
+
+      Thread.Sleep(1000);
+      logger.Log(typeof(EvaluatorTest), Level.Debug, "Info message logged", null);
+      Assert.AreEqual(3, m_countingAppender.Counter, "Test 3 events flushed on Info message.");
+    }
+    
+    [Test]
+    public void TestTimeEvaluatorWhenBufferFull()
+    {
+      m_bufferingForwardingAppender.Evaluator = new TimeEvaluator(10);
+      m_bufferingForwardingAppender.ActivateOptions();
+      log4net.Config.BasicConfigurator.Configure(m_hierarchy, m_bufferingForwardingAppender);
+
+      ILogger logger = GetLogger();
+
+      logger.Log(typeof(EvaluatorTest), Level.Debug, "Debug message logged", null);
+      logger.Log(typeof(EvaluatorTest), Level.Debug, "Debug message logged", null);
+      logger.Log(typeof(EvaluatorTest), Level.Debug, "Debug message logged", null);
+      logger.Log(typeof(EvaluatorTest), Level.Debug, "Debug message logged", null);
+      logger.Log(typeof(EvaluatorTest), Level.Debug, "Info message logged", null);
+      Assert.AreEqual(0, m_countingAppender.Counter, "Test 5 events buffered");
+
+      logger.Log(typeof(EvaluatorTest), Level.Debug, "Info message logged", null);
+      Assert.AreEqual(6, m_countingAppender.Counter, "Test 6 events flushed on Info message.");
+    }
 
     [Test]
     public void TestExceptionEvaluator()
@@ -77,7 +119,7 @@ public void TestExceptionEvaluator()
       m_bufferingForwardingAppender.ActivateOptions();
       log4net.Config.BasicConfigurator.Configure(m_hierarchy, m_bufferingForwardingAppender);
 
-      ILogger logger = m_hierarchy.GetLogger("TestExceptionEvaluator");
+      ILogger logger = GetLogger();
 
       logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn message logged", null);
       logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn message logged", null);
@@ -94,7 +136,7 @@ public void TestExceptionEvaluatorTriggerOnSubClass()
       m_bufferingForwardingAppender.ActivateOptions();
       log4net.Config.BasicConfigurator.Configure(m_hierarchy, m_bufferingForwardingAppender);
 
-      ILogger logger = m_hierarchy.GetLogger("TestExceptionEvaluatorTriggerOnSubClass");
+      ILogger logger = GetLogger();
 
       logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn message logged", null);
       logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn message logged", null);
@@ -111,7 +153,7 @@ public void TestExceptionEvaluatorNoTriggerOnSubClass()
       m_bufferingForwardingAppender.ActivateOptions();
       log4net.Config.BasicConfigurator.Configure(m_hierarchy, m_bufferingForwardingAppender);
 
-      ILogger logger = m_hierarchy.GetLogger("TestExceptionEvaluatorNoTriggerOnSubClass");
+      ILogger logger = GetLogger();
 
       logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn message logged", null);
       logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn message logged", null);
@@ -129,7 +171,7 @@ public void TestInvalidExceptionEvaluator()
       m_bufferingForwardingAppender.ActivateOptions();
       log4net.Config.BasicConfigurator.Configure(m_hierarchy, m_bufferingForwardingAppender);
 
-      ILogger logger = m_hierarchy.GetLogger("TestExceptionEvaluatorNoTriggerOnSubClass");
+      ILogger logger = GetLogger();
 
       logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn message logged", null);
       logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn message logged", null);