From 2d4c87d1d77c9d25fc55bb0fdc34a2bd99b30932 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastienros@gmail.com>
Date: Thu, 14 Jan 2016 09:39:51 -0800
Subject: [PATCH] Fixing unit tests

---
 .../Settings/Blueprint/ShellDescriptorManagerTests.cs    | 9 ++++++++-
 .../Environment/Loaders/DynamicExtensionLoaderTests.cs   | 2 ++
 .../Modules/Orchard.Tokens/Implementation/Tokenizer.cs   | 5 ++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs b/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs
index 8ce05f769..3b38d6a4d 100644
--- a/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs
+++ b/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs
@@ -12,13 +12,18 @@ using Orchard.Environment.State;
 using Orchard.Environment.Descriptor;
 using Orchard.Environment.Descriptor.Models;
 using Orchard.Events;
+using Orchard.Caching;
+using Orchard.Core.Settings.State.Records;
 
 namespace Orchard.Tests.Modules.Settings.Blueprint {
     [TestFixture]
     public class ShellDescriptorManagerTests : DatabaseEnabledTestsBase {
         public override void Register(ContainerBuilder builder) {
             builder.RegisterInstance(new ShellSettings { Name = "Default" });
-
+            builder.RegisterModule(new CacheModule());
+            builder.RegisterType<DefaultCacheManager>().As<ICacheManager>();
+            builder.RegisterType<DefaultCacheHolder>().As<ICacheHolder>().SingleInstance();
+            builder.RegisterType<DefaultCacheContextAccessor>().As<ICacheContextAccessor>();
             builder.RegisterType<ShellDescriptorManager>().As<IShellDescriptorManager>().SingleInstance();
             builder.RegisterType<ShellStateManager>().As<IShellStateManager>().SingleInstance();
             builder.RegisterType<StubEventBus>().As<IEventBus>().SingleInstance();
@@ -39,6 +44,8 @@ namespace Orchard.Tests.Modules.Settings.Blueprint {
         protected override IEnumerable<Type> DatabaseTypes {
             get {
                 return new[] {
+                                typeof (ShellStateRecord),
+                                typeof (ShellFeatureStateRecord),
                                  typeof (ShellDescriptorRecord),
                                  typeof (ShellFeatureRecord),
                                  typeof (ShellParameterRecord),
diff --git a/src/Orchard.Tests/Environment/Loaders/DynamicExtensionLoaderTests.cs b/src/Orchard.Tests/Environment/Loaders/DynamicExtensionLoaderTests.cs
index 031e8c468..ac7d330a8 100644
--- a/src/Orchard.Tests/Environment/Loaders/DynamicExtensionLoaderTests.cs
+++ b/src/Orchard.Tests/Environment/Loaders/DynamicExtensionLoaderTests.cs
@@ -37,6 +37,8 @@ namespace Orchard.Tests.Environment.Loaders {
             builder.RegisterType<StubAppDataFolder>().As<IAppDataFolder>();
             builder.RegisterType<StubCacheManager>().As<ICacheManager>();
 
+            builder.RegisterInstance(new ExtensionLocations());
+
             _mockedStubProjectFileParser = new Mock<IProjectFileParser>();
             builder.RegisterInstance(_mockedStubProjectFileParser.Object).As<IProjectFileParser>();
             builder.RegisterInstance(new StubFileSystem(new StubClock())).As<StubFileSystem>();
diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
index 683166ba5..4b6769798 100644
--- a/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
@@ -53,9 +53,8 @@ namespace Orchard.Tokens.Implementation {
             var replacements = Evaluate(options.Predicate == null ? tokens : tokens.Where(options.Predicate), data);
 
             return replacements.Aggregate(tokenset.Item1,
-                (current, replacement) => replacement.Value == null ? 
-                current : current.Replace((hashMode ? "#{" : "{") + replacement.Key + "}",
-                (options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value)));
+                (current, replacement) => current.Replace((hashMode ? "#{" : "{") + replacement.Key + "}",
+                (options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value ?? "")));
         }
 
         private static Tuple<string, IEnumerable<string>> Parse(string text, bool hashMode) {