From 9b1bd3be60764675d00557044fd8adbf0fedabfc Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lars-erik.aabech@markedspartner.no>
Date: Thu, 14 Jun 2018 19:14:39 +0200
Subject: [PATCH] UmbracoModule parameterless ctor removed. More notes / fixme.

---
 .../Routing/UmbracoModuleTests.cs             | 31 ++++++++++++++-----
 src/Umbraco.Web/UmbracoModule.cs              | 18 -----------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index b87f092a1d..8cbb790d8e 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -10,8 +10,16 @@ using Umbraco.Web;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Sync;
-using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Services;
+using Umbraco.Web.PublishedCache;
+using Umbraco.Web.Routing;
 
+// fixme - abstract container
+using LightInject;
+
 namespace Umbraco.Tests.Routing
 {
     [TestFixture]
@@ -24,13 +32,22 @@ namespace Umbraco.Tests.Routing
         {
             base.SetUp();
 
-            // fixme - use the full injected ctor, then we can ditch this one.
+            // fixme - be able to get the UmbracoModule from the container. any reason settings were from testobjects?
             //create the module
-            _module = new UmbracoModule
-            {
-                GlobalSettings = TestObjects.GetGlobalSettings(),
-                Logger = Mock.Of<ILogger>()
-            };
+            _module = new UmbracoModule
+            (
+                TestObjects.GetUmbracoSettings(),
+                TestObjects.GetGlobalSettings(),
+                Mock.Of<IUmbracoContextAccessor>(),
+                Container.GetInstance<IPublishedSnapshotService>(),
+                Container.GetInstance<IUserService>(),
+                new UrlProviderCollection(new IUrlProvider[0]),
+                Container.GetInstance<IRuntimeState>(),
+                Mock.Of<ILogger>(),
+                null, // fixme - PublishedRouter complexities...
+                Container.GetInstance<IUmbracoDatabaseFactory>(),
+                Mock.Of<IVariationContextAccessor>()
+            );
             var runtime = new RuntimeState(_module.Logger, new Lazy<IServerRegistrar>(), new Lazy<MainDom>(), Mock.Of<IUmbracoSettingsSection>(), _module.GlobalSettings);
 
             _module.Runtime = runtime;
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index 0efb2a2f85..7a12fd1130 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -94,24 +94,6 @@ namespace Umbraco.Web
 
         #endregion
 
-        // fixme - delete, just one usage in a test.
-        public UmbracoModule()
-            : this(
-                Current.Container.GetInstance<IUmbracoSettingsSection>(),
-                Current.Container.GetInstance<IGlobalSettings>(),
-                Current.Container.GetInstance<IUmbracoContextAccessor>(),
-                Current.Container.GetInstance<IPublishedSnapshotService>(),
-                Current.Container.GetInstance<IUserService>(),
-                Current.Container.GetInstance<UrlProviderCollection>(),
-                Current.Container.GetInstance<IRuntimeState>(),
-                Current.Container.GetInstance<ILogger>(),
-                Current.Container.GetInstance<PublishedRouter>(),
-                Current.Container.GetInstance<IUmbracoDatabaseFactory>(),
-                Current.Container.GetInstance<IVariationContextAccessor>()
-            )
-        {
-        }
-
         public UmbracoModule(
             IUmbracoSettingsSection umbracoSettings,
             IGlobalSettings globalSettings,