lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing unit tests

Browse Source
This commit is contained in:
Sebastien Ros 2016-01-14 09:39:51 -08:00
parent a0c61c0328
commit 2d4c87d1d7
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs
View File

@ -12,13 +12,18 @@ using Orchard.Environment.State;
using Orchard.Environment.Descriptor; using Orchard.Environment.Descriptor;
using Orchard.Environment.Descriptor.Models; using Orchard.Environment.Descriptor.Models;
using Orchard.Events; using Orchard.Events;
using Orchard.Caching;
using Orchard.Core.Settings.State.Records;
namespace Orchard.Tests.Modules.Settings.Blueprint { namespace Orchard.Tests.Modules.Settings.Blueprint {
[TestFixture] [TestFixture]
public class ShellDescriptorManagerTests : DatabaseEnabledTestsBase { public class ShellDescriptorManagerTests : DatabaseEnabledTestsBase {
public override void Register(ContainerBuilder builder) { public override void Register(ContainerBuilder builder) {
builder.RegisterInstance(new ShellSettings { Name = "Default" }); 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<ShellDescriptorManager>().As<IShellDescriptorManager>().SingleInstance();
builder.RegisterType<ShellStateManager>().As<IShellStateManager>().SingleInstance(); builder.RegisterType<ShellStateManager>().As<IShellStateManager>().SingleInstance();
builder.RegisterType<StubEventBus>().As<IEventBus>().SingleInstance(); builder.RegisterType<StubEventBus>().As<IEventBus>().SingleInstance();
@ -39,6 +44,8 @@ namespace Orchard.Tests.Modules.Settings.Blueprint {
protected override IEnumerable<Type> DatabaseTypes { protected override IEnumerable<Type> DatabaseTypes {
get { get {
return new[] { return new[] {
typeof (ShellStateRecord),
typeof (ShellFeatureStateRecord),
typeof (ShellDescriptorRecord), typeof (ShellDescriptorRecord),
typeof (ShellFeatureRecord), typeof (ShellFeatureRecord),
typeof (ShellParameterRecord), typeof (ShellParameterRecord),

2
src/Orchard.Tests/Environment/Loaders/DynamicExtensionLoaderTests.cs
View File

@ -37,6 +37,8 @@ namespace Orchard.Tests.Environment.Loaders {
builder.RegisterType<StubAppDataFolder>().As<IAppDataFolder>(); builder.RegisterType<StubAppDataFolder>().As<IAppDataFolder>();
builder.RegisterType<StubCacheManager>().As<ICacheManager>(); builder.RegisterType<StubCacheManager>().As<ICacheManager>();
builder.RegisterInstance(new ExtensionLocations());
_mockedStubProjectFileParser = new Mock<IProjectFileParser>(); _mockedStubProjectFileParser = new Mock<IProjectFileParser>();
builder.RegisterInstance(_mockedStubProjectFileParser.Object).As<IProjectFileParser>(); builder.RegisterInstance(_mockedStubProjectFileParser.Object).As<IProjectFileParser>();
builder.RegisterInstance(new StubFileSystem(new StubClock())).As<StubFileSystem>(); builder.RegisterInstance(new StubFileSystem(new StubClock())).As<StubFileSystem>();

5
src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
View File

@ -53,9 +53,8 @@ namespace Orchard.Tokens.Implementation {
var replacements = Evaluate(options.Predicate == null ? tokens : tokens.Where(options.Predicate), data); var replacements = Evaluate(options.Predicate == null ? tokens : tokens.Where(options.Predicate), data);
return replacements.Aggregate(tokenset.Item1, return replacements.Aggregate(tokenset.Item1,
(current, replacement) => replacement.Value == null ? (current, replacement) => current.Replace((hashMode ? "#{" : "{") + replacement.Key + "}",
current : current.Replace((hashMode ? "#{" : "{") + replacement.Key + "}", (options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value ?? "")));
(options.Encoding ?? ReplaceOptions.NoEncode)(replacement.Key, replacement.Value)));
} }
private static Tuple<string, IEnumerable<string>> Parse(string text, bool hashMode) { private static Tuple<string, IEnumerable<string>> Parse(string text, bool hashMode) {