diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs index 294b75f9b..73cbde057 100644 --- a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs +++ b/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs @@ -28,6 +28,7 @@ namespace Orchard.Core.Tests.Common.Providers { public override void Register(ContainerBuilder builder) { builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); diff --git a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs index 1a3b18f47..935cf521e 100644 --- a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs +++ b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs @@ -26,6 +26,8 @@ namespace Orchard.Core.Tests.Common.Services { public override void Register(ContainerBuilder builder) { builder.RegisterType().As(); + builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); @@ -68,7 +70,7 @@ namespace Orchard.Core.Tests.Common.Services { Assert.That(_routableService.IsSlugValid("a" + c + "b"), Is.False); } } - + [Test] public void VeryLongStringTruncatedTo1000Chars() { @@ -140,18 +142,15 @@ namespace Orchard.Core.Tests.Common.Services { } [Test] - public void GeneratedSlugsShouldBeUniqueAmongContentType() - { + public void GeneratedSlugsShouldBeUniqueAmongContentType() { var contentManager = _container.Resolve(); - var thing1 = contentManager.Create(ThingDriver.ContentType.Name, t => - { + var thing1 = contentManager.Create(ThingDriver.ContentType.Name, t => { t.As().Record = new RoutableRecord(); t.Title = "This Is Some Interesting Title"; }); - - var thing2 = contentManager.Create(ThingDriver.ContentType.Name , t => - { + + var thing2 = contentManager.Create(ThingDriver.ContentType.Name, t => { t.As().Record = new RoutableRecord(); t.Title = "This Is Some Interesting Title"; }); @@ -160,18 +159,15 @@ namespace Orchard.Core.Tests.Common.Services { } [Test] - public void SlugsCanBeDuplicatedAccrossContentTypes() - { + public void SlugsCanBeDuplicatedAccrossContentTypes() { var contentManager = _container.Resolve(); - var thing = contentManager.Create(ThingDriver.ContentType.Name, t => - { + var thing = contentManager.Create(ThingDriver.ContentType.Name, t => { t.As().Record = new RoutableRecord(); t.Title = "This Is Some Interesting Title"; }); - var stuff = contentManager.Create(StuffDriver.ContentType.Name, s => - { + var stuff = contentManager.Create(StuffDriver.ContentType.Name, s => { s.As().Record = new RoutableRecord(); s.Title = "This Is Some Interesting Title"; }); @@ -195,8 +191,7 @@ namespace Orchard.Core.Tests.Common.Services { [UsedImplicitly] public class ThingHandler : ContentHandler { - public ThingHandler() - { + public ThingHandler() { Filters.Add(new ActivatingFilter(ThingDriver.ContentType.Name)); Filters.Add(new ActivatingFilter>(ThingDriver.ContentType.Name)); Filters.Add(new ActivatingFilter(ThingDriver.ContentType.Name)); @@ -217,7 +212,7 @@ namespace Orchard.Core.Tests.Common.Services { set { this.As().Slug = value; } } } - + public class ThingDriver : ContentItemDriver { public readonly static ContentType ContentType = new ContentType { Name = "thing", @@ -226,10 +221,8 @@ namespace Orchard.Core.Tests.Common.Services { } [UsedImplicitly] - public class StuffHandler : ContentHandler - { - public StuffHandler() - { + public class StuffHandler : ContentHandler { + public StuffHandler() { Filters.Add(new ActivatingFilter(StuffDriver.ContentType.Name)); Filters.Add(new ActivatingFilter>(StuffDriver.ContentType.Name)); Filters.Add(new ActivatingFilter(StuffDriver.ContentType.Name)); @@ -237,27 +230,22 @@ namespace Orchard.Core.Tests.Common.Services { } } - public class Stuff : ContentPart - { + public class Stuff : ContentPart { public int Id { get { return ContentItem.Id; } } - public string Title - { + public string Title { get { return this.As().Title; } set { this.As().Title = value; } } - public string Slug - { + public string Slug { get { return this.As().Slug; } set { this.As().Slug = value; } } } - public class StuffDriver : ContentItemDriver - { - public readonly static ContentType ContentType = new ContentType - { + public class StuffDriver : ContentItemDriver { + public readonly static ContentType ContentType = new ContentType { Name = "stuff", DisplayName = "Stuff" }; diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs index 887fa244f..cf3d73786 100644 --- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs +++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs @@ -28,7 +28,9 @@ namespace Orchard.Core.Tests.Scheduling { _handler = new StubTaskHandler(); builder.RegisterInstance(new Mock().Object); builder.RegisterType().As(); - builder.RegisterType().As().Named("ScheduledTaskExecutor", typeof (IBackgroundTask)); + builder.RegisterType().As(); + + builder.RegisterType().As().Named("ScheduledTaskExecutor", typeof(IBackgroundTask)); builder.RegisterInstance(_handler).As(); } @@ -98,7 +100,7 @@ namespace Orchard.Core.Tests.Scheduling { Assert.That(_handler.TaskContext, Is.Null); _executor.Sweep(); Assert.That(_handler.TaskContext, Is.Not.Null); - + Assert.That(_handler.TaskContext.Task.TaskType, Is.EqualTo("Ignore")); Assert.That(_handler.TaskContext.Task.ContentItem, Is.Null); } diff --git a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs index a8db8cabd..fe58b9a06 100644 --- a/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs +++ b/src/Orchard.Core.Tests/Scheduling/ScheduledTaskManagerTests.cs @@ -26,12 +26,14 @@ namespace Orchard.Core.Tests.Scheduling { _repository = _container.Resolve>(); _scheduledTaskManager = _container.Resolve(); _contentManager = _container.Resolve(); - _mockServices.SetupGet(x=>x.ContentManager).Returns(_contentManager); + _mockServices.SetupGet(x => x.ContentManager).Returns(_contentManager); } - public override void Register(ContainerBuilder builder) { + public override void Register(ContainerBuilder builder) { builder.RegisterInstance(_mockServices.Object); builder.RegisterType().As(); + builder.RegisterType().As(); + builder.RegisterType().As(); } @@ -86,7 +88,7 @@ namespace Orchard.Core.Tests.Scheduling { public void TasksForAllVersionsOfContenItemShouldBeReturned() { var hello1 = _contentManager.New("hello"); _contentManager.Create(hello1); - + var hello2 = _contentManager.GetDraftRequired(hello1.Id); Assert.That(hello1.Version, Is.EqualTo(1)); diff --git a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs index 71c22f209..8b37ebe65 100644 --- a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs +++ b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs @@ -43,6 +43,8 @@ namespace Orchard.Tests.ContentManagement { // builder.RegisterModule(new ImplicitCollectionSupportModule()); builder.RegisterModule(new ContentModule()); builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); @@ -285,7 +287,7 @@ namespace Orchard.Tests.ContentManagement { init.As().Record.Quad = "v3"; }); _session.Flush(); - _session.Clear(); + _session.Clear(); } [Test] diff --git a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs index dff2a8180..36de12e5d 100644 --- a/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs +++ b/src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs @@ -42,6 +42,8 @@ namespace Orchard.Tests.ContentManagement { var builder = new ContainerBuilder(); //builder.RegisterModule(new ImplicitCollectionSupportModule()); builder.RegisterType().As(); + builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); diff --git a/src/Orchard.sln b/src/Orchard.sln index 19b55394d..6a548748d 100644 --- a/src/Orchard.sln +++ b/src/Orchard.sln @@ -63,14 +63,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Modules", "Orchard. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Profile", "Orchard.Profile\Orchard.Profile.csproj", "{94E694A2-D140-468D-A277-C5FCE1D13E9B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure", "Azure", "{55E8934A-9C5B-4647-8DE0-50E48B423339}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Azure", "Orchard.Azure\Orchard.Azure.csproj", "{2505AA84-65A6-43D0-9C27-4F44FD576284}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Azure.Web", "Orchard.Azure\Orchard.Azure.Web\Orchard.Azure.Web.csproj", "{0DF8F426-9F30-4918-8F64-A5B40BA12D10}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Azure.Tests", "Orchard.Azure.Tests\Orchard.Azure.Tests.csproj", "{1CC62F45-E6FF-43D5-84BF-509A1085D994}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -185,18 +177,6 @@ Global {94E694A2-D140-468D-A277-C5FCE1D13E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU {94E694A2-D140-468D-A277-C5FCE1D13E9B}.Release|Any CPU.ActiveCfg = Release|Any CPU {94E694A2-D140-468D-A277-C5FCE1D13E9B}.Release|Any CPU.Build.0 = Release|Any CPU - {2505AA84-65A6-43D0-9C27-4F44FD576284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2505AA84-65A6-43D0-9C27-4F44FD576284}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2505AA84-65A6-43D0-9C27-4F44FD576284}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2505AA84-65A6-43D0-9C27-4F44FD576284}.Release|Any CPU.Build.0 = Release|Any CPU - {0DF8F426-9F30-4918-8F64-A5B40BA12D10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DF8F426-9F30-4918-8F64-A5B40BA12D10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DF8F426-9F30-4918-8F64-A5B40BA12D10}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DF8F426-9F30-4918-8F64-A5B40BA12D10}.Release|Any CPU.Build.0 = Release|Any CPU - {1CC62F45-E6FF-43D5-84BF-509A1085D994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CC62F45-E6FF-43D5-84BF-509A1085D994}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CC62F45-E6FF-43D5-84BF-509A1085D994}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CC62F45-E6FF-43D5-84BF-509A1085D994}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -226,8 +206,5 @@ Global {4AB4B5B6-277E-4FF6-B69B-7AE9E16D2A56} = {383DBA32-4A3E-48D1-AAC3-75377A694452} {33B1BC8D-E292-4972-A363-22056B207156} = {383DBA32-4A3E-48D1-AAC3-75377A694452} {E65E5633-C0FF-453C-A906-481C14F969D6} = {E75A4CE4-CAA6-41E4-B951-33ACC60DC77C} - {2505AA84-65A6-43D0-9C27-4F44FD576284} = {55E8934A-9C5B-4647-8DE0-50E48B423339} - {0DF8F426-9F30-4918-8F64-A5B40BA12D10} = {55E8934A-9C5B-4647-8DE0-50E48B423339} - {1CC62F45-E6FF-43D5-84BF-509A1085D994} = {55E8934A-9C5B-4647-8DE0-50E48B423339} EndGlobalSection EndGlobal