Modified: logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs?rev=1158529&r1=1158528&r2=1158529&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs (original)
+++ logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs Wed Aug 17
05:57:00 2011
@@ -1,192 +1,192 @@
-using System;
-using System.Data;
-using System.Xml;
-using log4net.Appender;
-using log4net.Config;
-using log4net.Core;
-using log4net.Layout;
-using log4net.Repository;
-using log4net.Tests.Appender.AdoNet;
-using log4net.Util;
-using NUnit.Framework;
-
-namespace log4net.Tests.Appender
-{
- [TestFixture]
- public class AdoNetAppenderTest
- {
- [Test]
- public void NoBufferingTest()
- {
- ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
-
- AdoNetAppender adoNetAppender = new AdoNetAppender();
- adoNetAppender.BufferSize = -1;
- adoNetAppender.ConnectionType =
"log4net.Tests.Appender.AdoNet.Log4NetConnection";
- adoNetAppender.ActivateOptions();
-
- BasicConfigurator.Configure(rep, adoNetAppender);
-
- ILog log = LogManager.GetLogger(rep.Name, "NoBufferingTest");
- log.Debug("Message");
- Assert.AreEqual(1,
Log4NetCommand.MostRecentInstance.ExecuteNonQueryCount);
- }
-
- [Test]
- public void WebsiteExample()
- {
- XmlDocument log4netConfig = new XmlDocument();
- #region Load log4netConfig
- log4netConfig.LoadXml(@"
- <log4net>
- <appender name=""AdoNetAppender""
type=""log4net.Appender.AdoNetAppender"">
- <bufferSize value=""-1"" />
- <connectionType
value=""log4net.Tests.Appender.AdoNet.Log4NetConnection"" />
- <connectionString value=""data source=[database
server];initial catalog=[database name];integrated security=false;persist
security info=True;User ID=[user];Password=[password]"" />
- <commandText value=""INSERT INTO Log
([Date],[Thread],[Level],[Logger],[Message],[Exception]) VALUES (@log_date,
@thread, @log_level, @logger, @message, @exception)"" />
- <parameter>
- <parameterName value=""@log_date"" />
- <dbType value=""DateTime"" />
- <layout type=""log4net.Layout.RawTimeStampLayout"" />
- </parameter>
- <parameter>
- <parameterName value=""@thread"" />
- <dbType value=""String"" />
- <size value=""255"" />
- <layout type=""log4net.Layout.PatternLayout"">
- <conversionPattern value=""%thread"" />
- </layout>
- </parameter>
- <parameter>
- <parameterName value=""@log_level"" />
- <dbType value=""String"" />
- <size value=""50"" />
- <layout type=""log4net.Layout.PatternLayout"">
- <conversionPattern value=""%level"" />
- </layout>
- </parameter>
- <parameter>
- <parameterName value=""@logger"" />
- <dbType value=""String"" />
- <size value=""255"" />
- <layout type=""log4net.Layout.PatternLayout"">
- <conversionPattern value=""%logger"" />
- </layout>
- </parameter>
- <parameter>
- <parameterName value=""@message"" />
- <dbType value=""String"" />
- <size value=""4000"" />
- <layout type=""log4net.Layout.PatternLayout"">
- <conversionPattern value=""%message"" />
- </layout>
- </parameter>
- <parameter>
- <parameterName value=""@exception"" />
- <dbType value=""String"" />
- <size value=""2000"" />
- <layout type=""log4net.Layout.ExceptionLayout"" />
- </parameter>
- </appender>
- <root>
- <level value=""ALL"" />
- <appender-ref ref=""AdoNetAppender"" />
- </root>
- </log4net>");
- #endregion
-
- ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
- XmlConfigurator.Configure(rep, log4netConfig["log4net"]);
- ILog log = LogManager.GetLogger(rep.Name, "WebsiteExample");
- log.Debug("Message");
-
- IDbCommand command = Log4NetCommand.MostRecentInstance;
-
- Assert.AreEqual(
- "INSERT INTO Log
([Date],[Thread],[Level],[Logger],[Message],[Exception]) VALUES (@log_date,
@thread, @log_level, @logger, @message, @exception)",
- command.CommandText);
-
- Assert.AreEqual(6, command.Parameters.Count);
-
- IDbDataParameter param =
(IDbDataParameter)command.Parameters["@message"];
- Assert.AreEqual("Message", param.Value);
-
- param = (IDbDataParameter)command.Parameters["@log_level"];
- Assert.AreEqual(Level.Debug.ToString(), param.Value);
-
- param = (IDbDataParameter)command.Parameters["@logger"];
- Assert.AreEqual("WebsiteExample", param.Value);
-
- param = (IDbDataParameter)command.Parameters["@exception"];
- Assert.IsEmpty((string)param.Value);
- }
-
- [Test]
- public void NullPropertyXmlConfig()
- {
- XmlDocument log4netConfig = new XmlDocument();
- #region Load log4netConfig
- log4netConfig.LoadXml(@"
- <log4net>
- <appender name=""AdoNetAppender""
type=""log4net.Appender.AdoNetAppender"">
- <bufferSize value=""-1"" />
- <connectionType
value=""log4net.Tests.Appender.AdoNet.Log4NetConnection"" />
- <connectionString value=""data source=[database
server];initial catalog=[database name];integrated security=false;persist
security info=True;User ID=[user];Password=[password]"" />
- <commandText value=""INSERT INTO Log ([ProductId]) VALUES
(@productId)"" />
- <parameter>
- <parameterName value=""@productId"" />
- <dbType value=""String"" />
- <size value=""50"" />
- <layout type="" log4net.Layout.RawPropertyLayout"">
- <key value=""ProductId"" />
- </layout>
- </parameter>
- </appender>
- <root>
- <level value=""ALL"" />
- <appender-ref ref=""AdoNetAppender"" />
- </root>
- </log4net>");
- #endregion
-
- ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
- XmlConfigurator.Configure(rep, log4netConfig["log4net"]);
- ILog log = LogManager.GetLogger(rep.Name, "NullPropertyXmlConfig");
-
- log.Debug("Message");
- IDbCommand command = Log4NetCommand.MostRecentInstance;
- IDbDataParameter param =
(IDbDataParameter)command.Parameters["@productId"];
- Assert.AreNotEqual(SystemInfo.NullText, param.Value);
- Assert.AreEqual(DBNull.Value, param.Value);
- }
-
- [Test]
- public void NullPropertyProgmaticConfig()
- {
- AdoNetAppenderParameter productIdParam = new
AdoNetAppenderParameter();
- productIdParam.ParameterName = "@productId";
- productIdParam.DbType = DbType.String;
- productIdParam.Size = 50;
- RawPropertyLayout rawPropertyLayout = new RawPropertyLayout();
- rawPropertyLayout.Key = "ProductId";
- productIdParam.Layout = rawPropertyLayout;
-
- AdoNetAppender appender = new AdoNetAppender();
- appender.ConnectionType = typeof(Log4NetConnection).FullName;
- appender.BufferSize = -1;
- appender.CommandText = "INSERT INTO Log ([productId]) VALUES
(@productId)";
- appender.AddParameter(productIdParam);
- appender.ActivateOptions();
-
- ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
- BasicConfigurator.Configure(rep, appender);
- ILog log = LogManager.GetLogger(rep.Name,
"NullPropertyProgmaticConfig");
-
- log.Debug("Message");
- IDbCommand command = Log4NetCommand.MostRecentInstance;
- IDbDataParameter param =
(IDbDataParameter)command.Parameters["@productId"];
- Assert.AreNotEqual(SystemInfo.NullText, param.Value);
- Assert.AreEqual(DBNull.Value, param.Value);
- }
- }
-}
+using System;
+using System.Data;
+using System.Xml;
+using log4net.Appender;
+using log4net.Config;
+using log4net.Core;
+using log4net.Layout;
+using log4net.Repository;
+using log4net.Tests.Appender.AdoNet;
+using log4net.Util;
+using NUnit.Framework;
+
+namespace log4net.Tests.Appender
+{
+ [TestFixture]
+ public class AdoNetAppenderTest
+ {
+ [Test]
+ public void NoBufferingTest()
+ {
+ ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
+
+ AdoNetAppender adoNetAppender = new AdoNetAppender();
+ adoNetAppender.BufferSize = -1;
+ adoNetAppender.ConnectionType =
"log4net.Tests.Appender.AdoNet.Log4NetConnection";
+ adoNetAppender.ActivateOptions();
+
+ BasicConfigurator.Configure(rep, adoNetAppender);
+
+ ILog log = LogManager.GetLogger(rep.Name, "NoBufferingTest");
+ log.Debug("Message");
+ Assert.AreEqual(1,
Log4NetCommand.MostRecentInstance.ExecuteNonQueryCount);
+ }
+
+ [Test]
+ public void WebsiteExample()
+ {
+ XmlDocument log4netConfig = new XmlDocument();
+ #region Load log4netConfig
+ log4netConfig.LoadXml(@"
+ <log4net>
+ <appender name=""AdoNetAppender""
type=""log4net.Appender.AdoNetAppender"">
+ <bufferSize value=""-1"" />
+ <connectionType
value=""log4net.Tests.Appender.AdoNet.Log4NetConnection"" />
+ <connectionString value=""data source=[database
server];initial catalog=[database name];integrated security=false;persist
security info=True;User ID=[user];Password=[password]"" />
+ <commandText value=""INSERT INTO Log
([Date],[Thread],[Level],[Logger],[Message],[Exception]) VALUES (@log_date,
@thread, @log_level, @logger, @message, @exception)"" />
+ <parameter>
+ <parameterName value=""@log_date"" />
+ <dbType value=""DateTime"" />
+ <layout type=""log4net.Layout.RawTimeStampLayout"" />
+ </parameter>
+ <parameter>
+ <parameterName value=""@thread"" />
+ <dbType value=""String"" />
+ <size value=""255"" />
+ <layout type=""log4net.Layout.PatternLayout"">
+ <conversionPattern value=""%thread"" />
+ </layout>
+ </parameter>
+ <parameter>
+ <parameterName value=""@log_level"" />
+ <dbType value=""String"" />
+ <size value=""50"" />
+ <layout type=""log4net.Layout.PatternLayout"">
+ <conversionPattern value=""%level"" />
+ </layout>
+ </parameter>
+ <parameter>
+ <parameterName value=""@logger"" />
+ <dbType value=""String"" />
+ <size value=""255"" />
+ <layout type=""log4net.Layout.PatternLayout"">
+ <conversionPattern value=""%logger"" />
+ </layout>
+ </parameter>
+ <parameter>
+ <parameterName value=""@message"" />
+ <dbType value=""String"" />
+ <size value=""4000"" />
+ <layout type=""log4net.Layout.PatternLayout"">
+ <conversionPattern value=""%message"" />
+ </layout>
+ </parameter>
+ <parameter>
+ <parameterName value=""@exception"" />
+ <dbType value=""String"" />
+ <size value=""2000"" />
+ <layout type=""log4net.Layout.ExceptionLayout"" />
+ </parameter>
+ </appender>
+ <root>
+ <level value=""ALL"" />
+ <appender-ref ref=""AdoNetAppender"" />
+ </root>
+ </log4net>");
+ #endregion
+
+ ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
+ XmlConfigurator.Configure(rep, log4netConfig["log4net"]);
+ ILog log = LogManager.GetLogger(rep.Name, "WebsiteExample");
+ log.Debug("Message");
+
+ IDbCommand command = Log4NetCommand.MostRecentInstance;
+
+ Assert.AreEqual(
+ "INSERT INTO Log
([Date],[Thread],[Level],[Logger],[Message],[Exception]) VALUES (@log_date,
@thread, @log_level, @logger, @message, @exception)",
+ command.CommandText);
+
+ Assert.AreEqual(6, command.Parameters.Count);
+
+ IDbDataParameter param =
(IDbDataParameter)command.Parameters["@message"];
+ Assert.AreEqual("Message", param.Value);
+
+ param = (IDbDataParameter)command.Parameters["@log_level"];
+ Assert.AreEqual(Level.Debug.ToString(), param.Value);
+
+ param = (IDbDataParameter)command.Parameters["@logger"];
+ Assert.AreEqual("WebsiteExample", param.Value);
+
+ param = (IDbDataParameter)command.Parameters["@exception"];
+ Assert.IsEmpty((string)param.Value);
+ }
+
+ [Test]
+ public void NullPropertyXmlConfig()
+ {
+ XmlDocument log4netConfig = new XmlDocument();
+ #region Load log4netConfig
+ log4netConfig.LoadXml(@"
+ <log4net>
+ <appender name=""AdoNetAppender""
type=""log4net.Appender.AdoNetAppender"">
+ <bufferSize value=""-1"" />
+ <connectionType
value=""log4net.Tests.Appender.AdoNet.Log4NetConnection"" />
+ <connectionString value=""data source=[database
server];initial catalog=[database name];integrated security=false;persist
security info=True;User ID=[user];Password=[password]"" />
+ <commandText value=""INSERT INTO Log ([ProductId]) VALUES
(@productId)"" />
+ <parameter>
+ <parameterName value=""@productId"" />
+ <dbType value=""String"" />
+ <size value=""50"" />
+ <layout type="" log4net.Layout.RawPropertyLayout"">
+ <key value=""ProductId"" />
+ </layout>
+ </parameter>
+ </appender>
+ <root>
+ <level value=""ALL"" />
+ <appender-ref ref=""AdoNetAppender"" />
+ </root>
+ </log4net>");
+ #endregion
+
+ ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
+ XmlConfigurator.Configure(rep, log4netConfig["log4net"]);
+ ILog log = LogManager.GetLogger(rep.Name, "NullPropertyXmlConfig");
+
+ log.Debug("Message");
+ IDbCommand command = Log4NetCommand.MostRecentInstance;
+ IDbDataParameter param =
(IDbDataParameter)command.Parameters["@productId"];
+ Assert.AreNotEqual(SystemInfo.NullText, param.Value);
+ Assert.AreEqual(DBNull.Value, param.Value);
+ }
+
+ [Test]
+ public void NullPropertyProgmaticConfig()
+ {
+ AdoNetAppenderParameter productIdParam = new
AdoNetAppenderParameter();
+ productIdParam.ParameterName = "@productId";
+ productIdParam.DbType = DbType.String;
+ productIdParam.Size = 50;
+ RawPropertyLayout rawPropertyLayout = new RawPropertyLayout();
+ rawPropertyLayout.Key = "ProductId";
+ productIdParam.Layout = rawPropertyLayout;
+
+ AdoNetAppender appender = new AdoNetAppender();
+ appender.ConnectionType = typeof(Log4NetConnection).FullName;
+ appender.BufferSize = -1;
+ appender.CommandText = "INSERT INTO Log ([productId]) VALUES
(@productId)";
+ appender.AddParameter(productIdParam);
+ appender.ActivateOptions();
+
+ ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
+ BasicConfigurator.Configure(rep, appender);
+ ILog log = LogManager.GetLogger(rep.Name,
"NullPropertyProgmaticConfig");
+
+ log.Debug("Message");
+ IDbCommand command = Log4NetCommand.MostRecentInstance;
+ IDbDataParameter param =
(IDbDataParameter)command.Parameters["@productId"];
+ Assert.AreNotEqual(SystemInfo.NullText, param.Value);
+ Assert.AreEqual(DBNull.Value, param.Value);
+ }
+ }
+}
Propchange: logging/log4net/trunk/tests/src/Appender/AdoNetAppenderTest.cs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4net/trunk/tests/src/Appender/TraceAppenderTest.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Appender/TraceAppenderTest.cs?rev=1158529&r1=1158528&r2=1158529&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/Appender/TraceAppenderTest.cs (original)
+++ logging/log4net/trunk/tests/src/Appender/TraceAppenderTest.cs Wed Aug 17
05:57:00 2011
@@ -1,89 +1,89 @@
-using System;
-using System.Diagnostics;
-using log4net.Appender;
-using log4net.Config;
-using log4net.Layout;
-using log4net.Repository;
-using NUnit.Framework;
-
-namespace log4net.Tests.Appender
-{
- [TestFixture]
- public class TraceAppenderTest
- {
- [Test]
- public void DefaultCategoryTest()
- {
- CategoryTraceListener categoryTraceListener = new
CategoryTraceListener();
- Trace.Listeners.Clear();
- Trace.Listeners.Add(categoryTraceListener);
-
- ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
-
- TraceAppender traceAppender = new TraceAppender();
- traceAppender.Layout = new SimpleLayout();
- traceAppender.ActivateOptions();
-
- BasicConfigurator.Configure(rep, traceAppender);
-
- ILog log = LogManager.GetLogger(rep.Name, GetType());
- log.Debug("Message");
-
- Assert.AreEqual(
- GetType().ToString(),
- categoryTraceListener.Category);
- }
-
- [Test]
- public void MethodNameCategoryTest()
- {
- CategoryTraceListener categoryTraceListener = new
CategoryTraceListener();
- Trace.Listeners.Clear();
- Trace.Listeners.Add(categoryTraceListener);
-
- ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
-
- TraceAppender traceAppender = new TraceAppender();
- PatternLayout methodLayout = new PatternLayout("%method");
- methodLayout.ActivateOptions();
- traceAppender.Category = methodLayout;
- traceAppender.Layout = new SimpleLayout();
- traceAppender.ActivateOptions();
-
- BasicConfigurator.Configure(rep, traceAppender);
-
- ILog log = LogManager.GetLogger(rep.Name, GetType());
- log.Debug("Message");
-
- Assert.AreEqual(
- System.Reflection.MethodInfo.GetCurrentMethod().Name,
- categoryTraceListener.Category);
- }
- }
-
- public class CategoryTraceListener : TraceListener
- {
- private string lastCategory;
-
- public override void Write(string message)
- {
- // empty
- }
-
- public override void WriteLine(string message)
- {
- Write(message);
- }
-
- public override void Write(string message, string category)
- {
- lastCategory = category;
- base.Write(message, category);
- }
-
- public string Category
- {
- get { return lastCategory; }
- }
- }
-}
+using System;
+using System.Diagnostics;
+using log4net.Appender;
+using log4net.Config;
+using log4net.Layout;
+using log4net.Repository;
+using NUnit.Framework;
+
+namespace log4net.Tests.Appender
+{
+ [TestFixture]
+ public class TraceAppenderTest
+ {
+ [Test]
+ public void DefaultCategoryTest()
+ {
+ CategoryTraceListener categoryTraceListener = new
CategoryTraceListener();
+ Trace.Listeners.Clear();
+ Trace.Listeners.Add(categoryTraceListener);
+
+ ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
+
+ TraceAppender traceAppender = new TraceAppender();
+ traceAppender.Layout = new SimpleLayout();
+ traceAppender.ActivateOptions();
+
+ BasicConfigurator.Configure(rep, traceAppender);
+
+ ILog log = LogManager.GetLogger(rep.Name, GetType());
+ log.Debug("Message");
+
+ Assert.AreEqual(
+ GetType().ToString(),
+ categoryTraceListener.Category);
+ }
+
+ [Test]
+ public void MethodNameCategoryTest()
+ {
+ CategoryTraceListener categoryTraceListener = new
CategoryTraceListener();
+ Trace.Listeners.Clear();
+ Trace.Listeners.Add(categoryTraceListener);
+
+ ILoggerRepository rep =
LogManager.CreateRepository(Guid.NewGuid().ToString());
+
+ TraceAppender traceAppender = new TraceAppender();
+ PatternLayout methodLayout = new PatternLayout("%method");
+ methodLayout.ActivateOptions();
+ traceAppender.Category = methodLayout;
+ traceAppender.Layout = new SimpleLayout();
+ traceAppender.ActivateOptions();
+
+ BasicConfigurator.Configure(rep, traceAppender);
+
+ ILog log = LogManager.GetLogger(rep.Name, GetType());
+ log.Debug("Message");
+
+ Assert.AreEqual(
+ System.Reflection.MethodInfo.GetCurrentMethod().Name,
+ categoryTraceListener.Category);
+ }
+ }
+
+ public class CategoryTraceListener : TraceListener
+ {
+ private string lastCategory;
+
+ public override void Write(string message)
+ {
+ // empty
+ }
+
+ public override void WriteLine(string message)
+ {
+ Write(message);
+ }
+
+ public override void Write(string message, string category)
+ {
+ lastCategory = category;
+ base.Write(message, category);
+ }
+
+ public string Category
+ {
+ get { return lastCategory; }
+ }
+ }
+}
Propchange: logging/log4net/trunk/tests/src/Appender/TraceAppenderTest.cs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4net/trunk/tests/src/Core/EvaluatorTest.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Core/EvaluatorTest.cs?rev=1158529&r1=1158528&r2=1158529&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/Core/EvaluatorTest.cs (original)
+++ logging/log4net/trunk/tests/src/Core/EvaluatorTest.cs Wed Aug 17 05:57:00
2011
@@ -1,121 +1,121 @@
-using System;
-using log4net.Appender;
-using log4net.Core;
-using log4net.Tests.Appender;
-using NUnit.Framework;
-
-namespace log4net.Tests.Core
-{
- [TestFixture]
- public class EvaluatorTest
- {
- private BufferingForwardingAppender
m_bufferingForwardingAppender;
- private CountingAppender m_countingAppender;
- private Repository.Hierarchy.Hierarchy m_hierarchy;
-
- [SetUp]
- public void SetupRepository()
- {
- m_hierarchy = new Repository.Hierarchy.Hierarchy();
-
- m_countingAppender = new CountingAppender();
- m_countingAppender.ActivateOptions();
-
- m_bufferingForwardingAppender = new
BufferingForwardingAppender();
-
m_bufferingForwardingAppender.AddAppender(m_countingAppender);
-
- m_bufferingForwardingAppender.BufferSize = 5;
- m_bufferingForwardingAppender.ClearFilters();
- m_bufferingForwardingAppender.Fix = FixFlags.Partial;
- m_bufferingForwardingAppender.Lossy = false;
- m_bufferingForwardingAppender.LossyEvaluator = null;
- m_bufferingForwardingAppender.Threshold = Level.All;
- }
-
- [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");
-
- 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");
-
- 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 TestExceptionEvaluator()
- {
- m_bufferingForwardingAppender.Evaluator = new
ExceptionEvaluator(typeof(ApplicationException), true);
- m_bufferingForwardingAppender.ActivateOptions();
- log4net.Config.BasicConfigurator.Configure(m_hierarchy,
m_bufferingForwardingAppender);
-
- ILogger logger =
m_hierarchy.GetLogger("TestExceptionEvaluator");
-
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
- Assert.AreEqual(0, m_countingAppender.Counter, "Test 2
events buffered");
-
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", new ApplicationException());
- Assert.AreEqual(3, m_countingAppender.Counter, "Test 3
events flushed on ApplicationException message.");
- }
-
- [Test]
- public void TestExceptionEvaluatorTriggerOnSubClass()
- {
- m_bufferingForwardingAppender.Evaluator = new
ExceptionEvaluator(typeof(Exception), true);
- m_bufferingForwardingAppender.ActivateOptions();
- log4net.Config.BasicConfigurator.Configure(m_hierarchy,
m_bufferingForwardingAppender);
-
- ILogger logger =
m_hierarchy.GetLogger("TestExceptionEvaluatorTriggerOnSubClass");
-
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
- Assert.AreEqual(0, m_countingAppender.Counter, "Test 2
events buffered");
-
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", new ApplicationException());
- Assert.AreEqual(3, m_countingAppender.Counter, "Test 3
events flushed on ApplicationException message.");
- }
-
- [Test]
- public void TestExceptionEvaluatorNoTriggerOnSubClass()
- {
- m_bufferingForwardingAppender.Evaluator = new
ExceptionEvaluator(typeof(Exception), false);
- m_bufferingForwardingAppender.ActivateOptions();
- log4net.Config.BasicConfigurator.Configure(m_hierarchy,
m_bufferingForwardingAppender);
-
- ILogger logger =
m_hierarchy.GetLogger("TestExceptionEvaluatorNoTriggerOnSubClass");
-
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
- Assert.AreEqual(0, m_countingAppender.Counter, "Test 2
events buffered");
-
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", new ApplicationException());
- Assert.AreEqual(0, m_countingAppender.Counter, "Test 3
events buffered");
- }
-
- [Test]
- public void TestInvalidExceptionEvaluator()
- {
- // warning: String is not a subclass of Exception
- m_bufferingForwardingAppender.Evaluator = new
ExceptionEvaluator(typeof(String), false);
- m_bufferingForwardingAppender.ActivateOptions();
- log4net.Config.BasicConfigurator.Configure(m_hierarchy,
m_bufferingForwardingAppender);
-
- ILogger logger =
m_hierarchy.GetLogger("TestExceptionEvaluatorNoTriggerOnSubClass");
-
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
- Assert.AreEqual(0, m_countingAppender.Counter, "Test 2
events buffered");
-
- logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", new ApplicationException());
- Assert.AreEqual(0, m_countingAppender.Counter, "Test 3
events buffered");
- }
- }
-}
+using System;
+using log4net.Appender;
+using log4net.Core;
+using log4net.Tests.Appender;
+using NUnit.Framework;
+
+namespace log4net.Tests.Core
+{
+ [TestFixture]
+ public class EvaluatorTest
+ {
+ private BufferingForwardingAppender
m_bufferingForwardingAppender;
+ private CountingAppender m_countingAppender;
+ private Repository.Hierarchy.Hierarchy m_hierarchy;
+
+ [SetUp]
+ public void SetupRepository()
+ {
+ m_hierarchy = new Repository.Hierarchy.Hierarchy();
+
+ m_countingAppender = new CountingAppender();
+ m_countingAppender.ActivateOptions();
+
+ m_bufferingForwardingAppender = new
BufferingForwardingAppender();
+
m_bufferingForwardingAppender.AddAppender(m_countingAppender);
+
+ m_bufferingForwardingAppender.BufferSize = 5;
+ m_bufferingForwardingAppender.ClearFilters();
+ m_bufferingForwardingAppender.Fix = FixFlags.Partial;
+ m_bufferingForwardingAppender.Lossy = false;
+ m_bufferingForwardingAppender.LossyEvaluator = null;
+ m_bufferingForwardingAppender.Threshold = Level.All;
+ }
+
+ [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");
+
+ 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");
+
+ 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 TestExceptionEvaluator()
+ {
+ m_bufferingForwardingAppender.Evaluator = new
ExceptionEvaluator(typeof(ApplicationException), true);
+ m_bufferingForwardingAppender.ActivateOptions();
+ log4net.Config.BasicConfigurator.Configure(m_hierarchy,
m_bufferingForwardingAppender);
+
+ ILogger logger =
m_hierarchy.GetLogger("TestExceptionEvaluator");
+
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
+ Assert.AreEqual(0, m_countingAppender.Counter, "Test 2
events buffered");
+
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", new ApplicationException());
+ Assert.AreEqual(3, m_countingAppender.Counter, "Test 3
events flushed on ApplicationException message.");
+ }
+
+ [Test]
+ public void TestExceptionEvaluatorTriggerOnSubClass()
+ {
+ m_bufferingForwardingAppender.Evaluator = new
ExceptionEvaluator(typeof(Exception), true);
+ m_bufferingForwardingAppender.ActivateOptions();
+ log4net.Config.BasicConfigurator.Configure(m_hierarchy,
m_bufferingForwardingAppender);
+
+ ILogger logger =
m_hierarchy.GetLogger("TestExceptionEvaluatorTriggerOnSubClass");
+
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
+ Assert.AreEqual(0, m_countingAppender.Counter, "Test 2
events buffered");
+
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", new ApplicationException());
+ Assert.AreEqual(3, m_countingAppender.Counter, "Test 3
events flushed on ApplicationException message.");
+ }
+
+ [Test]
+ public void TestExceptionEvaluatorNoTriggerOnSubClass()
+ {
+ m_bufferingForwardingAppender.Evaluator = new
ExceptionEvaluator(typeof(Exception), false);
+ m_bufferingForwardingAppender.ActivateOptions();
+ log4net.Config.BasicConfigurator.Configure(m_hierarchy,
m_bufferingForwardingAppender);
+
+ ILogger logger =
m_hierarchy.GetLogger("TestExceptionEvaluatorNoTriggerOnSubClass");
+
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
+ Assert.AreEqual(0, m_countingAppender.Counter, "Test 2
events buffered");
+
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", new ApplicationException());
+ Assert.AreEqual(0, m_countingAppender.Counter, "Test 3
events buffered");
+ }
+
+ [Test]
+ public void TestInvalidExceptionEvaluator()
+ {
+ // warning: String is not a subclass of Exception
+ m_bufferingForwardingAppender.Evaluator = new
ExceptionEvaluator(typeof(String), false);
+ m_bufferingForwardingAppender.ActivateOptions();
+ log4net.Config.BasicConfigurator.Configure(m_hierarchy,
m_bufferingForwardingAppender);
+
+ ILogger logger =
m_hierarchy.GetLogger("TestExceptionEvaluatorNoTriggerOnSubClass");
+
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", null);
+ Assert.AreEqual(0, m_countingAppender.Counter, "Test 2
events buffered");
+
+ logger.Log(typeof(EvaluatorTest), Level.Warn, "Warn
message logged", new ApplicationException());
+ Assert.AreEqual(0, m_countingAppender.Counter, "Test 3
events buffered");
+ }
+ }
+}
Propchange: logging/log4net/trunk/tests/src/Core/EvaluatorTest.cs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4net/trunk/tests/src/Core/FixingTest.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Core/FixingTest.cs?rev=1158529&r1=1158528&r2=1158529&view=diff
==============================================================================
--- logging/log4net/trunk/tests/src/Core/FixingTest.cs (original)
+++ logging/log4net/trunk/tests/src/Core/FixingTest.cs Wed Aug 17 05:57:00 2011
@@ -1,136 +1,136 @@
-#region Apache License
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to you under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-#endregion
-
-using System;
-using System.Threading;
-
-using log4net.Core;
-
-using NUnit.Framework;
-
-namespace log4net.Tests.Core
-{
- /// <summary>
- /// </<summary>
- [TestFixture]
- public class FixingTest
- {
- static FixingTest()
- {
- LogManager.CreateRepository("Test Repository");
-
- // write-once
- if (Thread.CurrentThread.Name == null)
- {
- Thread.CurrentThread.Name = "Log4Net Test
thread";
- }
- }
-
- [Test]
- public void TestUnfixedValues()
- {
- LoggingEventData loggingEventData =
BuildStandardEventData();
-
- // LoggingEvents occur at distinct points in time
- LoggingEvent loggingEvent = new LoggingEvent(
- loggingEventData.LocationInfo.GetType(),
- LogManager.GetRepository("Test Repository"),
- loggingEventData.LoggerName,
- loggingEventData.Level,
- loggingEventData.Message,
- new Exception("This is the exception"));
-
- AssertExpectedLoggingEvent(loggingEvent,
loggingEventData);
-
- Assert.AreEqual(FixFlags.None, loggingEvent.Fix, "Fixed
Fields is incorrect");
- }
-
- [Test]
- public void TestAllFixedValues()
- {
- LoggingEventData loggingEventData =
BuildStandardEventData();
-
- // LoggingEvents occur at distinct points in time
- LoggingEvent loggingEvent = new LoggingEvent(
- loggingEventData.LocationInfo.GetType(),
- LogManager.GetRepository("Test Repository"),
- loggingEventData.LoggerName,
- loggingEventData.Level,
- loggingEventData.Message,
- new Exception("This is the exception"));
-
- AssertExpectedLoggingEvent(loggingEvent,
loggingEventData);
-
- loggingEvent.Fix = FixFlags.All;
-
- Assert.AreEqual(FixFlags.LocationInfo |
FixFlags.UserName | FixFlags.Identity | FixFlags.Partial | FixFlags.Message |
FixFlags.ThreadName | FixFlags.Exception | FixFlags.Domain |
FixFlags.Properties, loggingEvent.Fix, "Fixed Fields is incorrect");
- }
-
- [Test]
- public void TestNoFixedValues()
- {
- LoggingEventData loggingEventData =
BuildStandardEventData();
-
- // LoggingEvents occur at distinct points in time
- LoggingEvent loggingEvent = new LoggingEvent(
- loggingEventData.LocationInfo.GetType(),
- LogManager.GetRepository("Test Repository"),
- loggingEventData.LoggerName,
- loggingEventData.Level,
- loggingEventData.Message,
- new Exception("This is the exception"));
-
- AssertExpectedLoggingEvent(loggingEvent,
loggingEventData);
-
- loggingEvent.Fix = FixFlags.None;
-
- Assert.AreEqual(FixFlags.None, loggingEvent.Fix, "Fixed
Fields is incorrect");
- }
-
- private static LoggingEventData BuildStandardEventData()
- {
- LoggingEventData loggingEventData = new
LoggingEventData();
- loggingEventData.LoggerName =
typeof(FixingTest).FullName;
- loggingEventData.Level = Level.Warn;
- loggingEventData.Message = "Logging event works";
- loggingEventData.Domain = "ReallySimpleApp";
- loggingEventData.LocationInfo = new
LocationInfo(typeof(FixingTest).Name, "Main", "Class1.cs", "29"); //Completely
arbitary
- loggingEventData.ThreadName = Thread.CurrentThread.Name;
- loggingEventData.TimeStamp = DateTime.Today;
- loggingEventData.ExceptionString = "Exception occured
here";
- loggingEventData.UserName = "TestUser";
- return loggingEventData;
- }
-
- private static void AssertExpectedLoggingEvent(LoggingEvent
loggingEvent, LoggingEventData loggingEventData)
- {
- Assert.AreEqual("ReallySimpleApp",
loggingEventData.Domain, "Domain is incorrect");
- Assert.AreEqual("System.Exception: This is the
exception", loggingEvent.GetExceptionString(), "Exception is incorrect");
- Assert.AreEqual(null, loggingEventData.Identity,
"Identity is incorrect");
- Assert.AreEqual(Level.Warn, loggingEventData.Level,
"Level is incorrect");
- Assert.AreEqual("get_LocationInformation",
loggingEvent.LocationInformation.MethodName, "Location Info is incorrect");
- Assert.AreEqual("log4net.Tests.Core.FixingTest",
loggingEventData.LoggerName, "LoggerName is incorrect");
- Assert.AreEqual(LogManager.GetRepository("Test
Repository"), loggingEvent.Repository, "Repository is incorrect");
- Assert.AreEqual(Thread.CurrentThread.Name,
loggingEventData.ThreadName, "ThreadName is incorrect");
- Assert.IsNotNull(loggingEventData.TimeStamp, "TimeStamp
is incorrect");
- Assert.AreEqual("TestUser", loggingEventData.UserName,
"UserName is incorrect");
- Assert.AreEqual("Logging event works",
loggingEvent.RenderedMessage, "Message is incorrect");
- }
- }
+#region Apache License
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to you under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#endregion
+
+using System;
+using System.Threading;
+
+using log4net.Core;
+
+using NUnit.Framework;
+
+namespace log4net.Tests.Core
+{
+ /// <summary>
+ /// </<summary>
+ [TestFixture]
+ public class FixingTest
+ {
+ static FixingTest()
+ {
+ LogManager.CreateRepository("Test Repository");
+
+ // write-once
+ if (Thread.CurrentThread.Name == null)
+ {
+ Thread.CurrentThread.Name = "Log4Net Test
thread";
+ }
+ }
+
+ [Test]
+ public void TestUnfixedValues()
+ {
+ LoggingEventData loggingEventData =
BuildStandardEventData();
+
+ // LoggingEvents occur at distinct points in time
+ LoggingEvent loggingEvent = new LoggingEvent(
+ loggingEventData.LocationInfo.GetType(),
+ LogManager.GetRepository("Test Repository"),
+ loggingEventData.LoggerName,
+ loggingEventData.Level,
+ loggingEventData.Message,
+ new Exception("This is the exception"));
+
+ AssertExpectedLoggingEvent(loggingEvent,
loggingEventData);
+
+ Assert.AreEqual(FixFlags.None, loggingEvent.Fix, "Fixed
Fields is incorrect");
+ }
+
+ [Test]
+ public void TestAllFixedValues()
+ {
+ LoggingEventData loggingEventData =
BuildStandardEventData();
+
+ // LoggingEvents occur at distinct points in time
+ LoggingEvent loggingEvent = new LoggingEvent(
+ loggingEventData.LocationInfo.GetType(),
+ LogManager.GetRepository("Test Repository"),
+ loggingEventData.LoggerName,
+ loggingEventData.Level,
+ loggingEventData.Message,
+ new Exception("This is the exception"));
+
+ AssertExpectedLoggingEvent(loggingEvent,
loggingEventData);
+
+ loggingEvent.Fix = FixFlags.All;
+
+ Assert.AreEqual(FixFlags.LocationInfo |
FixFlags.UserName | FixFlags.Identity | FixFlags.Partial | FixFlags.Message |
FixFlags.ThreadName | FixFlags.Exception | FixFlags.Domain |
FixFlags.Properties, loggingEvent.Fix, "Fixed Fields is incorrect");
+ }
+
+ [Test]
+ public void TestNoFixedValues()
+ {
+ LoggingEventData loggingEventData =
BuildStandardEventData();
+
+ // LoggingEvents occur at distinct points in time
+ LoggingEvent loggingEvent = new LoggingEvent(
+ loggingEventData.LocationInfo.GetType(),
+ LogManager.GetRepository("Test Repository"),
+ loggingEventData.LoggerName,
+ loggingEventData.Level,
+ loggingEventData.Message,
+ new Exception("This is the exception"));
+
+ AssertExpectedLoggingEvent(loggingEvent,
loggingEventData);
+
+ loggingEvent.Fix = FixFlags.None;
+
+ Assert.AreEqual(FixFlags.None, loggingEvent.Fix, "Fixed
Fields is incorrect");
+ }
+
+ private static LoggingEventData BuildStandardEventData()
+ {
+ LoggingEventData loggingEventData = new
LoggingEventData();
+ loggingEventData.LoggerName =
typeof(FixingTest).FullName;
+ loggingEventData.Level = Level.Warn;
+ loggingEventData.Message = "Logging event works";
+ loggingEventData.Domain = "ReallySimpleApp";
+ loggingEventData.LocationInfo = new
LocationInfo(typeof(FixingTest).Name, "Main", "Class1.cs", "29"); //Completely
arbitary
+ loggingEventData.ThreadName = Thread.CurrentThread.Name;
+ loggingEventData.TimeStamp = DateTime.Today;
+ loggingEventData.ExceptionString = "Exception occured
here";
+ loggingEventData.UserName = "TestUser";
+ return loggingEventData;
+ }
+
+ private static void AssertExpectedLoggingEvent(LoggingEvent
loggingEvent, LoggingEventData loggingEventData)
+ {
+ Assert.AreEqual("ReallySimpleApp",
loggingEventData.Domain, "Domain is incorrect");
+ Assert.AreEqual("System.Exception: This is the
exception", loggingEvent.GetExceptionString(), "Exception is incorrect");
+ Assert.AreEqual(null, loggingEventData.Identity,
"Identity is incorrect");
+ Assert.AreEqual(Level.Warn, loggingEventData.Level,
"Level is incorrect");
+ Assert.AreEqual("get_LocationInformation",
loggingEvent.LocationInformation.MethodName, "Location Info is incorrect");
+ Assert.AreEqual("log4net.Tests.Core.FixingTest",
loggingEventData.LoggerName, "LoggerName is incorrect");
+ Assert.AreEqual(LogManager.GetRepository("Test
Repository"), loggingEvent.Repository, "Repository is incorrect");
+ Assert.AreEqual(Thread.CurrentThread.Name,
loggingEventData.ThreadName, "ThreadName is incorrect");
+ Assert.IsNotNull(loggingEventData.TimeStamp, "TimeStamp
is incorrect");
+ Assert.AreEqual("TestUser", loggingEventData.UserName,
"UserName is incorrect");
+ Assert.AreEqual("Logging event works",
loggingEvent.RenderedMessage, "Message is incorrect");
+ }
+ }
}
\ No newline at end of file
Propchange: logging/log4net/trunk/tests/src/Core/FixingTest.cs
------------------------------------------------------------------------------
svn:eol-style = native
