lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 03:40:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#20314: Fixing tests broken because of Work<T> injected into DefaultShapeTableManager

Browse Source 
Work Item: 20314
This commit is contained in:
Lombiq
2014-10-08 13:43:47 +02:00
committed by Zoltán Lehóczky
parent 411e3f9ddd
commit b21d637ba4
6 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,8 @@ using System.Web.Mvc;
using Orchard.Tests.Stubs;
using Orchard.Themes;
using Orchard.UI.PageClass;
using Orchard.Environment;
using Autofac.Features.Metadata;
namespace Orchard.Core.Tests.Common.Providers {
[TestFixture]
@@ -68,7 +70,8 @@ namespace Orchard.Core.Tests.Common.Providers {
builder.RegisterInstance(new Mock<IOrchardServices>().Object);
builder.RegisterInstance(new RequestContext(new StubHttpContext(), new RouteData()));
builder.RegisterInstance(new Orchard.Environment.Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<Meta<IShapeTableProvider>>>(resolve => _container.Resolve<IEnumerable<Meta<IShapeTableProvider>>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();

2
src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs
View File

@@ -41,6 +41,7 @@ using Orchard.Core.Settings.Handlers;
using System.Collections.Specialized;
using Orchard.Mvc;
using Orchard.Tests.Modules.Stubs;
using Autofac.Features.Metadata;
namespace Orchard.Tests.Modules.Users.Controllers {
[TestFixture]
@@ -73,6 +74,7 @@ namespace Orchard.Tests.Modules.Users.Controllers {
builder.RegisterType<OrchardServices>().As<IOrchardServices>();
builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ITransactionManager>();
builder.RegisterInstance(new Work<IEnumerable<Meta<IShapeTableProvider>>>(resolve => _container.Resolve<IEnumerable<Meta<IShapeTableProvider>>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();

5
src/Orchard.Tests/DisplayManagement/Descriptors/DefaultShapeTableManagerTests.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using Autofac;
using Autofac.Features.Metadata;
using Moq;
using NUnit.Framework;
using Orchard.Caching;
@@ -9,6 +10,7 @@ using Orchard.ContentManagement;
using Orchard.DisplayManagement.Descriptors;
using Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy;
using Orchard.DisplayManagement.Implementation;
using Orchard.Environment;
using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Models;
using Orchard.Tests.Stubs;
@@ -18,7 +20,8 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
[TestFixture]
public class DefaultShapeTableManagerTests : ContainerTestBase {
protected override void Register(ContainerBuilder builder) {
builder.RegisterInstance(new Orchard.Environment.Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<Meta<IShapeTableProvider>>>(resolve => _container.Resolve<IEnumerable<Meta<IShapeTableProvider>>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<StubCacheManager>().As<ICacheManager>();
builder.RegisterType<StubParallelCacheContext>().As<IParallelCacheContext>();

5
src/Orchard.Tests/DisplayManagement/ShapeFactoryTests.cs
View File

@@ -1,11 +1,13 @@
using System.Collections.Generic;
using Autofac;
using Autofac.Features.Metadata;
using NUnit.Framework;
using Orchard.Caching;
using Orchard.DisplayManagement;
using Orchard.DisplayManagement.Descriptors;
using Orchard.DisplayManagement.Implementation;
using Orchard.DisplayManagement.Shapes;
using Orchard.Environment;
using Orchard.Environment.Extensions;
using Orchard.Tests.Stubs;
@@ -18,7 +20,8 @@ namespace Orchard.Tests.DisplayManagement {
public void Init() {
var builder = new ContainerBuilder();
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
builder.RegisterInstance(new Orchard.Environment.Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<Meta<IShapeTableProvider>>>(resolve => _container.Resolve<IEnumerable<Meta<IShapeTableProvider>>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();

5
src/Orchard.Tests/DisplayManagement/ShapeHelperTests.cs
View File

@@ -1,10 +1,12 @@
using System.Collections.Generic;
using Autofac;
using Autofac.Features.Metadata;
using NUnit.Framework;
using Orchard.Caching;
using Orchard.DisplayManagement;
using Orchard.DisplayManagement.Descriptors;
using Orchard.DisplayManagement.Implementation;
using Orchard.Environment;
using Orchard.Environment.Extensions;
using Orchard.Tests.Stubs;
@@ -17,7 +19,8 @@ namespace Orchard.Tests.DisplayManagement {
public void Init() {
var builder = new ContainerBuilder();
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
builder.RegisterInstance(new Orchard.Environment.Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<Meta<IShapeTableProvider>>>(resolve => _container.Resolve<IEnumerable<Meta<IShapeTableProvider>>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<ShapeTableLocator>().As<IShapeTableLocator>();
builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();

2
src/Orchard.Tests/DisplayManagement/SubsystemTests.cs
View File

@@ -3,6 +3,7 @@ using System.Web;
using System.Web.Mvc;
using System.Web.Routing;
using Autofac;
using Autofac.Features.Metadata;
using Moq;
using NUnit.Framework;
using Orchard.Caching;
@@ -48,6 +49,7 @@ namespace Orchard.Tests.DisplayManagement {
builder.RegisterType<DefaultDisplayManager>().As<IDisplayManager>();
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
builder.RegisterType<DisplayHelperFactory>().As<IDisplayHelperFactory>();
builder.RegisterInstance(new Work<IEnumerable<Meta<IShapeTableProvider>>>(resolve => _container.Resolve<IEnumerable<Meta<IShapeTableProvider>>>())).AsSelf();
builder.RegisterInstance(new Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
builder.RegisterType<StubCacheManager>().As<ICacheManager>();