Building out caching

Passing along signal of VPP file monitoring
Expiring results as appropriate in AvailableExtensions

--HG--
branch : dev

src/Orchard.Tests/Caching/CacheScopeTests.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using Orchard.Caching;
+using Orchard.Environment;
+using Autofac;
+using Orchard.Environment.FileSystems;
+using Orchard.Services;
+
+namespace Orchard.Tests.Caching {
+    [TestFixture]
+    public class CacheScopeTests {
+        private IContainer _hostContainer;
+
+        [SetUp]
+        public void Init() {
+            _hostContainer = OrchardStarter.CreateHostContainer(builder => {
+                builder.RegisterType<Alpha>().InstancePerDependency();
+            });
+
+        }
+
+        public class Alpha {
+            public ICacheManager CacheManager { get; set; }
+
+            public Alpha(ICacheManager cacheManager) {
+                CacheManager = cacheManager;
+            }
+        }
+
+        [Test]
+        public void ComponentsAtHostLevelHaveAccessToCache() {
+            var alpha = _hostContainer.Resolve<Alpha>();
+            Assert.That(alpha.CacheManager, Is.Not.Null);            
+        }
+
+        [Test]
+        public void HostLevelHasAccessToGlobalVolatileProviders() {
+            Assert.That(_hostContainer.Resolve<IVirtualPathProvider>(), Is.Not.Null);            
+            Assert.That(_hostContainer.Resolve<IAppDataFolder>(), Is.Not.Null);            
+            Assert.That(_hostContainer.Resolve<IClock>(), Is.Not.Null);            
+        }
+
+    }
+}

src/Orchard.Tests/Caching/CacheTests.cs

@@ -1,4 +1,5 @@
-using Autofac;
+using System;
+using Autofac;
 using NUnit.Framework;
 using Orchard.Caching;
 
@@ -11,9 +12,12 @@ namespace Orchard.Tests.Caching {
         [SetUp]
         public void Init() {
             var builder = new ContainerBuilder();
+            builder.RegisterModule(new CacheModule());
+            builder.RegisterType<DefaultCacheManager>().As<ICacheManager>();
+            builder.RegisterType<DefaultCacheHolder>().As<ICacheHolder>().SingleInstance();
             builder.RegisterType<DefaultCacheManager>().As<ICacheManager>();
             _container = builder.Build();
-            _cacheManager = _container.Resolve<ICacheManager>();
+            _cacheManager = _container.Resolve<ICacheManager>(new TypedParameter(typeof(Type), GetType()));
         }
 
         [Test]
@@ -28,5 +32,66 @@ namespace Orchard.Tests.Caching {
             var result = _cacheManager.Get("testItem", ctx => "");
             Assert.That(result, Is.EqualTo("testResult"));
         }
+
+        [Test]
+        public void CacheModuleProvidesTypeSpecificManager() {
+            var scope = _container.BeginLifetimeScope(builder => {
+                builder.RegisterModule(new CacheModule());
+                builder.RegisterType<ComponentOne>();
+                builder.RegisterType<ComponentTwo>();
+            });
+
+            var c1 = scope.Resolve<ComponentOne>();
+            var c2 = scope.Resolve<ComponentTwo>();
+            var w1a = c1.CacheManager.Get("hello", ctx => "world1");
+            var w1b = c1.CacheManager.Get("hello", ctx => "world2");
+            var w2a = c2.CacheManager.Get("hello", ctx => "world3");
+            var w2b = c2.CacheManager.Get("hello", ctx => "world4");
+
+            Assert.That(w1a, Is.EqualTo("world1"));
+            Assert.That(w1b, Is.EqualTo("world1"));
+            Assert.That(w2a, Is.EqualTo("world3"));
+            Assert.That(w2b, Is.EqualTo("world3"));
+
+            var c3 = scope.Resolve<ComponentOne>();
+            var c4 = scope.Resolve<ComponentTwo>();
+            var w3a = c3.CacheManager.Get("hello", ctx => "world5");
+            var w3b = c3.CacheManager.Get("hello", ctx => "world6");
+            var w4a = c4.CacheManager.Get("hello", ctx => "world7");
+            var w4b = c4.CacheManager.Get("hello", ctx => "world8");
+
+            Assert.That(w3a, Is.EqualTo("world1"));
+            Assert.That(w3b, Is.EqualTo("world1"));
+            Assert.That(w4a, Is.EqualTo("world3"));
+            Assert.That(w4b, Is.EqualTo("world3"));
+
+            Assert.That(c1.CacheManager,
+                Is.Not.SameAs(c3.CacheManager));
+
+            Assert.That(c1.CacheManager.GetCache<string, string>(),
+                Is.SameAs(c3.CacheManager.GetCache<string, string>()));
+
+            Assert.That(c1.CacheManager,
+                Is.Not.SameAs(c2.CacheManager));
+
+            Assert.That(c1.CacheManager.GetCache<string, string>(),
+                Is.Not.SameAs(c2.CacheManager.GetCache<string, string>()));
+        }
+
+        class ComponentOne {
+            public ICacheManager CacheManager { get; set; }
+
+            public ComponentOne(ICacheManager cacheManager) {
+                CacheManager = cacheManager;
+            }
+        }
+
+        class ComponentTwo {
+            public ICacheManager CacheManager { get; set; }
+
+            public ComponentTwo(ICacheManager cacheManager) {
+                CacheManager = cacheManager;
+            }
+        }
     }
-}
+}