4 files changed, 122 insertions, 15 deletions

diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 3b6dc52..7131cb5 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -36,7 +36,6 @@ namespace OpenSim.Framework.Communications.Cache
 {
     public class GridAssetClient : AssetServerBase
     {
-
         #region IPlugin
 
         public override string Name
@@ -51,7 +50,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public override void Initialise(ConfigSettings p_set, string p_url)
         {
-            m_log.Debug("[GRIDASSET] Plugin configured initialisation");
+            m_log.Debug("[GRID ASSET CLIENT]: Plugin configured initialisation");
             Initialise(p_url);
         }
 
@@ -65,7 +64,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public GridAssetClient(string p_url)
         {
-            m_log.Debug("[GRIDASSET] Direct constructor");
+            m_log.Debug("[GRID ASSET CLIENT]: Direct constructor");
             Initialise(p_url);
         }
 
diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
index 5274288..41a9561 100644
--- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
+++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs
@@ -34,7 +34,6 @@ namespace OpenSim.Framework.Communications.Cache
 {
     public class SQLAssetServer : AssetServerBase
     {
-
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         #region IPlugin
@@ -51,7 +50,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public override void Initialise(ConfigSettings p_set)
         {
-            m_log.Debug("[SQLASSET] Plugin configured initialisation");
+            m_log.Debug("[SQLAssetServer]: Plugin configured initialisation");
             Initialise(p_set.StandaloneAssetPlugin,p_set.StandaloneAssetSource);
         }
 
@@ -61,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         public SQLAssetServer(string pluginName, string connect)
         {
-            m_log.Debug("[SQLASSET] Direct constructor");
+            m_log.Debug("[SQLAssetServer]: Direct constructor");
             Initialise(pluginName, connect);
         }
 
@@ -108,7 +107,7 @@ namespace OpenSim.Framework.Communications.Cache
 
         protected override AssetBase GetAsset(AssetRequest req)
         {
-            return m_assetProvider.FetchAsset(req.AssetID);;
+            return m_assetProvider.FetchAsset(req.AssetID);
         }
 
         public override void StoreAsset(AssetBase asset)
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
new file mode 100644
index 0000000..34193b5
--- /dev/null
+++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Threading;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Framework.Communications.Tests
+{
+    /// <summary>
+    /// Asset cache tests
+    /// </summary>
+    [TestFixture] 
+    public class AssetCacheTests
+    {
+        protected UUID m_assetIdReceived;
+        protected AssetBase m_assetReceived;
+        
+        [Test]
+        /// <summary>
+        /// Test the 'asynchronous' get asset mechanism (though this won't be done asynchronously within this test)
+        /// </summary>
+        public void TestGetAsset()
+        {
+            UUID assetId = UUID.Parse("00000000-0000-0000-0000-000000000001");
+            byte[] assetData = new byte[] { 3, 2, 1 }; 
+            
+            AssetBase asset = new AssetBase();
+            asset.FullID = assetId;
+            asset.Data = assetData;
+            
+            TestAssetDataPlugin assetPlugin = new TestAssetDataPlugin();
+            assetPlugin.CreateAsset(asset);
+            
+            IAssetCache assetCache = new AssetCache(new SQLAssetServer(assetPlugin));
+                        
+            lock (this)
+            {
+                assetCache.GetAsset(assetId, AssetRequestCallback, false);                     
+                Monitor.Wait(this, 60000);
+            }            
+            
+            Assert.That(
+                assetId, Is.EqualTo(m_assetIdReceived), "Asset id stored differs from asset id received");
+            Assert.That(
+                assetData, Is.EqualTo(m_assetReceived.Data), "Asset data stored differs from asset data received");
+        }
+                                
+        private void AssetRequestCallback(UUID assetId, AssetBase asset)
+        {
+            m_assetIdReceived = assetId;
+            m_assetReceived = asset;
+            
+            lock (this)
+            {
+                Monitor.PulseAll(this);
+            }                  
+        }
+    }
+}
diff --git a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
index d6bce5b..80b9ae3 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
@@ -38,18 +38,39 @@ namespace OpenSim.Tests.Common.Mock
     /// tests are single threaded.
     /// </summary>
     public class TestAssetDataPlugin : IAssetDataPlugin
-    {
+    {        
         public string Version { get { return "0"; } }
         public string Name { get { return "TestAssetDataPlugin"; } }
+                
+        protected Dictionary<UUID, AssetBase> Assets = new Dictionary<UUID, AssetBase>();        
 
         public void Initialise() {}
+        public void Initialise(string connect) {}
         public void Dispose() {}
 
-        public AssetBase FetchAsset(UUID uuid) { return null; }
-        public void CreateAsset(AssetBase asset) {}
-        public void UpdateAsset(AssetBase asset) {}
-        public bool ExistsAsset(UUID uuid) { return false; }
-        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
-        public void Initialise(string connect) {}
+        public AssetBase FetchAsset(UUID uuid) 
+        {
+            if (ExistsAsset(uuid))
+                return Assets[uuid];
+            else
+                return null;
+        }
+        
+        public void CreateAsset(AssetBase asset) 
+        {
+            Assets[asset.FullID] = asset;
+        }
+        
+        public void UpdateAsset(AssetBase asset) 
+        {
+            CreateAsset(asset);
+        }
+        
+        public bool ExistsAsset(UUID uuid) 
+        { 
+            return Assets.ContainsKey(uuid); 
+        }
+        
+        public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }        
     }
-}
+}
\ No newline at end of file