From 6692f3e7b72b879393ef424d3a237351e689b7d1 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 29 Aug 2018 19:02:35 +0200
Subject: [PATCH] Post-merge fixes

---
 src/Umbraco.Tests/Manifest/ManifestParserTests.cs           | 4 +---
 src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs | 3 ---
 src/Umbraco.Web/UmbracoInjectedModule.cs                    | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index 2bbd70e367..a399e75cff 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using Moq;
 using System.Text;
-using LightInject;
 using NUnit.Framework;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -19,14 +18,13 @@ namespace Umbraco.Tests.Manifest
     [TestFixture]
     public class ManifestParserTests
     {
-
         private ManifestParser _parser;
 
         [SetUp]
         public void Setup()
         {
             Current.Reset();
-            var container = Mock.Of<IServiceContainer>();
+            var container = Mock.Of<IContainer>();
             Current.Container = container;
 
             var serviceContext = new ServiceContext(
diff --git a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
index 881fe79053..a74b8e3869 100644
--- a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
@@ -152,7 +152,6 @@ namespace Umbraco.Tests.Web.Controllers
                 var publishedSnapshot = Mock.Of<IPublishedSnapshotService>();
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var usersController = new ContentController(publishedSnapshot, propertyEditorCollection);
-                Container.InjectProperties(usersController);
                 return usersController;
             }
 
@@ -180,7 +179,6 @@ namespace Umbraco.Tests.Web.Controllers
                 var publishedSnapshot = Mock.Of<IPublishedSnapshotService>();
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var usersController = new ContentController(publishedSnapshot, propertyEditorCollection);
-                Container.InjectProperties(usersController);
                 return usersController;
             }
 
@@ -220,7 +218,6 @@ namespace Umbraco.Tests.Web.Controllers
                 var publishedSnapshot = Mock.Of<IPublishedSnapshotService>();
                 var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
                 var usersController = new ContentController(publishedSnapshot, propertyEditorCollection);
-                Container.InjectProperties(usersController);
                 return usersController;
             }
 
diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs
index 84a5e98102..39f1ff3599 100644
--- a/src/Umbraco.Web/UmbracoInjectedModule.cs
+++ b/src/Umbraco.Web/UmbracoInjectedModule.cs
@@ -483,7 +483,7 @@ namespace Umbraco.Web
             app.BeginRequest += (sender, e) =>
             {
                 var httpContext = ((HttpApplication) sender).Context;
-                _logger.Debug<UmbracoModule>(() => $"Begin request: {httpContext.Request.Url}.");
+                _logger.Verbose<UmbracoModule>("Begin request {RequestUrl}", httpContext.Request.Url);
                 BeginRequest(new HttpContextWrapper(httpContext));
             };
 
@@ -526,7 +526,7 @@ namespace Umbraco.Web
 
                 if (UmbracoContext.Current != null && UmbracoContext.Current.IsFrontEndUmbracoRequest)
                 {
-                    _logger.Debug<UmbracoModule>(() => $"End Request. ({DateTime.Now.Subtract(UmbracoContext.Current.ObjectCreated).TotalMilliseconds}ms)");
+                    _logger.Verbose<UmbracoModule>("End Request {RequestUrl} ({RequestDuration}ms)", httpContext.Request.Url, DateTime.Now.Subtract(UmbracoContext.Current.ObjectCreated).TotalMilliseconds);
                 }
 
                 UmbracoModule.OnEndRequest(this, new UmbracoRequestEventArgs(UmbracoContext.Current, new HttpContextWrapper(httpContext)));