diff options
author | Justin Clark-Casey (justincc) | 2011-07-04 21:35:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-04 21:35:15 +0100 |
commit | 46f5893d559f87982e510d02a37856951eb1e088 (patch) | |
tree | 5a16d3f569b7ad740db59d6b2a497f0bda8a5573 /OpenSim/Region | |
parent | If a user has the rights to edit a parcel's properties, then also allow them ... (diff) | |
download | opensim-SC_OLD-46f5893d559f87982e510d02a37856951eb1e088.zip opensim-SC_OLD-46f5893d559f87982e510d02a37856951eb1e088.tar.gz opensim-SC_OLD-46f5893d559f87982e510d02a37856951eb1e088.tar.bz2 opensim-SC_OLD-46f5893d559f87982e510d02a37856951eb1e088.tar.xz |
Add basic flotsam asset cache test for retrieved cached asset.
Disabled temporarily since file system caching disrupts subsequent test runs
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | 82 |
2 files changed, 84 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 48ee277..a8f5c99 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -259,6 +259,8 @@ namespace Flotsam.RegionModules.AssetCache | |||
259 | // TODO: Spawn this off to some seperate thread to do the actual writing | 259 | // TODO: Spawn this off to some seperate thread to do the actual writing |
260 | if (asset != null) | 260 | if (asset != null) |
261 | { | 261 | { |
262 | m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Caching asset with id {0}", asset.ID); | ||
263 | |||
262 | UpdateMemoryCache(asset.ID, asset); | 264 | UpdateMemoryCache(asset.ID, asset); |
263 | 265 | ||
264 | string filename = GetFileName(asset.ID); | 266 | string filename = GetFileName(asset.ID); |
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs new file mode 100644 index 0000000..3498969 --- /dev/null +++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | |||
@@ -0,0 +1,82 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.IO; | ||
31 | using System.Reflection; | ||
32 | using System.Threading; | ||
33 | using log4net.Config; | ||
34 | using Nini.Config; | ||
35 | using NUnit.Framework; | ||
36 | using OpenMetaverse; | ||
37 | using OpenMetaverse.Assets; | ||
38 | using Flotsam.RegionModules.AssetCache; | ||
39 | using OpenSim.Framework; | ||
40 | using OpenSim.Region.Framework.Scenes; | ||
41 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
42 | using OpenSim.Tests.Common; | ||
43 | using OpenSim.Tests.Common.Mock; | ||
44 | |||
45 | namespace OpenSim.Region.CoreModules.Asset.Tests | ||
46 | { | ||
47 | [TestFixture] | ||
48 | public class FlotsamAssetCacheTests | ||
49 | { | ||
50 | // [Test] | ||
51 | public void TestCacheAsset() | ||
52 | { | ||
53 | TestHelper.InMethod(); | ||
54 | log4net.Config.XmlConfigurator.Configure(); | ||
55 | |||
56 | IConfigSource config = new IniConfigSource(); | ||
57 | |||
58 | config.AddConfig("Modules"); | ||
59 | config.Configs["Modules"].Set("AssetCaching", "FlotsamAssetCache"); | ||
60 | config.AddConfig("AssetCache"); | ||
61 | config.Configs["AssetCache"].Set("MemoryCacheEnabled", "true"); | ||
62 | |||
63 | FlotsamAssetCache cache = new FlotsamAssetCache(); | ||
64 | TestScene scene = SceneSetupHelpers.SetupScene(); | ||
65 | SceneSetupHelpers.SetupSceneModules(scene, config, cache); | ||
66 | |||
67 | AssetBase asset = AssetHelpers.CreateAsset(); | ||
68 | asset.ID = TestHelper.ParseTail(0x1).ToString(); | ||
69 | |||
70 | // Check we don't get anything before the asset is put in the cache | ||
71 | AssetBase retrievedAsset = cache.Get(asset.ID.ToString()); | ||
72 | Assert.That(retrievedAsset, Is.Null); | ||
73 | |||
74 | cache.Store(asset); | ||
75 | |||
76 | // Check that asset is now in cache | ||
77 | retrievedAsset = cache.Get(asset.ID.ToString()); | ||
78 | Assert.That(retrievedAsset, Is.Not.Null); | ||
79 | Assert.That(retrievedAsset.ID, Is.EqualTo(asset.ID)); | ||
80 | } | ||
81 | } | ||
82 | } \ No newline at end of file | ||