diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs (renamed from OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs) | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs index fcb544f..ab56f4e 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs | |||
@@ -27,31 +27,32 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | 30 | using System.Reflection; | |
31 | using System.Threading; | ||
32 | using NUnit.Framework; | ||
33 | using OpenMetaverse; | ||
31 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications; | ||
32 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
33 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
34 | using OpenMetaverse; | 38 | using OpenSim.Tests.Common; |
39 | using OpenSim.Tests.Common.Mock; | ||
35 | 40 | ||
36 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | 41 | namespace OpenSim.Region.Framework.Scenes.Tests |
37 | { | 42 | { |
38 | public class HGUuidGatherer : UuidGatherer | 43 | [TestFixture] |
44 | public class SceneManagerTests | ||
39 | { | 45 | { |
40 | protected string m_assetServerURL; | 46 | [Test] |
41 | protected HGAssetMapper m_assetMapper; | 47 | public void TestClose() |
42 | |||
43 | public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetCache, string assetServerURL) : base(assetCache) | ||
44 | { | 48 | { |
45 | m_assetMapper = assMap; | 49 | TestHelpers.InMethod(); |
46 | m_assetServerURL = assetServerURL; | ||
47 | } | ||
48 | 50 | ||
49 | protected override AssetBase GetAsset(UUID uuid) | 51 | SceneHelpers sh = new SceneHelpers(); |
50 | { | 52 | Scene scene = sh.SetupScene(); |
51 | if (string.Empty == m_assetServerURL) | 53 | |
52 | return m_assetCache.Get(uuid.ToString()); | 54 | sh.SceneManager.Close(); |
53 | else | 55 | Assert.That(scene.ShuttingDown, Is.True); |
54 | return m_assetMapper.FetchAsset(m_assetServerURL, uuid); | ||
55 | } | 56 | } |
56 | } | 57 | } |
57 | } | 58 | } \ No newline at end of file |