From 5bec5bcf714a94129070cf1b6219984496cbd6c2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 27 Jun 2012 00:00:49 +0100
Subject: Automatically disable log4net before each regression test so that
 logging is confined to a single test if it's turned on.

This involves making test classes inherit from a common OpenSimTestCase.
This will be applied to more classes as required.
---
 OpenSim/Tests/Common/OpenSimTestCase.cs | 46 +++++++++++++++++++++++++++++++++
 OpenSim/Tests/Common/TestHelpers.cs     |  3 ++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 OpenSim/Tests/Common/OpenSimTestCase.cs

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/OpenSimTestCase.cs b/OpenSim/Tests/Common/OpenSimTestCase.cs
new file mode 100644
index 0000000..8c40923
--- /dev/null
+++ b/OpenSim/Tests/Common/OpenSimTestCase.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using NUnit.Framework;
+
+namespace OpenSim.Tests.Common
+{
+    [TestFixture]
+    public class OpenSimTestCase
+    {
+        [SetUp]
+        public virtual void SetUp()
+        {
+//            TestHelpers.InMethod();
+            // Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests
+            // to have logging on if it failed with an exception.
+            TestHelpers.DisableLogging();
+        }
+    }
+}
+
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs
index d38d692..30121fe 100644
--- a/OpenSim/Tests/Common/TestHelpers.cs
+++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Tests.Common
   </root>
 </log4net>"));
 
-        private static Stream DisableLoggingConfigStream
+        private static MemoryStream 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>"));
@@ -109,6 +109,7 @@ namespace OpenSim.Tests.Common
         public static void DisableLogging()
         {
             log4net.Config.XmlConfigurator.Configure(DisableLoggingConfigStream);
+            DisableLoggingConfigStream.Position = 0;
         }
 
         /// <summary>
-- 
cgit v1.1