diff options
author | Diva Canto | 2017-08-14 16:55:50 -0700 |
---|---|---|
committer | Diva Canto | 2017-08-14 16:55:50 -0700 |
commit | eb837defdf7d9f260603fe400b3a482258605f43 (patch) | |
tree | eb2634652064cb94b0fd33ec820eb05b74e49519 /OpenSim/Tests/Permissions | |
parent | Let's try giving Common a default constructor instead of the workaround (diff) | |
download | opensim-SC_OLD-eb837defdf7d9f260603fe400b3a482258605f43.zip opensim-SC_OLD-eb837defdf7d9f260603fe400b3a482258605f43.tar.gz opensim-SC_OLD-eb837defdf7d9f260603fe400b3a482258605f43.tar.bz2 opensim-SC_OLD-eb837defdf7d9f260603fe400b3a482258605f43.tar.xz |
Revert "Let's try giving Common a default constructor instead of the workaround"
This reverts commit 8b6557e377f7bac1bdb38f3e6dd22c797417d09c.
Diffstat (limited to 'OpenSim/Tests/Permissions')
-rw-r--r-- | OpenSim/Tests/Permissions/Common.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tests/Permissions/DirectTransferTests.cs | 7 | ||||
-rw-r--r-- | OpenSim/Tests/Permissions/IndirectTransferTests.cs | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Tests/Permissions/Common.cs b/OpenSim/Tests/Permissions/Common.cs index cf4d2bd..4ecce38 100644 --- a/OpenSim/Tests/Permissions/Common.cs +++ b/OpenSim/Tests/Permissions/Common.cs | |||
@@ -60,10 +60,6 @@ namespace OpenSim.Tests.Permissions | |||
60 | private TestScene m_Scene; | 60 | private TestScene m_Scene; |
61 | private ScenePresence[] m_Avatars = new ScenePresence[3]; | 61 | private ScenePresence[] m_Avatars = new ScenePresence[3]; |
62 | 62 | ||
63 | public Common() | ||
64 | { | ||
65 | } | ||
66 | |||
67 | [SetUp] | 63 | [SetUp] |
68 | public override void SetUp() | 64 | public override void SetUp() |
69 | { | 65 | { |
diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs index c68bbdf..0f251db 100644 --- a/OpenSim/Tests/Permissions/DirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs | |||
@@ -44,6 +44,13 @@ namespace OpenSim.Tests.Permissions | |||
44 | [SetUp] | 44 | [SetUp] |
45 | public void SetUp() | 45 | public void SetUp() |
46 | { | 46 | { |
47 | // In case we're dealing with some older version of nunit | ||
48 | if (Common.TheInstance == null) | ||
49 | { | ||
50 | Common.TheInstance = new Common(); | ||
51 | Common.TheInstance.SetUp(); | ||
52 | } | ||
53 | |||
47 | Common.TheInstance.DeleteObjectsFolders(); | 54 | Common.TheInstance.DeleteObjectsFolders(); |
48 | } | 55 | } |
49 | 56 | ||
diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs index 66a228a..fb96b8b 100644 --- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs +++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs | |||
@@ -46,6 +46,12 @@ namespace OpenSim.Tests.Permissions | |||
46 | [SetUp] | 46 | [SetUp] |
47 | public void SetUp() | 47 | public void SetUp() |
48 | { | 48 | { |
49 | // In case we're dealing with some older version of nunit | ||
50 | if (Common.TheInstance == null) | ||
51 | { | ||
52 | Common.TheInstance = new Common(); | ||
53 | Common.TheInstance.SetUp(); | ||
54 | } | ||
49 | Common.TheInstance.DeleteObjectsFolders(); | 55 | Common.TheInstance.DeleteObjectsFolders(); |
50 | } | 56 | } |
51 | 57 | ||