lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing unit tests

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-09-27 10:35:50 -07:00
parent 6216335939
commit 45e6cf723b
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs
View File

@@ -33,6 +33,7 @@ using Orchard.FileSystems.VirtualPath;
using Orchard.Localization;
using Orchard.Security;
using Orchard.Tasks.Scheduling;
using Orchard.Tests.DisplayManagement;
using Orchard.Tests.DisplayManagement.Descriptors;
using Orchard.Tests.Modules;
using System.Web.Mvc;
@@ -68,6 +69,12 @@ namespace Orchard.Core.Tests.Common.Providers {
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
// IContentDisplay
var workContext = new DefaultDisplayManagerTests.TestWorkContext {
CurrentTheme = new ExtensionDescriptor { Id = "Hello" }
};
builder.RegisterInstance<DefaultDisplayManagerTests.TestWorkContextAccessor>(new DefaultDisplayManagerTests.TestWorkContextAccessor(workContext)).As<IWorkContextAccessor>();
builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
DefaultShapeTableManagerTests.TestShapeProvider.FeatureShapes = new Dictionary<Feature, IEnumerable<string>> {

3
src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ModuleRecipeHandlerTest.cs
View File

@@ -10,6 +10,7 @@ using Orchard.Core.Settings.Descriptor;
using Orchard.Core.Settings.Descriptor.Records;
using Orchard.Core.Settings.State;
using Orchard.Data.Migration;
using Orchard.Environment.Configuration;
using Orchard.Environment.Descriptor;
using Orchard.Environment.Descriptor.Models;
using Orchard.Environment.Extensions;
@@ -45,6 +46,8 @@ namespace Orchard.Tests.Modules.Recipes.RecipeHandlers {
}
public override void Register(ContainerBuilder builder) {
builder.RegisterInstance(new ShellSettings { Name = "Default" });
_folders = new ExtensionManagerTests.StubFolders();
builder.RegisterInstance(_folders).As<IExtensionFolders>();
builder.RegisterType<ExtensionManager>().As<IExtensionManager>();

3
src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ThemeRecipeHandlerTest.cs
View File

@@ -10,6 +10,7 @@ using Orchard.Core.Settings.Descriptor;
using Orchard.Core.Settings.Descriptor.Records;
using Orchard.Core.Settings.State;
using Orchard.Data.Migration;
using Orchard.Environment.Configuration;
using Orchard.Environment.Descriptor;
using Orchard.Environment.Descriptor.Models;
using Orchard.Environment.Extensions;
@@ -48,6 +49,8 @@ namespace Orchard.Tests.Modules.Recipes.RecipeHandlers {
public override void Register(ContainerBuilder builder) {
var _testVirtualPathProvider = new StylesheetBindingStrategyTests.TestVirtualPathProvider();
builder.RegisterInstance(new ShellSettings { Name = "Default" });
_folders = new ExtensionManagerTests.StubFolders();
builder.RegisterInstance(_folders).As<IExtensionFolders>();
builder.RegisterType<ExtensionManager>().As<IExtensionManager>();

3
src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs
View File

@@ -139,7 +139,8 @@ namespace Orchard.Tests.Environment {
public void NormalDependenciesShouldBeUniquePerRequestContainer() {
var host = _lifetime.Resolve<IOrchardHost>();
var container1 = host.CreateShellContainer_Obsolete();
((IShellDescriptorManagerEventHandler)host).Changed(null, String.Empty);
((IShellDescriptorManagerEventHandler)host).Changed(null, ShellSettings.DefaultName);
host.BeginRequest(); // force reloading the shell
var container2 = host.CreateShellContainer_Obsolete();
var requestContainer1a = container1.BeginLifetimeScope();
var requestContainer1b = container1.BeginLifetimeScope();