Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 33 insertions, 13 deletions

diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs
index 32c0c95..c3613e6 100644
--- a/OpenSim/Framework/Tests/CacheTests.cs
+++ b/OpenSim/Framework/Tests/CacheTests.cs
@@ -40,6 +40,7 @@ namespace OpenSim.Framework.Tests
         public void Build()
         {
             cache = new Cache();
+            cache = new Cache(CacheMedium.Memory,CacheStrategy.Aggressive,CacheFlags.AllowUpdate);
             cacheItemUUID = UUID.Random();
             MemoryCacheItem cachedItem = new MemoryCacheItem(cacheItemUUID.ToString(),DateTime.Now + TimeSpan.FromDays(1));
             byte[] foo = new byte[1];
@@ -68,36 +69,55 @@ namespace OpenSim.Framework.Tests
             Assert.That(citem == null, "Item should not be in Cache");
         }
 
-        //NOTE: Test Case disabled until Cache is fixed
+        
         [Test]
-        public void TestTTLExpiredEntry()
+        public void ExpireItemManually()
         {
             UUID ImmediateExpiryUUID = UUID.Random();
-            MemoryCacheItem cachedItem = new MemoryCacheItem(ImmediateExpiryUUID.ToString(), TimeSpan.FromDays(-1));
+            MemoryCacheItem cachedItem = new MemoryCacheItem(ImmediateExpiryUUID.ToString(), TimeSpan.FromDays(1));
             byte[] foo = new byte[1];
             foo[0] = 1;
             cachedItem.Store(foo);
             cache.Store(cacheItemUUID.ToString(), cachedItem);
-
+            cache.Invalidate(cacheItemUUID.ToString());
             cache.Get(cacheItemUUID.ToString());
-            //object citem = cache.Get(cacheItemUUID.ToString());
-            //Assert.That(citem == null, "Item should not be in Cache because the expiry time was before now");
+            object citem = cache.Get(cacheItemUUID.ToString());
+            Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it");
         }
 
-        //NOTE: Test Case disabled until Cache is fixed
         [Test]
-        public void ExpireItemManually()
+        public void ClearCacheTest()
         {
             UUID ImmediateExpiryUUID = UUID.Random();
-            MemoryCacheItem cachedItem = new MemoryCacheItem(ImmediateExpiryUUID.ToString(), TimeSpan.FromDays(1));
+            MemoryCacheItem cachedItem = new MemoryCacheItem(ImmediateExpiryUUID.ToString(), DateTime.Now - TimeSpan.FromDays(1));
             byte[] foo = new byte[1];
             foo[0] = 1;
             cachedItem.Store(foo);
             cache.Store(cacheItemUUID.ToString(), cachedItem);
-            cache.Invalidate(ImmediateExpiryUUID.ToString());
-            cache.Get(cacheItemUUID.ToString());
-            //object citem = cache.Get(cacheItemUUID.ToString());
-            //Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it");
+            cache.Clear();
+  
+            object citem = cache.Get(cacheItemUUID.ToString());
+            Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it");
+        }
+
+        [Test]
+        public void CacheItemMundane()
+        {
+            UUID Random1 = UUID.Random();
+            UUID Random2 = UUID.Random();
+            byte[] data = new byte[0];
+            CacheItemBase cb1 = new CacheItemBase(Random1.ToString(), DateTime.Now + TimeSpan.FromDays(1));
+            CacheItemBase cb2 = new CacheItemBase(Random2.ToString(), DateTime.Now + TimeSpan.FromDays(1));
+            CacheItemBase cb3 = new CacheItemBase(Random1.ToString(), DateTime.Now + TimeSpan.FromDays(1));
+
+            cb1.Store(data);
+
+            Assert.That(cb1.Equals(cb3), "cb1 should equal cb3, their uuids are the same");
+            Assert.That(!cb2.Equals(cb1), "cb2 should not equal cb1, their uuids are NOT the same");
+            Assert.That(cb1.IsLocked() == false, "CacheItemBase default is false");
+            Assert.That(cb1.Retrieve() == null, "Virtual Retrieve method should return null");
+
+
         }
 
     }