lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Refactoring IModule and ITheme related services

Browse Source 
Changing component layering to allow more efficient dependencies
Marking several interfaces and services obsolete to produce warnings
Changing ITheme to FeatureDescriptor as a first step

--HG--
branch : perf
extra : rebase_source : 905b69eb1cc6ed05750908e41a2d0846dde22001
This commit is contained in:
Louis DeJardin
2010-11-04 16:04:50 -07:00
parent 035c60fb90
commit 04bb3d90dc
30 changed files with 153 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Tests.Modules/Themes/Services/ThemeServiceTests.cs
+5 -5
View File
@@ -105,15 +105,15 @@ namespace Orchard.Tests.Modules.Themes.Services {
public void ThemeWithNoBaseThemeCanBeSetAsSiteTheme() {
_themeService.SetSiteTheme("ThemeOne");
var siteTheme = _themeService.GetSiteTheme();
Assert.That(siteTheme.ThemeName, Is.EqualTo("ThemeOne"));
Assert.That(siteTheme.Name, Is.EqualTo("ThemeOne"));
}
[Test]
public void ThemeWithAvailableBaseThemeCanBeSetAsSiteTheme() {
_themeService.SetSiteTheme("ThemeTwo");
var siteTheme = _themeService.GetSiteTheme();
Assert.That(siteTheme.ThemeName, Is.EqualTo("ThemeTwo"));
Assert.That(siteTheme.BaseTheme, Is.EqualTo("ThemeOne"));
Assert.That(siteTheme.Name, Is.EqualTo("ThemeTwo"));
Assert.That(siteTheme.Extension.BaseTheme, Is.EqualTo("ThemeOne"));
}
[Test]
@@ -121,7 +121,7 @@ namespace Orchard.Tests.Modules.Themes.Services {
_themeService.SetSiteTheme("ThemeOne");
_themeService.SetSiteTheme("ThemeThree");
var siteTheme = _themeService.GetSiteTheme();
Assert.That(siteTheme.ThemeName, Is.EqualTo("ThemeOne"));
Assert.That(siteTheme.Name, Is.EqualTo("ThemeOne"));
}
[Test]
@@ -133,7 +133,7 @@ namespace Orchard.Tests.Modules.Themes.Services {
Assert.That(ex.Message, Is.StringMatching("ThemeFiveBasedOnFour"));
}
var siteTheme = _themeService.GetSiteTheme();
Assert.That(siteTheme.ThemeName, Is.EqualTo("ThemeOne"));
Assert.That(siteTheme.Name, Is.EqualTo("ThemeOne"));
}
[Test]
src/Orchard.Tests.Modules/Widgets/Services/WidgetsServiceTest.cs
+7 -6
View File
@@ -16,6 +16,7 @@ using Orchard.DisplayManagement.Descriptors;
using Orchard.DisplayManagement.Implementation;
using Orchard.Environment;
using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Models;
using Orchard.Security;
using Orchard.Tests.Stubs;
using Orchard.Themes;
@@ -25,7 +26,7 @@ using Orchard.Widgets.Models;
using Orchard.Widgets.Services;
namespace Orchard.Tests.Modules.Widgets.Services {
[TestFixture]
public class WidgetsServiceTest : DatabaseEnabledTestsBase {
@@ -87,11 +88,11 @@ namespace Orchard.Tests.Modules.Widgets.Services {
builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
builder.RegisterType<WidgetsService>().As<IWidgetsService>();
builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
Theme theme1 = new Theme { Zones = ThemeZoneName1 };
Theme theme2 = new Theme { Zones = ThemeZoneName2 };
var theme1 = new FeatureDescriptor { Extension = new ExtensionDescriptor { Zones = ThemeZoneName1 } };
var theme2 = new FeatureDescriptor { Extension = new ExtensionDescriptor { Zones = ThemeZoneName2 } };
Mock<IThemeService> themeServiceMock = new Mock<IThemeService>();
themeServiceMock.Setup(x => x.GetInstalledThemes()).Returns(
(new ITheme[] { theme1, theme2 }));
(new FeatureDescriptor[] { theme1, theme2 }));
builder.RegisterInstance(themeServiceMock.Object).As<IThemeService>();
builder.RegisterType<StubWidgetPartHandler>().As<IContentHandler>();
@@ -153,7 +154,7 @@ namespace Orchard.Tests.Modules.Widgets.Services {
WidgetPart widgetPart = _widgetService.CreateWidget(layerPart.Id, "HtmlWidget", WidgetTitle1, "1", "");
Assert.That(widgetPart, Is.Not.Null);
widgetResult = _widgetService.GetWidget(0);
Assert.That(widgetResult, Is.Null, "Still yields null on an invalid identifier");
@@ -225,7 +226,7 @@ namespace Orchard.Tests.Modules.Widgets.Services {
widgetPart1 = _widgetService.GetWidget(widgetPart1.Id);
Assert.That(widgetPart1.Position, Is.EqualTo(Position2), "First widget moved to second widget position");
widgetPart2 = _widgetService.GetWidget(widgetPart2.Id);
Assert.That(widgetPart2.Position, Is.EqualTo(Position1), "Second widget moved to first widget position");