OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Let's try giving Common a default constructor instead of the workaround" 

This reverts commit 8b6557e377.
0.9.0-post-fixes
Diva Canto 2017-08-14 16:55:50 -07:00
parent 8b6557e377
commit eb837defdf
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Tests/Permissions/Common.cs
View File

@ -60,10 +60,6 @@ namespace OpenSim.Tests.Permissions
private TestScene m_Scene; private TestScene m_Scene;
private ScenePresence[] m_Avatars = new ScenePresence[3]; private ScenePresence[] m_Avatars = new ScenePresence[3];
public Common()
{
}
[SetUp] [SetUp]
public override void SetUp() public override void SetUp()
{ {

7
OpenSim/Tests/Permissions/DirectTransferTests.cs
View File

@ -44,6 +44,13 @@ namespace OpenSim.Tests.Permissions
[SetUp] [SetUp]
public void 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(); Common.TheInstance.DeleteObjectsFolders();
} }

6
OpenSim/Tests/Permissions/IndirectTransferTests.cs
View File

@ -46,6 +46,12 @@ namespace OpenSim.Tests.Permissions
[SetUp] [SetUp]
public void 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(); Common.TheInstance.DeleteObjectsFolders();
} }