From 8b6557e377f7bac1bdb38f3e6dd22c797417d09c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 14 Aug 2017 16:49:11 -0700
Subject: Let's try giving Common a default constructor instead of the
 workaround

---
 OpenSim/Tests/Permissions/Common.cs                | 4 ++++
 OpenSim/Tests/Permissions/DirectTransferTests.cs   | 7 -------
 OpenSim/Tests/Permissions/IndirectTransferTests.cs | 6 ------
 3 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Permissions/Common.cs b/OpenSim/Tests/Permissions/Common.cs
index 4ecce38..cf4d2bd 100644
--- a/OpenSim/Tests/Permissions/Common.cs
+++ b/OpenSim/Tests/Permissions/Common.cs
@@ -60,6 +60,10 @@ namespace OpenSim.Tests.Permissions
         private TestScene m_Scene;
         private ScenePresence[] m_Avatars = new ScenePresence[3];
 
+        public Common()
+        {
+        }
+
         [SetUp]
         public override void SetUp()
         {
diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
index 0f251db..c68bbdf 100644
--- a/OpenSim/Tests/Permissions/DirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs
@@ -44,13 +44,6 @@ namespace OpenSim.Tests.Permissions
         [SetUp]
         public void SetUp()
         {
-            // In case we're dealing with some older version of nunit
-            if (Common.TheInstance == null)
-            {
-                Common.TheInstance = new Common();
-                Common.TheInstance.SetUp();
-            }
-
             Common.TheInstance.DeleteObjectsFolders();
         }
 
diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
index fb96b8b..66a228a 100644
--- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
@@ -46,12 +46,6 @@ namespace OpenSim.Tests.Permissions
         [SetUp]
         public void SetUp()
         {
-            // In case we're dealing with some older version of nunit
-            if (Common.TheInstance == null)
-            {
-                Common.TheInstance = new Common();
-                Common.TheInstance.SetUp();
-            }
             Common.TheInstance.DeleteObjectsFolders();
         }
 
-- 
cgit v1.1