From 5e7a6cdcb7bb7f48dbf2d8f8c41d0275b16ec54c Mon Sep 17 00:00:00 2001
From: Louis DeJardin <Louis.DeJardin@microsoft.com>
Date: Sun, 7 Nov 2010 21:43:30 -0800
Subject: [PATCH] Unit tests passing

--HG--
branch : perf
---
 .../Widgets/Services/WidgetsServiceTest.cs           | 12 ++++++++++--
 .../Orchard.Widgets/Services/WidgetsService.cs       |  4 ----
 src/Orchard.Web/Themes/Primus/Theme.txt              |  1 +
 src/Orchard.Web/Themes/Secundus/Theme.txt            |  2 ++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Tests.Modules/Widgets/Services/WidgetsServiceTest.cs b/src/Orchard.Tests.Modules/Widgets/Services/WidgetsServiceTest.cs
index 25878e47e..bc95e5f69 100644
--- a/src/Orchard.Tests.Modules/Widgets/Services/WidgetsServiceTest.cs
+++ b/src/Orchard.Tests.Modules/Widgets/Services/WidgetsServiceTest.cs
@@ -17,6 +17,7 @@ using Orchard.DisplayManagement.Implementation;
 using Orchard.Environment;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Models;
+using Orchard.Environment.Features;
 using Orchard.Security;
 using Orchard.Tests.Stubs;
 using Orchard.Themes;
@@ -77,25 +78,32 @@ namespace Orchard.Tests.Modules.Widgets.Services {
         }
 
         public override void Register(ContainerBuilder builder) {
+            var mockFeatureManager = new Mock<IFeatureManager>();
+
+            var theme1 = new FeatureDescriptor {Extension = new ExtensionDescriptor {Zones = ThemeZoneName1}};
+            var theme2 = new FeatureDescriptor {Extension = new ExtensionDescriptor {Zones = ThemeZoneName2}};
+            mockFeatureManager.Setup(x => x.GetEnabledFeatures())
+                .Returns(new[] { theme1, theme2 });
+
             builder.RegisterType<DefaultContentManager>().As<IContentManager>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
             builder.RegisterInstance(new Mock<ITransactionManager>().Object);
             builder.RegisterInstance(new Mock<IAuthorizer>().Object);
             builder.RegisterInstance(new Mock<INotifier>().Object);
+            builder.RegisterInstance(mockFeatureManager.Object);
             builder.RegisterType<OrchardServices>().As<IOrchardServices>();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterType<WidgetsService>().As<IWidgetsService>();
             builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
-            var theme1 = new ExtensionDescriptor { Zones = ThemeZoneName1 } ;
-            var theme2 = new ExtensionDescriptor { Zones = ThemeZoneName2 } ;
 
 
             builder.RegisterType<StubWidgetPartHandler>().As<IContentHandler>();
             builder.RegisterType<StubLayerPartHandler>().As<IContentHandler>();
             builder.RegisterType<DefaultContentQuery>().As<IContentQuery>();
             builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
+
         }
 
         [Test]
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
index d241e77f3..97baa19fa 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
@@ -5,24 +5,20 @@ using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.Core.Common.Models;
 using Orchard.Environment.Features;
-using Orchard.Themes;
 using Orchard.Widgets.Models;
 
 namespace Orchard.Widgets.Services {
 
     [UsedImplicitly]
     public class WidgetsService : IWidgetsService {
-        private readonly IThemeManager _themeManager;
         private readonly IFeatureManager _featureManager;
         private readonly IContentManager _contentManager;
 
         public WidgetsService(
             IContentManager contentManager,
-            IThemeManager themeManager,
             IFeatureManager featureManager) {
 
             _contentManager = contentManager;
-            _themeManager = themeManager;
             _featureManager = featureManager;
         }
 
diff --git a/src/Orchard.Web/Themes/Primus/Theme.txt b/src/Orchard.Web/Themes/Primus/Theme.txt
index ec969317d..6e5cae697 100644
--- a/src/Orchard.Web/Themes/Primus/Theme.txt
+++ b/src/Orchard.Web/Themes/Primus/Theme.txt
@@ -4,3 +4,4 @@ Description: desc
 Version: 0.1
 Website: http://whereslou.com
 Zones: Main, Sidebar
+BaseTheme: TheThemeMachine
diff --git a/src/Orchard.Web/Themes/Secundus/Theme.txt b/src/Orchard.Web/Themes/Secundus/Theme.txt
index 5e4860dda..172eecbf1 100644
--- a/src/Orchard.Web/Themes/Secundus/Theme.txt
+++ b/src/Orchard.Web/Themes/Secundus/Theme.txt
@@ -4,3 +4,5 @@ Description: desc
 Version: 0.1
 Website: http://whereslou.com
 Zones: Main, Sidebar
+BaseTheme: Primus
+