Modified: logging/log4net/trunk/tests/src/Core/StringFormatTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Core/StringFormatTest.cs?view=diff&rev=511537&r1=511536&r2=511537 ============================================================================== --- logging/log4net/trunk/tests/src/Core/StringFormatTest.cs (original) +++ logging/log4net/trunk/tests/src/Core/StringFormatTest.cs Sun Feb 25 08:14:29 2007 @@ -18,14 +18,15 @@ #endregion using System; -using System.IO; +using System.Globalization; using log4net.Config; -using log4net.Layout; using log4net.Core; +using log4net.Layout; using log4net.Repository; using log4net.Tests.Appender; -using log4net.Util; +using log4net.Tests.Layout; + using NUnit.Framework; namespace log4net.Tests.Core @@ -36,9 +37,11 @@ /// <remarks> /// Used for internal unit testing the <see cref="PatternLayoutTest"/> class. /// </remarks> - [TestFixture] public class StringFormatTest + [TestFixture] + public class StringFormatTest { - [Test] public void TestFormatString() + [Test] + public void TestFormatString() { StringAppender stringAppender = new StringAppender(); stringAppender.Layout = new PatternLayout("%message"); @@ -94,7 +97,8 @@ private const string STRING_FORMAT_ERROR = "<log4net.Error>Exception during StringFormat: Index (zero based) must be greater than or equal to zero and less than the size of the argument list. <format>IGNORE THIS WARNING - EXCEPTION EXPECTED Before {0} After {1} {2}</format><args>{Middle, End}</args></log4net.Error>"; - [Test] public void TestLogFormatApi_Debug() + [Test] + public void TestLogFormatApi_Debug() { StringAppender stringAppender = new StringAppender(); stringAppender.Layout = new PatternLayout("%level:%message"); @@ -146,11 +150,13 @@ stringAppender.Reset(); // *** - log1.DebugFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.DebugFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("DEBUG:Before Middle After End", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } - [Test] public void TestLogFormatApi_NoDebug() + + [Test] + public void TestLogFormatApi_NoDebug() { StringAppender stringAppender = new StringAppender(); stringAppender.Threshold = Level.Info; @@ -203,13 +209,14 @@ stringAppender.Reset(); // *** - log1.DebugFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.DebugFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } - [Test] public void TestLogFormatApi_Info() + [Test] + public void TestLogFormatApi_Info() { StringAppender stringAppender = new StringAppender(); stringAppender.Layout = new PatternLayout("%level:%message"); @@ -261,11 +268,13 @@ stringAppender.Reset(); // *** - log1.InfoFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.InfoFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("INFO:Before Middle After End", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } - [Test] public void TestLogFormatApi_NoInfo() + + [Test] + public void TestLogFormatApi_NoInfo() { StringAppender stringAppender = new StringAppender(); stringAppender.Threshold = Level.Warn; @@ -318,13 +327,14 @@ stringAppender.Reset(); // *** - log1.InfoFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.InfoFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } - [Test] public void TestLogFormatApi_Warn() + [Test] + public void TestLogFormatApi_Warn() { StringAppender stringAppender = new StringAppender(); stringAppender.Layout = new PatternLayout("%level:%message"); @@ -376,11 +386,13 @@ stringAppender.Reset(); // *** - log1.WarnFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.WarnFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("WARN:Before Middle After End", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } - [Test] public void TestLogFormatApi_NoWarn() + + [Test] + public void TestLogFormatApi_NoWarn() { StringAppender stringAppender = new StringAppender(); stringAppender.Threshold = Level.Error; @@ -433,13 +445,14 @@ stringAppender.Reset(); // *** - log1.WarnFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.WarnFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } - [Test] public void TestLogFormatApi_Error() + [Test] + public void TestLogFormatApi_Error() { StringAppender stringAppender = new StringAppender(); stringAppender.Layout = new PatternLayout("%level:%message"); @@ -491,11 +504,13 @@ stringAppender.Reset(); // *** - log1.ErrorFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.ErrorFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("ERROR:Before Middle After End", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } - [Test] public void TestLogFormatApi_NoError() + + [Test] + public void TestLogFormatApi_NoError() { StringAppender stringAppender = new StringAppender(); stringAppender.Threshold = Level.Fatal; @@ -548,13 +563,14 @@ stringAppender.Reset(); // *** - log1.ErrorFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.ErrorFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } - [Test] public void TestLogFormatApi_Fatal() + [Test] + public void TestLogFormatApi_Fatal() { StringAppender stringAppender = new StringAppender(); stringAppender.Layout = new PatternLayout("%level:%message"); @@ -606,11 +622,13 @@ stringAppender.Reset(); // *** - log1.FatalFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.FatalFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("FATAL:Before Middle After End", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } - [Test] public void TestLogFormatApi_NoFatal() + + [Test] + public void TestLogFormatApi_NoFatal() { StringAppender stringAppender = new StringAppender(); stringAppender.Threshold = Level.Off; @@ -663,9 +681,9 @@ stringAppender.Reset(); // *** - log1.FatalFormat(new System.Globalization.CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); + log1.FatalFormat(new CultureInfo("en"), "Before {0} After {1}", "Middle", "End"); Assert.AreEqual("", stringAppender.GetString(), "Test formatting with 'en' provider"); stringAppender.Reset(); } } -} +} \ No newline at end of file
Modified: logging/log4net/trunk/tests/src/Hierarchy/Logger.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Hierarchy/Logger.cs?view=diff&rev=511537&r1=511536&r2=511537 ============================================================================== --- logging/log4net/trunk/tests/src/Hierarchy/Logger.cs (original) +++ logging/log4net/trunk/tests/src/Hierarchy/Logger.cs Sun Feb 25 08:14:29 2007 @@ -33,110 +33,120 @@ /// <remarks> /// Internal unit test. Uses the NUnit test harness. /// </remarks> - [TestFixture] public class LoggerTest + [TestFixture] + public class LoggerTest { - - Logger log; + private Logger log; // A short message. - static string MSG = "M"; + private static string MSG = "M"; /// <summary> /// Any initialization that happens before each test can /// go here /// </summary> - [SetUp] public void SetUp() + [SetUp] + public void SetUp() { } /// <summary> /// Any steps that happen after each test go here /// </summary> - [TearDown] public void TearDown() + [TearDown] + public void TearDown() { // Regular users should not use the clear method lightly! LogManager.GetRepository().ResetConfiguration(); LogManager.GetRepository().Shutdown(); - ((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Clear(); + ((Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Clear(); } /// <summary> /// Add an appender and see if it can be retrieved. /// </summary> - [Test] public void TestAppender1() + [Test] + public void TestAppender1() { - log = LogManager.GetLogger("test").Logger as Logger; + log = (Logger)LogManager.GetLogger("test").Logger; CountingAppender a1 = new CountingAppender(); - a1.Name = "testAppender1"; + a1.Name = "testAppender1"; log.AddAppender(a1); - + IEnumerator enumAppenders = ((IEnumerable)log.Appenders).GetEnumerator(); - Assert.IsTrue( enumAppenders.MoveNext() ); - CountingAppender aHat = (CountingAppender) enumAppenders.Current; - Assert.AreEqual(a1, aHat); + Assert.IsTrue(enumAppenders.MoveNext()); + CountingAppender aHat = (CountingAppender)enumAppenders.Current; + Assert.AreEqual(a1, aHat); } /// <summary> /// Add an appender X, Y, remove X and check if Y is the only /// remaining appender. /// </summary> - [Test] public void TestAppender2() + [Test] + public void TestAppender2() { CountingAppender a1 = new CountingAppender(); - a1.Name = "testAppender2.1"; + a1.Name = "testAppender2.1"; CountingAppender a2 = new CountingAppender(); - a2.Name = "testAppender2.2"; - - log = LogManager.GetLogger("test").Logger as Logger; + a2.Name = "testAppender2.2"; + + log = (Logger)LogManager.GetLogger("test").Logger; log.AddAppender(a1); - log.AddAppender(a2); + log.AddAppender(a2); CountingAppender aHat = (CountingAppender)log.GetAppender(a1.Name); - Assert.AreEqual(a1, aHat); + Assert.AreEqual(a1, aHat); aHat = (CountingAppender)log.GetAppender(a2.Name); - Assert.AreEqual(a2, aHat); + Assert.AreEqual(a2, aHat); log.RemoveAppender("testAppender2.1"); IEnumerator enumAppenders = ((IEnumerable)log.Appenders).GetEnumerator(); - Assert.IsTrue( enumAppenders.MoveNext() ); - aHat = (CountingAppender) enumAppenders.Current; - Assert.AreEqual(a2, aHat); + Assert.IsTrue(enumAppenders.MoveNext()); + aHat = (CountingAppender)enumAppenders.Current; + Assert.AreEqual(a2, aHat); Assert.IsTrue(!enumAppenders.MoveNext()); aHat = (CountingAppender)log.GetAppender(a2.Name); - Assert.AreEqual(a2, aHat); + Assert.AreEqual(a2, aHat); } /// <summary> /// Test if logger a.b inherits its appender from a. /// </summary> - [Test] public void TestAdditivity1() + [Test] + public void TestAdditivity1() { - Logger a = LogManager.GetLogger("a").Logger as Logger; - Logger ab = LogManager.GetLogger("a.b").Logger as Logger; + Logger a = (Logger)LogManager.GetLogger("a").Logger; + Logger ab = (Logger)LogManager.GetLogger("a.b").Logger; CountingAppender ca = new CountingAppender(); + a.AddAppender(ca); a.Repository.Configured = true; - + Assert.AreEqual(ca.Counter, 0); - ab.Log(Level.Debug, MSG, null); Assert.AreEqual(ca.Counter, 1); - ab.Log(Level.Info, MSG, null); Assert.AreEqual(ca.Counter, 2); - ab.Log(Level.Warn, MSG, null); Assert.AreEqual(ca.Counter, 3); - ab.Log(Level.Error, MSG, null); Assert.AreEqual(ca.Counter, 4); + ab.Log(Level.Debug, MSG, null); + Assert.AreEqual(ca.Counter, 1); + ab.Log(Level.Info, MSG, null); + Assert.AreEqual(ca.Counter, 2); + ab.Log(Level.Warn, MSG, null); + Assert.AreEqual(ca.Counter, 3); + ab.Log(Level.Error, MSG, null); + Assert.AreEqual(ca.Counter, 4); } /// <summary> /// Test multiple additivity. /// </summary> - [Test] public void TestAdditivity2() + [Test] + public void TestAdditivity2() { - - Logger a = LogManager.GetLogger("a").Logger as Logger; - Logger ab = LogManager.GetLogger("a.b").Logger as Logger; - Logger abc = LogManager.GetLogger("a.b.c").Logger as Logger; - Logger x = LogManager.GetLogger("x").Logger as Logger; + Logger a = (Logger)LogManager.GetLogger("a").Logger; + Logger ab = (Logger)LogManager.GetLogger("a.b").Logger; + Logger abc = (Logger)LogManager.GetLogger("a.b.c").Logger; + Logger x = (Logger)LogManager.GetLogger("x").Logger; CountingAppender ca1 = new CountingAppender(); CountingAppender ca2 = new CountingAppender(); @@ -145,31 +155,32 @@ abc.AddAppender(ca2); a.Repository.Configured = true; - Assert.AreEqual(ca1.Counter, 0); - Assert.AreEqual(ca2.Counter, 0); - - ab.Log(Level.Debug, MSG, null); - Assert.AreEqual(ca1.Counter, 1); - Assert.AreEqual(ca2.Counter, 0); + Assert.AreEqual(ca1.Counter, 0); + Assert.AreEqual(ca2.Counter, 0); + + ab.Log(Level.Debug, MSG, null); + Assert.AreEqual(ca1.Counter, 1); + Assert.AreEqual(ca2.Counter, 0); abc.Log(Level.Debug, MSG, null); - Assert.AreEqual(ca1.Counter, 2); - Assert.AreEqual(ca2.Counter, 1); + Assert.AreEqual(ca1.Counter, 2); + Assert.AreEqual(ca2.Counter, 1); x.Log(Level.Debug, MSG, null); - Assert.AreEqual(ca1.Counter, 2); - Assert.AreEqual(ca2.Counter, 1); + Assert.AreEqual(ca1.Counter, 2); + Assert.AreEqual(ca2.Counter, 1); } /// <summary> /// Test additivity flag. /// </summary> - [Test] public void TestAdditivity3() + [Test] + public void TestAdditivity3() { - Logger root = ((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Root; - Logger a = LogManager.GetLogger("a").Logger as Logger; - Logger ab = LogManager.GetLogger("a.b").Logger as Logger; - Logger abc = LogManager.GetLogger("a.b.c").Logger as Logger; + Logger root = ((Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Root; + Logger a = (Logger)LogManager.GetLogger("a").Logger; + Logger ab = (Logger)LogManager.GetLogger("a.b").Logger; + Logger abc = (Logger)LogManager.GetLogger("a.b.c").Logger; CountingAppender caRoot = new CountingAppender(); CountingAppender caA = new CountingAppender(); @@ -180,94 +191,116 @@ abc.AddAppender(caABC); a.Repository.Configured = true; - Assert.AreEqual(caRoot.Counter, 0); - Assert.AreEqual(caA.Counter, 0); - Assert.AreEqual(caABC.Counter, 0); - + Assert.AreEqual(caRoot.Counter, 0); + Assert.AreEqual(caA.Counter, 0); + Assert.AreEqual(caABC.Counter, 0); + ab.Additivity = false; - a.Log(Level.Debug, MSG, null); - Assert.AreEqual(caRoot.Counter, 1); - Assert.AreEqual(caA.Counter, 1); - Assert.AreEqual(caABC.Counter, 0); - - ab.Log(Level.Debug, MSG, null); - Assert.AreEqual(caRoot.Counter, 1); - Assert.AreEqual(caA.Counter, 1); - Assert.AreEqual(caABC.Counter, 0); - - abc.Log(Level.Debug, MSG, null); - Assert.AreEqual(caRoot.Counter, 1); - Assert.AreEqual(caA.Counter, 1); - Assert.AreEqual(caABC.Counter, 1); + a.Log(Level.Debug, MSG, null); + Assert.AreEqual(caRoot.Counter, 1); + Assert.AreEqual(caA.Counter, 1); + Assert.AreEqual(caABC.Counter, 0); + + ab.Log(Level.Debug, MSG, null); + Assert.AreEqual(caRoot.Counter, 1); + Assert.AreEqual(caA.Counter, 1); + Assert.AreEqual(caABC.Counter, 0); + + abc.Log(Level.Debug, MSG, null); + Assert.AreEqual(caRoot.Counter, 1); + Assert.AreEqual(caA.Counter, 1); + Assert.AreEqual(caABC.Counter, 1); } /// <summary> /// Test the ability to disable a level of message /// </summary> - [Test] public void TestDisable1() + [Test] + public void TestDisable1() { CountingAppender caRoot = new CountingAppender(); - Logger root = ((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Root; + Logger root = ((Repository.Hierarchy.Hierarchy)LogManager.GetRepository()).Root; root.AddAppender(caRoot); - log4net.Repository.Hierarchy.Hierarchy h = ((log4net.Repository.Hierarchy.Hierarchy)LogManager.GetRepository()); + Repository.Hierarchy.Hierarchy h = ((Repository.Hierarchy.Hierarchy)LogManager.GetRepository()); h.Threshold = Level.Info; h.Configured = true; - Assert.AreEqual(caRoot.Counter, 0); + Assert.AreEqual(caRoot.Counter, 0); - root.Log(Level.Debug, MSG, null); Assert.AreEqual(caRoot.Counter, 0); - root.Log(Level.Info, MSG, null); Assert.AreEqual(caRoot.Counter, 1); - root.Log(Level.Warn, MSG, null); Assert.AreEqual(caRoot.Counter, 2); - root.Log(Level.Warn, MSG, null); Assert.AreEqual(caRoot.Counter, 3); + root.Log(Level.Debug, MSG, null); + Assert.AreEqual(caRoot.Counter, 0); + root.Log(Level.Info, MSG, null); + Assert.AreEqual(caRoot.Counter, 1); + root.Log(Level.Warn, MSG, null); + Assert.AreEqual(caRoot.Counter, 2); + root.Log(Level.Warn, MSG, null); + Assert.AreEqual(caRoot.Counter, 3); h.Threshold = Level.Warn; - root.Log(Level.Debug, MSG, null); Assert.AreEqual(caRoot.Counter, 3); - root.Log(Level.Info, MSG, null); Assert.AreEqual(caRoot.Counter, 3); - root.Log(Level.Warn, MSG, null); Assert.AreEqual(caRoot.Counter, 4); - root.Log(Level.Error, MSG, null); Assert.AreEqual(caRoot.Counter, 5); - root.Log(Level.Error, MSG, null); Assert.AreEqual(caRoot.Counter, 6); + root.Log(Level.Debug, MSG, null); + Assert.AreEqual(caRoot.Counter, 3); + root.Log(Level.Info, MSG, null); + Assert.AreEqual(caRoot.Counter, 3); + root.Log(Level.Warn, MSG, null); + Assert.AreEqual(caRoot.Counter, 4); + root.Log(Level.Error, MSG, null); + Assert.AreEqual(caRoot.Counter, 5); + root.Log(Level.Error, MSG, null); + Assert.AreEqual(caRoot.Counter, 6); h.Threshold = Level.Off; - root.Log(Level.Debug, MSG, null); Assert.AreEqual(caRoot.Counter, 6); - root.Log(Level.Info, MSG, null); Assert.AreEqual(caRoot.Counter, 6); - root.Log(Level.Warn, MSG, null); Assert.AreEqual(caRoot.Counter, 6); - root.Log(Level.Error, MSG, null); Assert.AreEqual(caRoot.Counter, 6); - root.Log(Level.Fatal, MSG, null); Assert.AreEqual(caRoot.Counter, 6); - root.Log(Level.Fatal, MSG, null); Assert.AreEqual(caRoot.Counter, 6); + root.Log(Level.Debug, MSG, null); + Assert.AreEqual(caRoot.Counter, 6); + root.Log(Level.Info, MSG, null); + Assert.AreEqual(caRoot.Counter, 6); + root.Log(Level.Warn, MSG, null); + Assert.AreEqual(caRoot.Counter, 6); + root.Log(Level.Error, MSG, null); + Assert.AreEqual(caRoot.Counter, 6); + root.Log(Level.Fatal, MSG, null); + Assert.AreEqual(caRoot.Counter, 6); + root.Log(Level.Fatal, MSG, null); + Assert.AreEqual(caRoot.Counter, 6); } /// <summary> /// Tests the Exists method of the Logger class /// </summary> - [Test] public void TestExists() + [Test] + public void TestExists() { object a = LogManager.GetLogger("a"); object a_b = LogManager.GetLogger("a.b"); object a_b_c = LogManager.GetLogger("a.b.c"); - + object t; - t = LogManager.Exists("xx"); Assert.IsNull(t); - t = LogManager.Exists("a"); Assert.AreSame(a, t); - t = LogManager.Exists("a.b"); Assert.AreSame(a_b, t); - t = LogManager.Exists("a.b.c"); Assert.AreSame(a_b_c, t); + t = LogManager.Exists("xx"); + Assert.IsNull(t); + t = LogManager.Exists("a"); + Assert.AreSame(a, t); + t = LogManager.Exists("a.b"); + Assert.AreSame(a_b, t); + t = LogManager.Exists("a.b.c"); + Assert.AreSame(a_b_c, t); } /// <summary> /// Tests the chained level for a hierarchy /// </summary> - [Test] public void TestHierarchy1() + [Test] + public void TestHierarchy1() { - log4net.Repository.Hierarchy.Hierarchy h = new log4net.Repository.Hierarchy.Hierarchy(); + Repository.Hierarchy.Hierarchy h = new Repository.Hierarchy.Hierarchy(); h.Root.Level = Level.Error; - Logger a0 = h.GetLogger("a") as Logger; + Logger a0 = (Logger)h.GetLogger("a"); Assert.AreEqual("a", a0.Name); Assert.IsNull(a0.Level); Assert.AreSame(Level.Error, a0.EffectiveLevel); - Logger a1 = h.GetLogger("a") as Logger; + Logger a1 = (Logger)h.GetLogger("a"); Assert.AreSame(a0, a1); } } Modified: logging/log4net/trunk/tests/src/Layout/PatternLayoutTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Layout/PatternLayoutTest.cs?view=diff&rev=511537&r1=511536&r2=511537 ============================================================================== --- logging/log4net/trunk/tests/src/Layout/PatternLayoutTest.cs (original) +++ logging/log4net/trunk/tests/src/Layout/PatternLayoutTest.cs Sun Feb 25 08:14:29 2007 @@ -21,11 +21,13 @@ using System.IO; using log4net.Config; -using log4net.Layout; using log4net.Core; +using log4net.Layout; +using log4net.Layout.Pattern; using log4net.Repository; using log4net.Tests.Appender; using log4net.Util; + using NUnit.Framework; namespace log4net.Tests.Layout @@ -36,9 +38,11 @@ /// <remarks> /// Used for internal unit testing the <see cref="PatternLayoutTest"/> class. /// </remarks> - [TestFixture] public class PatternLayoutTest + [TestFixture] + public class PatternLayoutTest { - [Test] public void TestThreadPropertiesPattern() + [Test] + public void TestThreadPropertiesPattern() { StringAppender stringAppender = new StringAppender(); stringAppender.Layout = new PatternLayout("%property{prop1}"); @@ -65,7 +69,8 @@ stringAppender.Reset(); } - [Test] public void TestGlobalPropertiesPattern() + [Test] + public void TestGlobalPropertiesPattern() { StringAppender stringAppender = new StringAppender(); stringAppender.Layout = new PatternLayout("%property{prop1}"); @@ -92,7 +97,8 @@ stringAppender.Reset(); } - [Test] public void TestAddingCustomPattern() + [Test] + public void TestAddingCustomPattern() { StringAppender stringAppender = new StringAppender(); PatternLayout layout = new PatternLayout(); @@ -110,13 +116,13 @@ log1.Info("TestMessage"); Assert.AreEqual("TestMessage", stringAppender.GetString(), "%TestAddingCustomPattern not registered"); - stringAppender.Reset(); + stringAppender.Reset(); } /// <summary> /// Converter to include event message /// </summary> - private class TestMessagePatternConverter : log4net.Layout.Pattern.PatternLayoutConverter + private class TestMessagePatternConverter : PatternLayoutConverter { /// <summary> /// Convert the pattern to the rendered message @@ -124,13 +130,14 @@ /// <param name="writer"><see cref="TextWriter" /> that will receive the formatted result.</param> /// <param name="loggingEvent">the event being logged</param> /// <returns>the relevant location information</returns> - override protected void Convert(System.IO.TextWriter writer, LoggingEvent loggingEvent) + protected override void Convert(TextWriter writer, LoggingEvent loggingEvent) { loggingEvent.WriteRenderedMessage(writer); } } - [Test] public void TestExceptionPattern() + [Test] + public void TestExceptionPattern() { StringAppender stringAppender = new StringAppender(); PatternLayout layout = new PatternLayout("%exception{stacktrace}"); @@ -143,10 +150,10 @@ Exception exception = new Exception("Oh no!"); log1.Info("TestMessage", exception); - + Assert.AreEqual(SystemInfo.NullText, stringAppender.GetString()); - stringAppender.Reset(); + stringAppender.Reset(); } } -} +} \ No newline at end of file Modified: logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs?view=diff&rev=511537&r1=511536&r2=511537 ============================================================================== --- logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs (original) +++ logging/log4net/trunk/tests/src/Layout/XmlLayoutTest.cs Sun Feb 25 08:14:29 2007 @@ -22,159 +22,167 @@ using System.Xml; using log4net.Config; -using log4net.Util; -using log4net.Layout; using log4net.Core; +using log4net.Layout; using log4net.Repository; using log4net.Tests.Appender; +using log4net.Util; using NUnit.Framework; namespace log4net.Tests.Layout { - [TestFixture] public class XmlLayoutTest + [TestFixture] + public class XmlLayoutTest { /// <summary> /// Build a basic <see cref="LoggingEventData"/> object with some default values. /// </summary> /// <returns>A useful LoggingEventData object</returns> - private LoggingEventData createBaseEvent() + private LoggingEventData CreateBaseEvent() { - LoggingEventData ed=new LoggingEventData(); - ed.Domain="Tests"; - ed.ExceptionString=""; - ed.Identity="TestRunner"; - ed.Level=Level.Info; - ed.LocationInfo=new LocationInfo(this.GetType()); - ed.LoggerName="TestLogger"; - ed.Message="Test message"; - ed.ThreadName="TestThread"; - ed.TimeStamp=DateTime.Today; - ed.UserName="TestRunner"; - ed.Properties=new PropertiesDictionary(); + LoggingEventData ed = new LoggingEventData(); + ed.Domain = "Tests"; + ed.ExceptionString = ""; + ed.Identity = "TestRunner"; + ed.Level = Level.Info; + ed.LocationInfo = new LocationInfo(GetType()); + ed.LoggerName = "TestLogger"; + ed.Message = "Test message"; + ed.ThreadName = "TestThread"; + ed.TimeStamp = DateTime.Today; + ed.UserName = "TestRunner"; + ed.Properties = new PropertiesDictionary(); return ed; } - private string createEventNode(string message) + private static string CreateEventNode(string message) { - return String.Format("<event logger=\"TestLogger\" timestamp=\"{0}\" level=\"INFO\" thread=\"TestThread\" domain=\"Tests\" identity=\"TestRunner\" username=\"TestRunner\"><message>{1}</message></event>\r\n", -#if NET_2_0 - XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local), + return String.Format("<event logger=\"TestLogger\" timestamp=\"{0}\" level=\"INFO\" thread=\"TestThread\" domain=\"Tests\" identity=\"TestRunner\" username=\"TestRunner\"><message>{1}</message></event>\r\n", +#if NET_2_0 || MONO_2_0 + XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local), #else - XmlConvert.ToString(DateTime.Today), + XmlConvert.ToString(DateTime.Today), #endif - message); + message); } - private string createEventNode(string key, string value) + private static string CreateEventNode(string key, string value) { - return String.Format("<event logger=\"TestLogger\" timestamp=\"{0:s}\" level=\"INFO\" thread=\"TestThread\" domain=\"Tests\" identity=\"TestRunner\" username=\"TestRunner\"><message>Test message</message><properties><data name=\"{1}\" value=\"{2}\" /></properties></event>\r\n", -#if NET_2_0 - XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local), + return String.Format("<event logger=\"TestLogger\" timestamp=\"{0}\" level=\"INFO\" thread=\"TestThread\" domain=\"Tests\" identity=\"TestRunner\" username=\"TestRunner\"><message>Test message</message><properties><data name=\"{1}\" value=\"{2}\" /></properties></event>\r\n", +#if NET_2_0 || MONO_2_0 + XmlConvert.ToString(DateTime.Today, XmlDateTimeSerializationMode.Local), #else - XmlConvert.ToString(DateTime.Today), + XmlConvert.ToString(DateTime.Today), #endif - key, - value); + key, + value); } - [Test] public void TestBasicEventLogging() + [Test] + public void TestBasicEventLogging() { - TextWriter writer=new StringWriter(); - XmlLayout layout=new XmlLayout(); - LoggingEventData evt=createBaseEvent(); + TextWriter writer = new StringWriter(); + XmlLayout layout = new XmlLayout(); + LoggingEventData evt = CreateBaseEvent(); - layout.Format(writer,new LoggingEvent(evt)); + layout.Format(writer, new LoggingEvent(evt)); - string expected = createEventNode("Test message"); - - Assert.AreEqual (expected, writer.ToString()); + string expected = CreateEventNode("Test message"); + + Assert.AreEqual(expected, writer.ToString()); } - [Test] public void TestIllegalCharacterMasking() + [Test] + public void TestIllegalCharacterMasking() { - TextWriter writer=new StringWriter(); - XmlLayout layout=new XmlLayout(); - LoggingEventData evt=createBaseEvent(); + TextWriter writer = new StringWriter(); + XmlLayout layout = new XmlLayout(); + LoggingEventData evt = CreateBaseEvent(); + + evt.Message = "This is a masked char->\uFFFF"; - evt.Message="This is a masked char->\uFFFF"; + layout.Format(writer, new LoggingEvent(evt)); - layout.Format(writer,new LoggingEvent(evt)); + string expected = CreateEventNode("This is a masked char->?"); - string expected = createEventNode("This is a masked char->?"); - - Assert.AreEqual (expected, writer.ToString()); + Assert.AreEqual(expected, writer.ToString()); } - [Test] public void TestCDATAEscaping1() + [Test] + public void TestCDATAEscaping1() { - TextWriter writer=new StringWriter(); - XmlLayout layout=new XmlLayout(); - LoggingEventData evt=createBaseEvent(); + TextWriter writer = new StringWriter(); + XmlLayout layout = new XmlLayout(); + LoggingEventData evt = CreateBaseEvent(); //The &'s trigger the use of a cdata block - evt.Message="&&&&&&&Escape this ]]>. End here."; + evt.Message = "&&&&&&&Escape this ]]>. End here."; - layout.Format(writer,new LoggingEvent(evt)); + layout.Format(writer, new LoggingEvent(evt)); - string expected = createEventNode("<![CDATA[&&&&&&&Escape this ]]>]]<![CDATA[>. End here.]]>"); - - Assert.AreEqual (expected, writer.ToString()); + string expected = CreateEventNode("<![CDATA[&&&&&&&Escape this ]]>]]<![CDATA[>. End here.]]>"); + + Assert.AreEqual(expected, writer.ToString()); } - [Test] public void TestCDATAEscaping2() + [Test] + public void TestCDATAEscaping2() { - TextWriter writer=new StringWriter(); - XmlLayout layout=new XmlLayout(); - LoggingEventData evt=createBaseEvent(); + TextWriter writer = new StringWriter(); + XmlLayout layout = new XmlLayout(); + LoggingEventData evt = CreateBaseEvent(); //The &'s trigger the use of a cdata block - evt.Message="&&&&&&&Escape the end ]]>"; + evt.Message = "&&&&&&&Escape the end ]]>"; + + layout.Format(writer, new LoggingEvent(evt)); - layout.Format(writer,new LoggingEvent(evt)); + string expected = CreateEventNode("<![CDATA[&&&&&&&Escape the end ]]>]]>"); - string expected = createEventNode("<![CDATA[&&&&&&&Escape the end ]]>]]>"); - - Assert.AreEqual (expected, writer.ToString()); + Assert.AreEqual(expected, writer.ToString()); } - [Test] public void TestCDATAEscaping3() + [Test] + public void TestCDATAEscaping3() { - TextWriter writer=new StringWriter(); - XmlLayout layout=new XmlLayout(); - LoggingEventData evt=createBaseEvent(); + TextWriter writer = new StringWriter(); + XmlLayout layout = new XmlLayout(); + LoggingEventData evt = CreateBaseEvent(); //The &'s trigger the use of a cdata block - evt.Message="]]>&&&&&&&Escape the begining"; + evt.Message = "]]>&&&&&&&Escape the begining"; - layout.Format(writer,new LoggingEvent(evt)); + layout.Format(writer, new LoggingEvent(evt)); - string expected = createEventNode("<![CDATA[]]>]]<![CDATA[>&&&&&&&Escape the begining]]>"); - - Assert.AreEqual (expected, writer.ToString()); + string expected = CreateEventNode("<![CDATA[]]>]]<![CDATA[>&&&&&&&Escape the begining]]>"); + + Assert.AreEqual(expected, writer.ToString()); } - [Test] public void TestBase64EventLogging() + [Test] + public void TestBase64EventLogging() { - TextWriter writer=new StringWriter(); - XmlLayout layout=new XmlLayout(); - LoggingEventData evt=createBaseEvent(); + TextWriter writer = new StringWriter(); + XmlLayout layout = new XmlLayout(); + LoggingEventData evt = CreateBaseEvent(); + + layout.Base64EncodeMessage = true; + layout.Format(writer, new LoggingEvent(evt)); - layout.Base64EncodeMessage=true; - layout.Format(writer,new LoggingEvent(evt)); + string expected = CreateEventNode("VGVzdCBtZXNzYWdl"); - string expected = createEventNode("VGVzdCBtZXNzYWdl"); - - Assert.AreEqual (expected, writer.ToString()); + Assert.AreEqual(expected, writer.ToString()); } - [Test] public void TestPropertyEventLogging() + [Test] + public void TestPropertyEventLogging() { - LoggingEventData evt=createBaseEvent(); - evt.Properties["Property1"]="prop1"; + LoggingEventData evt = CreateBaseEvent(); + evt.Properties["Property1"] = "prop1"; - XmlLayout layout=new XmlLayout(); + XmlLayout layout = new XmlLayout(); StringAppender stringAppender = new StringAppender(); stringAppender.Layout = layout; @@ -184,18 +192,19 @@ log1.Logger.Log(new LoggingEvent(evt)); - string expected = createEventNode("Property1", "prop1"); - - Assert.AreEqual (expected, stringAppender.GetString()); + string expected = CreateEventNode("Property1", "prop1"); + + Assert.AreEqual(expected, stringAppender.GetString()); } - [Test] public void TestBase64PropertyEventLogging() + [Test] + public void TestBase64PropertyEventLogging() { - LoggingEventData evt=createBaseEvent(); - evt.Properties["Property1"]="prop1"; + LoggingEventData evt = CreateBaseEvent(); + evt.Properties["Property1"] = "prop1"; - XmlLayout layout=new XmlLayout(); - layout.Base64EncodeProperties=true; + XmlLayout layout = new XmlLayout(); + layout.Base64EncodeProperties = true; StringAppender stringAppender = new StringAppender(); stringAppender.Layout = layout; @@ -205,17 +214,18 @@ log1.Logger.Log(new LoggingEvent(evt)); - string expected = createEventNode("Property1", "cHJvcDE="); - - Assert.AreEqual (expected, stringAppender.GetString()); + string expected = CreateEventNode("Property1", "cHJvcDE="); + + Assert.AreEqual(expected, stringAppender.GetString()); } - [Test] public void TestPropertyCharacterEscaping() + [Test] + public void TestPropertyCharacterEscaping() { - LoggingEventData evt=createBaseEvent(); - evt.Properties["Property1"]="prop1 \"quoted\""; + LoggingEventData evt = CreateBaseEvent(); + evt.Properties["Property1"] = "prop1 \"quoted\""; - XmlLayout layout=new XmlLayout(); + XmlLayout layout = new XmlLayout(); StringAppender stringAppender = new StringAppender(); stringAppender.Layout = layout; @@ -225,17 +235,18 @@ log1.Logger.Log(new LoggingEvent(evt)); - string expected = createEventNode("Property1", "prop1 "quoted""); - - Assert.AreEqual (expected, stringAppender.GetString()); + string expected = CreateEventNode("Property1", "prop1 "quoted""); + + Assert.AreEqual(expected, stringAppender.GetString()); } - [Test] public void TestPropertyIllegalCharacterMasking() + [Test] + public void TestPropertyIllegalCharacterMasking() { - LoggingEventData evt=createBaseEvent(); - evt.Properties["Property1"]="mask this ->\uFFFF"; + LoggingEventData evt = CreateBaseEvent(); + evt.Properties["Property1"] = "mask this ->\uFFFF"; - XmlLayout layout=new XmlLayout(); + XmlLayout layout = new XmlLayout(); StringAppender stringAppender = new StringAppender(); stringAppender.Layout = layout; @@ -245,17 +256,18 @@ log1.Logger.Log(new LoggingEvent(evt)); - string expected = createEventNode("Property1", "mask this ->?"); - - Assert.AreEqual (expected, stringAppender.GetString()); + string expected = CreateEventNode("Property1", "mask this ->?"); + + Assert.AreEqual(expected, stringAppender.GetString()); } - [Test] public void TestPropertyIllegalCharacterMaskingInName() + [Test] + public void TestPropertyIllegalCharacterMaskingInName() { - LoggingEventData evt=createBaseEvent(); - evt.Properties["Property\uFFFF"]="mask this ->\uFFFF"; + LoggingEventData evt = CreateBaseEvent(); + evt.Properties["Property\uFFFF"] = "mask this ->\uFFFF"; - XmlLayout layout=new XmlLayout(); + XmlLayout layout = new XmlLayout(); StringAppender stringAppender = new StringAppender(); stringAppender.Layout = layout; @@ -265,9 +277,9 @@ log1.Logger.Log(new LoggingEvent(evt)); - string expected = createEventNode("Property?", "mask this ->?"); - - Assert.AreEqual (expected, stringAppender.GetString()); + string expected = CreateEventNode("Property?", "mask this ->?"); + + Assert.AreEqual(expected, stringAppender.GetString()); } } } Modified: logging/log4net/trunk/tests/src/Util/CyclicBufferTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Util/CyclicBufferTest.cs?view=diff&rev=511537&r1=511536&r2=511537 ============================================================================== --- logging/log4net/trunk/tests/src/Util/CyclicBufferTest.cs (original) +++ logging/log4net/trunk/tests/src/Util/CyclicBufferTest.cs Sun Feb 25 08:14:29 2007 @@ -19,8 +19,8 @@ using System; -using log4net.Util; using log4net.Core; +using log4net.Util; using NUnit.Framework; @@ -32,15 +32,18 @@ /// <remarks> /// Used for internal unit testing the <see cref="PropertiesDictionary"/> class. /// </remarks> - [TestFixture] public class CyclicBufferTest + [TestFixture] + public class CyclicBufferTest { [Test, ExpectedException(typeof(ArgumentOutOfRangeException))] public void TestConstructorSize0() { CyclicBuffer cb = new CyclicBuffer(0); + Assert.IsNotNull(cb); } - [Test] public void TestSize1() + [Test] + public void TestSize1() { CyclicBuffer cb = new CyclicBuffer(1); @@ -71,7 +74,8 @@ Assert.AreEqual(1, cb.MaxSize, "Buffer should really really still have max size 1"); } - [Test] public void TestSize2() + [Test] + public void TestSize2() { CyclicBuffer cb = new CyclicBuffer(2); @@ -82,8 +86,8 @@ LoggingEvent event2 = new LoggingEvent(null, null, null, null, null, null); LoggingEvent event3 = new LoggingEvent(null, null, null, null, null, null); - LoggingEvent discardedEvent = null; - + LoggingEvent discardedEvent; + discardedEvent = cb.Append(event1); Assert.IsNull(discardedEvent, "No event should be discarded after append 1"); discardedEvent = cb.Append(event2); @@ -103,4 +107,4 @@ Assert.AreEqual(2, cb.MaxSize, "Buffer should really really still have max size 2"); } } -} +} \ No newline at end of file Modified: logging/log4net/trunk/tests/src/Util/PropertiesDictionaryTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Util/PropertiesDictionaryTest.cs?view=diff&rev=511537&r1=511536&r2=511537 ============================================================================== --- logging/log4net/trunk/tests/src/Util/PropertiesDictionaryTest.cs (original) +++ logging/log4net/trunk/tests/src/Util/PropertiesDictionaryTest.cs Sun Feb 25 08:14:29 2007 @@ -32,13 +32,15 @@ /// <remarks> /// Used for internal unit testing the <see cref="PropertiesDictionary"/> class. /// </remarks> - [TestFixture] public class PropertiesDictionaryTest + [TestFixture] + public class PropertiesDictionaryTest { - [Test] public void TestSerialization() + [Test] + public void TestSerialization() { PropertiesDictionary pd = new PropertiesDictionary(); - for(int i=0; i<10; i++) + for(int i = 0; i < 10; i++) { pd[i.ToString()] = i; } @@ -61,6 +63,5 @@ Assert.AreEqual(pd[key], pd2[key], "Check Value Persisted for key [{0}]", key); } } - } -} +} \ No newline at end of file Modified: logging/log4net/trunk/tests/src/Util/RandomStringPatternConverterTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Util/RandomStringPatternConverterTest.cs?view=diff&rev=511537&r1=511536&r2=511537 ============================================================================== --- logging/log4net/trunk/tests/src/Util/RandomStringPatternConverterTest.cs (original) +++ logging/log4net/trunk/tests/src/Util/RandomStringPatternConverterTest.cs Sun Feb 25 08:14:29 2007 @@ -29,9 +29,11 @@ /// <remarks> /// Used for internal unit testing the <see cref="RandomStringPatternConverter"/> class. /// </remarks> - [TestFixture] public class RandomStringPatternConverterTest + [TestFixture] + public class RandomStringPatternConverterTest { - [Test] public void TestConvert() + [Test] + public void TestConvert() { RandomStringPatternConverter converter = new RandomStringPatternConverter(); @@ -59,9 +61,9 @@ Assert.IsTrue(string1 != string2, "strings should be different"); } - class RandomStringPatternConverter + private class RandomStringPatternConverter { - object target = null; + private object target = null; public RandomStringPatternConverter() { @@ -74,7 +76,7 @@ set { Utils.SetProperty(target, "Option", value); } } - public void Convert(TextWriter writer, object state) + public void Convert(TextWriter writer, object state) { Utils.InvokeMethod(target, "Convert", writer, state); } @@ -85,4 +87,4 @@ } } } -} +} \ No newline at end of file Modified: logging/log4net/trunk/tests/src/Util/SystemInfoTest.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Util/SystemInfoTest.cs?view=diff&rev=511537&r1=511536&r2=511537 ============================================================================== --- logging/log4net/trunk/tests/src/Util/SystemInfoTest.cs (original) +++ logging/log4net/trunk/tests/src/Util/SystemInfoTest.cs Sun Feb 25 08:14:29 2007 @@ -31,12 +31,14 @@ /// <remarks> /// Used for internal unit testing the <see cref="SystemInfo"/> class. /// </remarks> - [TestFixture] public class SystemInfoTest + [TestFixture] + public class SystemInfoTest { - [Test] public void TestGetTypeFromStringFullyQualified() + [Test] + public void TestGetTypeFromStringFullyQualified() { - Type t = null; - + Type t; + t = SystemInfo.GetTypeFromString("log4net.Tests.Util.SystemInfoTest,log4net.Tests", false, false); Assert.AreSame(typeof(SystemInfoTest), t, "Test explicit case sensitive type load"); @@ -47,10 +49,11 @@ Assert.AreSame(typeof(SystemInfoTest), t, "Test explicit case in-sensitive type load lower"); } - [Test] public void TestGetTypeFromStringRelative() + [Test] + public void TestGetTypeFromStringRelative() { - Type t = null; - + Type t; + t = SystemInfo.GetTypeFromString("log4net.Tests.Util.SystemInfoTest", false, false); Assert.AreSame(typeof(SystemInfoTest), t, "Test explicit case sensitive type load"); @@ -61,10 +64,11 @@ Assert.AreSame(typeof(SystemInfoTest), t, "Test explicit case in-sensitive type load lower"); } - [Test] public void TestGetTypeFromStringSearch() + [Test] + public void TestGetTypeFromStringSearch() { - Type t = null; - + Type t; + t = SystemInfo.GetTypeFromString("log4net.Util.SystemInfo", false, false); Assert.AreSame(typeof(SystemInfo), t, "Test explicit case sensitive type load"); @@ -75,25 +79,26 @@ Assert.AreSame(typeof(SystemInfo), t, "Test explicit case in-sensitive type load lower"); } - [Test, ExpectedException(typeof(TypeLoadException))] public void TestGetTypeFromStringFails1() + [Test, ExpectedException(typeof(TypeLoadException))] + public void TestGetTypeFromStringFails1() { - Type t = null; - + Type t; + t = SystemInfo.GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST,LOG4NET.TESTS", false, false); Assert.AreSame(null, t, "Test explicit case sensitive fails type load"); t = SystemInfo.GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST,LOG4NET.TESTS", true, false); } - [Test, ExpectedException(typeof(TypeLoadException))] public void TestGetTypeFromStringFails2() + [Test, ExpectedException(typeof(TypeLoadException))] + public void TestGetTypeFromStringFails2() { - Type t = null; - + Type t; + t = SystemInfo.GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST", false, false); Assert.AreSame(null, t, "Test explicit case sensitive fails type load"); t = SystemInfo.GetTypeFromString("LOG4NET.TESTS.UTIL.SYSTEMINFOTEST", true, false); } - } -} +} \ No newline at end of file Modified: logging/log4net/trunk/tests/src/Utils.cs URL: http://svn.apache.org/viewvc/logging/log4net/trunk/tests/src/Utils.cs?view=diff&rev=511537&r1=511536&r2=511537 ============================================================================== --- logging/log4net/trunk/tests/src/Utils.cs (original) +++ logging/log4net/trunk/tests/src/Utils.cs Sun Feb 25 08:14:29 2007 @@ -38,54 +38,54 @@ public static object CreateInstance(Type targetType) { - return targetType.GetConstructor(BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Instance, null, new Type[0], null).Invoke(null); + return targetType.GetConstructor(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, null, new Type[0], null).Invoke(null); } public static object InvokeMethod(object target, string name, params object[] args) { - return target.GetType().GetMethod(name, BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Static|BindingFlags.Instance, null, GetTypesArray(args), null).Invoke(target, args); + return target.GetType().GetMethod(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance, null, GetTypesArray(args), null).Invoke(target, args); } public static object InvokeMethod(Type target, string name, params object[] args) { - return target.GetMethod(name, BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Static, null, GetTypesArray(args), null).Invoke(null, args); + return target.GetMethod(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static, null, GetTypesArray(args), null).Invoke(null, args); } public static object GetField(object target, string name) { - return target.GetType().GetField(name, BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Static|BindingFlags.Instance).GetValue(target); + return target.GetType().GetField(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance).GetValue(target); } public static void SetField(object target, string name, object val) { - target.GetType().GetField(name, BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Static|BindingFlags.Instance).SetValue(target, val); + target.GetType().GetField(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance).SetValue(target, val); } public static object GetProperty(object target, string name) { - return target.GetType().GetProperty(name, BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Static|BindingFlags.Instance).GetValue(target, null); + return target.GetType().GetProperty(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance).GetValue(target, null); } public static void SetProperty(object target, string name, object val) { - target.GetType().GetProperty(name, BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Static|BindingFlags.Instance).SetValue(target, val, null); + target.GetType().GetProperty(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance).SetValue(target, val, null); } public static object GetProperty(object target, string name, params object[] index) { - return target.GetType().GetProperty(name, BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Static|BindingFlags.Instance).GetValue(target, index); + return target.GetType().GetProperty(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance).GetValue(target, index); } public static void SetProperty(object target, string name, object val, params object[] index) { - target.GetType().GetProperty(name, BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Static|BindingFlags.Instance).SetValue(target, val, index); + target.GetType().GetProperty(name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance).SetValue(target, val, index); } private static Type[] GetTypesArray(object[] args) { Type[] types = new Type[args.Length]; - for(int i=0; i<args.Length; i++) + for(int i = 0; i < args.Length; i++) { if (args[i] == null) { @@ -100,4 +100,4 @@ return types; } } -} +} \ No newline at end of file
