From 6715d0a645a4790570276f91a61ac6dfb35c7207 Mon Sep 17 00:00:00 2001
From: jacalvar <jacalvar@microsoft.com>
Date: Tue, 1 Mar 2016 14:53:24 -0800
Subject: [PATCH] React to changes in Logging

---
 .../DefaultPocoTest.cs                               |  3 ++-
 .../UserManagerTest.cs                               | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DefaultPocoTest.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DefaultPocoTest.cs
index 6dd0cc33c1..25c2b84028 100644
--- a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DefaultPocoTest.cs
+++ b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DefaultPocoTest.cs
@@ -24,7 +24,6 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
             var services = new ServiceCollection();
 
             services
-                .AddLogging()
                 .AddEntityFramework()
                 .AddSqlServer()
                 .AddDbContext<IdentityDbContext>(o => o.UseSqlServer(fixture.ConnectionString))
@@ -32,6 +31,8 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
                 .AddIdentity<IdentityUser, IdentityRole>()
                 .AddEntityFrameworkStores<IdentityDbContext>();
 
+            services.AddLogging();
+
             var provider = services.BuildServiceProvider();
             _builder = new ApplicationBuilder(provider);
 
diff --git a/test/Microsoft.AspNetCore.Identity.Test/UserManagerTest.cs b/test/Microsoft.AspNetCore.Identity.Test/UserManagerTest.cs
index bd115e9ad1..b1c42d5808 100644
--- a/test/Microsoft.AspNetCore.Identity.Test/UserManagerTest.cs
+++ b/test/Microsoft.AspNetCore.Identity.Test/UserManagerTest.cs
@@ -36,13 +36,15 @@ namespace Microsoft.AspNetCore.Identity.Test
         {
             var services = new ServiceCollection()
                     .AddTransient<IUserStore<TestUser>, NoopUserStore>()
-                    .AddSingleton<IHttpContextAccessor, HttpContextAccessor>()
-                    .AddLogging();
+                    .AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+
+            services.AddLogging();
+
             services.AddIdentity<TestUser, TestRole>()
                 .AddUserManager<CustomUserManager>()
                 .AddRoleManager<CustomRoleManager>();
             var provider = services.BuildServiceProvider();
-            Assert.Same(provider.GetRequiredService<UserManager<TestUser>>(), 
+            Assert.Same(provider.GetRequiredService<UserManager<TestUser>>(),
                 provider.GetRequiredService<CustomUserManager>());
             Assert.Same(provider.GetRequiredService<RoleManager<TestRole>>(),
                 provider.GetRequiredService<CustomRoleManager>());
@@ -461,7 +463,7 @@ namespace Microsoft.AspNetCore.Identity.Test
             var pwd = "password";
             var hashed = "hashed";
             var rehashed = "rehashed";
-            
+
             store.Setup(s => s.GetPasswordHashAsync(user, CancellationToken.None))
                 .ReturnsAsync(hashed)
                 .Verifiable();
@@ -679,7 +681,7 @@ namespace Microsoft.AspNetCore.Identity.Test
         [Fact]
         public async Task ResetTokenCallNoopForTokenValueZero()
         {
-            var user = new TestUser() { UserName = Guid.NewGuid().ToString()};
+            var user = new TestUser() { UserName = Guid.NewGuid().ToString() };
             var store = new Mock<IUserLockoutStore<TestUser>>();
             store.Setup(x => x.ResetAccessFailedCountAsync(user, It.IsAny<CancellationToken>())).Returns(() =>
                {