1 files changed, 53 insertions, 0 deletions

diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs
index ced06de..d38d692 100644
--- a/OpenSim/Tests/Common/TestHelpers.cs
+++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -27,6 +27,8 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
+using System.Text;
 using NUnit.Framework;
 using OpenMetaverse;
 
@@ -34,6 +36,38 @@ namespace OpenSim.Tests.Common
 {
     public class TestHelpers
     {
+        private static Stream EnableLoggingConfigStream
+            = new MemoryStream(
+                Encoding.UTF8.GetBytes(
+@"<log4net>
+  <!-- A1 is set to be a ConsoleAppender -->
+  <appender name=""A1"" type=""log4net.Appender.ConsoleAppender"">
+
+    <!-- A1 uses PatternLayout -->
+    <layout type=""log4net.Layout.PatternLayout"">
+    <!-- Print the date in ISO 8601 format -->
+      <!-- <conversionPattern value=""%date [%thread] %-5level %logger %ndc - %message%newline"" /> -->
+      <conversionPattern value=""%date %message%newline"" />
+      </layout>
+  </appender>
+
+  <!-- Set root logger level to DEBUG and its only appender to A1 -->
+  <root>
+    <level value=""DEBUG"" />
+    <appender-ref ref=""A1"" />
+  </root>
+</log4net>"));
+
+        private static Stream DisableLoggingConfigStream
+            = new MemoryStream(
+                Encoding.UTF8.GetBytes(
+//                        "<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/><appender-ref ref=\"A1\"/></root></log4net></configuration>"));
+                    //"<?xml version=\"1.0\" encoding=\"utf-8\" ?><configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>")));
+//                    "<configuration><log4net><root><level value=\"OFF\"/></root></log4net></configuration>"));
+//                    "<configuration><log4net><root></root></log4net></configuration>")));
+//                    "<configuration><log4net><root/></log4net></configuration>"));
+                    "<log4net><root/></log4net>"));
+
         public static bool AssertThisDelegateCausesArgumentException(TestDelegate d)
         {
             try
@@ -58,6 +92,25 @@ namespace OpenSim.Tests.Common
             Console.WriteLine("===> In Test Method : {0} <===", stackTrace.GetFrame(1).GetMethod().Name);
         }
 
+        public static void EnableLogging()
+        {
+            log4net.Config.XmlConfigurator.Configure(EnableLoggingConfigStream);
+        }
+
+        /// <summary>
+        /// Disable logging whilst running the tests.
+        /// </summary>
+        /// <remarks>
+        /// Remember, if a regression test throws an exception before completing this will not be invoked if it's at
+        /// the end of the test.
+        /// TODO: Always invoke this after every test - probably need to make all test cases inherit from a common
+        /// TestCase class where this can be done.
+        /// </remarks>
+        public static void DisableLogging()
+        {
+            log4net.Config.XmlConfigurator.Configure(DisableLoggingConfigStream);
+        }
+
         /// <summary>
         /// Parse tail section into full UUID.
         /// </summary>