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

Continuing to refactor ModelDriver concept into ContentHandler

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041352
This commit is contained in:
loudej
2009-11-19 05:31:39 +00:00
parent 50da138925
commit 40632265f7
44 changed files with 248 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Orchard.Tests/Models/DefaultModelManagerTests.cs
View File

@@ -38,11 +38,11 @@ namespace Orchard.Tests.Models {
var builder = new ContainerBuilder();
builder.RegisterModule(new ImplicitCollectionSupportModule());
builder.Register<DefaultContentManager>().As<IContentManager>();
builder.Register<AlphaDriver>().As<IModelDriver>();
builder.Register<BetaDriver>().As<IModelDriver>();
builder.Register<GammaDriver>().As<IModelDriver>();
builder.Register<FlavoredDriver>().As<IModelDriver>();
builder.Register<StyledDriver>().As<IModelDriver>();
builder.Register<AlphaDriver>().As<IContentHandler>();
builder.Register<BetaDriver>().As<IContentHandler>();
builder.Register<GammaDriver>().As<IContentHandler>();
builder.Register<FlavoredDriver>().As<IContentHandler>();
builder.Register<StyledDriver>().As<IContentHandler>();
builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
@@ -139,7 +139,7 @@ namespace Orchard.Tests.Models {
}
[Test]
public void CreateShouldMakeModelAndModelTypeRecords() {
public void CreateShouldMakeModelAndContentTypeRecords() {
var beta = _manager.New("beta");
_manager.Create(beta);
@@ -148,13 +148,13 @@ namespace Orchard.Tests.Models {
Assert.That(modelRecord.ContentType.Name, Is.EqualTo("beta"));
}
private ContentItemRecord CreateModelRecord(string modelType) {
var modelRepository = _container.Resolve<IRepository<ContentItemRecord>>();
var modelTypeRepository = _container.Resolve<IRepository<ContentTypeRecord>>();
private ContentItemRecord CreateModelRecord(string contentType) {
var contentItemRepository = _container.Resolve<IRepository<ContentItemRecord>>();
var contentTypeRepository = _container.Resolve<IRepository<ContentTypeRecord>>();
var modelRecord = new ContentItemRecord { ContentType = new ContentTypeRecord { Name = modelType } };
modelTypeRepository.Create(modelRecord.ContentType);
modelRepository.Create(modelRecord);
var modelRecord = new ContentItemRecord { ContentType = new ContentTypeRecord { Name = contentType } };
contentTypeRepository.Create(modelRecord.ContentType);
contentItemRepository.Create(modelRecord);
_session.Flush();
_session.Clear();

8
src/Orchard.Tests/Models/Drivers/ModelDriverTests.cs
View File

@@ -14,7 +14,7 @@ namespace Orchard.Tests.Models.Drivers {
var part = new TestModelPart();
contentItem.Weld(part);
((IModelDriver)modelDriver).Creating(new CreateModelContext { ContentItem = contentItem });
((IContentHandler)modelDriver).Creating(new CreateContentContext { ContentItem = contentItem });
Assert.That(part.CreatingCalled, Is.True);
}
@@ -23,7 +23,7 @@ namespace Orchard.Tests.Models.Drivers {
var modelDriver = new TestModelDriver();
var builder = new ContentItemBuilder("testing");
((IModelDriver)modelDriver).Activating(new ActivatingModelContext { Builder = builder, ModelType = "testing" });
((IContentHandler)modelDriver).Activating(new ActivatingContentContext { Builder = builder, ContentType = "testing" });
var model = builder.Build();
Assert.That(model.Is<TestModelPart>(), Is.True);
Assert.That(model.As<TestModelPart>(), Is.Not.Null);
@@ -34,7 +34,7 @@ namespace Orchard.Tests.Models.Drivers {
}
public class TestModelDriver : ModelDriver {
public class TestModelDriver : ContentHandler {
public TestModelDriver() {
Filters.Add(new ActivatingFilter<TestModelPart>(x => x == "testing"));
Filters.Add(new TestModelStorageFilter());
@@ -42,7 +42,7 @@ namespace Orchard.Tests.Models.Drivers {
}
public class TestModelStorageFilter : StorageFilterBase<TestModelPart> {
protected override void Creating(CreateModelContext context, TestModelPart instance) {
protected override void Creating(CreateContentContext context, TestModelPart instance) {
instance.CreatingCalled = true;
}
}

6
src/Orchard.Tests/Models/Stubs/AlphaDriver.cs
View File

@@ -1,9 +1,9 @@
using Orchard.Models.Driver;
namespace Orchard.Tests.Models.Stubs {
public class AlphaDriver : ModelDriver {
protected override void Activating(ActivatingModelContext context) {
if (context.ModelType == "alpha") {
public class AlphaDriver : ContentHandler {
protected override void Activating(ActivatingContentContext context) {
if (context.ContentType == "alpha") {
context.Builder.Weld<Alpha>();
}
}

6
src/Orchard.Tests/Models/Stubs/BetaDriver.cs
View File

@@ -5,9 +5,9 @@ using System.Text;
using Orchard.Models.Driver;
namespace Orchard.Tests.Models.Stubs {
public class BetaDriver : ModelDriver {
protected override void Activating(ActivatingModelContext context) {
if (context.ModelType == "beta") {
public class BetaDriver : ContentHandler {
protected override void Activating(ActivatingContentContext context) {
if (context.ContentType == "beta") {
context.Builder.Weld<Beta>();
}
}

6
src/Orchard.Tests/Models/Stubs/FlavoredDriver.cs
View File

@@ -1,9 +1,9 @@
using Orchard.Models.Driver;
namespace Orchard.Tests.Models.Stubs {
public class FlavoredDriver : ModelDriver {
protected override void Activating(ActivatingModelContext context) {
if (context.ModelType == "beta" || context.ModelType == "alpha") {
public class FlavoredDriver : ContentHandler {
protected override void Activating(ActivatingContentContext context) {
if (context.ContentType == "beta" || context.ContentType == "alpha") {
context.Builder.Weld<Flavored>();
}
}

2
src/Orchard.Tests/Models/Stubs/Gamma.cs
View File

@@ -12,7 +12,7 @@ namespace Orchard.Tests.Models.Stubs {
}
public class GammaDriver : ModelDriver {
public class GammaDriver : ContentHandler {
public GammaDriver(IRepository<GammaRecord> repository){
Filters.Add(new ActivatingFilter<Gamma>(x => x == "gamma"));
Filters.Add(new StorageFilterForRecord<GammaRecord>(repository));

6
src/Orchard.Tests/Models/Stubs/StyledDriver.cs
View File

@@ -1,9 +1,9 @@
using Orchard.Models.Driver;
namespace Orchard.Tests.Models.Stubs {
public class StyledDriver : ModelDriver {
protected override void Activating(ActivatingModelContext context) {
if (context.ModelType == "alpha") {
public class StyledDriver : ContentHandler {
protected override void Activating(ActivatingContentContext context) {
if (context.ContentType == "alpha") {
context.Builder.Weld<Styled>();
}
}