aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-04 21:35:15 +0100
committerJustin Clark-Casey (justincc)2011-07-04 21:35:15 +0100
commit46f5893d559f87982e510d02a37856951eb1e088 (patch)
tree5a16d3f569b7ad740db59d6b2a497f0bda8a5573
parentIf a user has the rights to edit a parcel's properties, then also allow them ... (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Framework/AssetBase.cs1
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs2
-rw-r--r--OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs82
-rw-r--r--OpenSim/Tests/Common/Helpers/AssetHelpers.cs9
-rw-r--r--OpenSim/Tests/Common/TestHelper.cs11
-rw-r--r--prebuild.xml1
6 files changed, 106 insertions, 0 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 5f68cda..e8c85c9 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -273,6 +273,7 @@ namespace OpenSim.Framework
273 273
274 return m_id; 274 return m_id;
275 } 275 }
276
276 set 277 set
277 { 278 {
278 UUID uuid = UUID.Zero; 279 UUID uuid = UUID.Zero;
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
28using System;
29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
32using System.Threading;
33using log4net.Config;
34using Nini.Config;
35using NUnit.Framework;
36using OpenMetaverse;
37using OpenMetaverse.Assets;
38using Flotsam.RegionModules.AssetCache;
39using OpenSim.Framework;
40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Framework.Scenes.Serialization;
42using OpenSim.Tests.Common;
43using OpenSim.Tests.Common.Mock;
44
45namespace 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
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
index aa55bcd..9b68331 100644
--- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
@@ -37,6 +37,15 @@ namespace OpenSim.Tests.Common
37 public class AssetHelpers 37 public class AssetHelpers
38 { 38 {
39 /// <summary> 39 /// <summary>
40 /// Create a notecard asset with a random uuids and dummy text.
41 /// </summary>
42 /// <returns></returns>
43 public static AssetBase CreateAsset()
44 {
45 return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", UUID.Random());
46 }
47
48 /// <summary>
40 /// Create a notecard asset with a random uuid and dummy text. 49 /// Create a notecard asset with a random uuid and dummy text.
41 /// </summary> 50 /// </summary>
42 /// <param name="creatorId">/param> 51 /// <param name="creatorId">/param>
diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelper.cs
index 1722e59..86bd107 100644
--- a/OpenSim/Tests/Common/TestHelper.cs
+++ b/OpenSim/Tests/Common/TestHelper.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Diagnostics; 29using System.Diagnostics;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenMetaverse;
31 32
32namespace OpenSim.Tests.Common 33namespace OpenSim.Tests.Common
33{ 34{
@@ -56,5 +57,15 @@ namespace OpenSim.Tests.Common
56 Console.WriteLine(); 57 Console.WriteLine();
57 Console.WriteLine("===> In Test Method : {0} <===", stackTrace.GetFrame(1).GetMethod().Name); 58 Console.WriteLine("===> In Test Method : {0} <===", stackTrace.GetFrame(1).GetMethod().Name);
58 } 59 }
60
61 /// <summary>
62 /// Parse tail section into full UUID.
63 /// </summary>
64 /// <param name="tail"></param>
65 /// <returns></returns>
66 public static UUID ParseTail(int tail)
67 {
68 return new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", tail));
69 }
59 } 70 }
60} 71}
diff --git a/prebuild.xml b/prebuild.xml
index aebd1d6..8536a48 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2953,6 +2953,7 @@
2953 <Files> 2953 <Files>
2954 <!-- SADLY the way this works means you need to keep adding these paths --> 2954 <!-- SADLY the way this works means you need to keep adding these paths -->
2955 <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> 2955 <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/>
2956 <Match path="Asset/Tests" pattern="*.cs" recurse="true"/>
2956 <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> 2957 <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/>
2957 <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> 2958 <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/>
2958 <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> 2959 <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>