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

- More work related to moving Orchard to Autofac 2.1.

Browse Source 
Need to rework the host/shell container spin-off for multitenancy.
Need to rework interception.
dev branch is now broken until the end of this sprint, enjoy the default branch.

--HG--
branch : dev
This commit is contained in:
Suha Can
2010-04-02 15:17:13 -07:00
parent 58abf23453
commit 867aaf943f
56 changed files with 540 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Autofac.Builder;
using Autofac;
using JetBrains.Annotations;
using Moq;
using NUnit.Framework;
@@ -22,16 +22,16 @@ namespace Orchard.Core.Tests.Common.Providers {
private Mock<IMembershipService> _membership;
public override void Register(ContainerBuilder builder) {
builder.Register<DefaultContentManager>().As<IContentManager>();
builder.Register<TestHandler>().As<IContentHandler>();
builder.Register<CommonAspectHandler>().As<IContentHandler>();
builder.RegisterType<DefaultContentManager>().As<IContentManager>();
builder.RegisterType<TestHandler>().As<IContentHandler>();
builder.RegisterType<CommonAspectHandler>().As<IContentHandler>();
_authn = new Mock<IAuthenticationService>();
_authz = new Mock<IAuthorizationService>();
_membership = new Mock<IMembershipService>();
builder.Register(_authn.Object);
builder.Register(_authz.Object);
builder.Register(_membership.Object);
builder.RegisterInstance(_authn.Object);
builder.RegisterInstance(_authz.Object);
builder.RegisterInstance(_membership.Object);
}

8
src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs
View File

@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using Autofac.Builder;
using Autofac;
using JetBrains.Annotations;
using NUnit.Framework;
using Orchard.ContentManagement;
@@ -21,9 +21,9 @@ namespace Orchard.Core.Tests.Common.Services {
}
public override void Register(ContainerBuilder builder) {
builder.Register<DefaultContentManager>().As<IContentManager>();
builder.Register<ThingHandler>().As<IContentHandler>();
builder.Register<RoutableService>().As<IRoutableService>();
builder.RegisterType<DefaultContentManager>().As<IContentManager>();
builder.RegisterType<ThingHandler>().As<IContentHandler>();
builder.RegisterType<RoutableService>().As<IRoutableService>();
}
private IRoutableService _routableService;

34
src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
View File

@@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.Mvc;
using System.Web.Routing;
using System.Xml.Linq;
using Autofac.Builder;
using Autofac.Modules;
using Autofac;
using Moq;
using NUnit.Framework;
using Orchard.ContentManagement;
@@ -93,10 +91,10 @@ namespace Orchard.Core.Tests.Feeds.Controllers {
var query = new StubQuery(Enumerable.Empty<ContentItem>());
var builder = new ContainerBuilder();
builder.RegisterModule(new ImplicitCollectionSupportModule());
builder.Register<FeedController>();
builder.Register<RssFeedBuilder>().As<IFeedBuilderProvider>();
builder.Register(query).As<IFeedQueryProvider>();
//builder.RegisterModule(new ImplicitCollectionSupportModule());
builder.RegisterType<FeedController>();
builder.RegisterType<RssFeedBuilder>().As<IFeedBuilderProvider>();
builder.RegisterInstance(query).As<IFeedQueryProvider>();
var container = builder.Build();
var controller = container.Resolve<FeedController>();
@@ -119,10 +117,10 @@ namespace Orchard.Core.Tests.Feeds.Controllers {
});
var builder = new ContainerBuilder();
builder.RegisterModule(new ImplicitCollectionSupportModule());
builder.Register<FeedController>();
builder.Register<RssFeedBuilder>().As<IFeedBuilderProvider>();
builder.Register(query).As<IFeedQueryProvider>();
//builder.RegisterModule(new ImplicitCollectionSupportModule());
builder.RegisterType<FeedController>();
builder.RegisterType<RssFeedBuilder>().As<IFeedBuilderProvider>();
builder.RegisterInstance(query).As<IFeedQueryProvider>();
var container = builder.Build();
var controller = container.Resolve<FeedController>();
@@ -163,13 +161,13 @@ namespace Orchard.Core.Tests.Feeds.Controllers {
.Returns(new ContentItemMetadata { DisplayText = "foo" });
var builder = new ContainerBuilder();
builder.RegisterModule(new ImplicitCollectionSupportModule());
builder.Register<FeedController>();
builder.Register(new RouteCollection());
builder.Register(mockContentManager.Object).As<IContentManager>();
builder.Register<RssFeedBuilder>().As<IFeedBuilderProvider>();
builder.Register<CorePartsFeedItemBuilder>().As<IFeedItemBuilder>();
builder.Register(query).As<IFeedQueryProvider>();
//builder.RegisterModule(new ImplicitCollectionSupportModule());
builder.RegisterType<FeedController>();
builder.RegisterInstance(new RouteCollection());
builder.RegisterInstance(mockContentManager.Object).As<IContentManager>();
builder.RegisterType<RssFeedBuilder>().As<IFeedBuilderProvider>();
builder.RegisterType<CorePartsFeedItemBuilder>().As<IFeedItemBuilder>();
builder.RegisterInstance(query).As<IFeedQueryProvider>();
var container = builder.Build();
var controller = container.Resolve<FeedController>();

4
src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
View File

@@ -31,6 +31,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Autofac, Version=2.1.13.813, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\autofac\Autofac.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.0.812.4, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\moq\Moq.dll</HintPath>

10
src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs
View File

@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using Autofac.Builder;
using Autofac;
using Moq;
using NUnit.Framework;
using Orchard.ContentManagement;
@@ -26,10 +26,10 @@ namespace Orchard.Core.Tests.Scheduling {
}
public override void Register(ContainerBuilder builder) {
_handler = new StubTaskHandler();
builder.Register(new Mock<IOrchardServices>().Object);
builder.Register<DefaultContentManager>().As<IContentManager>();
builder.Register<ScheduledTaskExecutor>().As<IBackgroundTask>().Named("ScheduledTaskExecutor");
builder.Register(_handler).As<IScheduledTaskHandler>();
builder.RegisterInstance(new Mock<IOrchardServices>().Object);
builder.RegisterType<DefaultContentManager>().As<IContentManager>();
builder.RegisterType<ScheduledTaskExecutor>().As<IBackgroundTask>().Named("ScheduledTaskExecutor", typeof (IBackgroundTask));
builder.RegisterInstance(_handler).As<IScheduledTaskHandler>();
}
protected override IEnumerable<Type> DatabaseTypes {

9
src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Autofac.Builder;
using Autofac;
using Moq;
using NUnit.Framework;
using Orchard.ContentManagement;
@@ -9,7 +9,6 @@ using Orchard.ContentManagement.Records;
using Orchard.Core.Scheduling.Models;
using Orchard.Core.Scheduling.Services;
using Orchard.Data;
using Orchard.Tasks;
using Orchard.Tasks.Scheduling;
using Orchard.Tests.Modules;
@@ -31,9 +30,9 @@ namespace Orchard.Core.Tests.Scheduling {
}
public override void Register(ContainerBuilder builder) {
builder.Register(_mockServices.Object);
builder.Register<DefaultContentManager>().As<IContentManager>();
builder.Register<ScheduledTaskManager>().As<IScheduledTaskManager>();
builder.RegisterInstance(_mockServices.Object);
builder.RegisterType<DefaultContentManager>().As<IContentManager>();
builder.RegisterType<ScheduledTaskManager>().As<IScheduledTaskManager>();
}
protected override IEnumerable<Type> DatabaseTypes {