From 39d930376956b14e9f5a755b2c5556a8a4e099d6 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 13 Nov 2015 11:22:53 -0800
Subject: [PATCH] Reacting to DI changes

---
 .../DatabaseErrorPageMiddlewareTest.cs                      | 6 +++---
 .../MigrationsEndPointMiddlewareTest.cs                     | 4 ++--
 .../RuntimeInfoMiddlewareTest.cs                            | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index 92fa6cf3e2..43b32a76b6 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -269,7 +269,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
 
                     var optionsBuilder = new DbContextOptionsBuilder();
                     optionsBuilder.UseSqlServer(database.ConnectionString);
-                    services.AddInstance<DbContextOptions>(optionsBuilder.Options);
+                    services.AddSingleton<DbContextOptions>(optionsBuilder.Options);
                 });
 
                 HttpResponseMessage response = await server.CreateClient().GetAsync("http://localhost/");
@@ -307,7 +307,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                     {
                         optionsBuilder.UseInMemoryDatabase();
                     }
-                    services.AddInstance<DbContextOptions>(optionsBuilder.Options);
+                    services.AddSingleton<DbContextOptions>(optionsBuilder.Options);
                 });
 
                 var ex = await Assert.ThrowsAsync<SqlException>(async () =>
@@ -431,7 +431,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                     {
                         optionsBuilder.UseInMemoryDatabase();
                     }
-                    services.AddInstance(optionsBuilder.Options);
+                    services.AddSingleton(optionsBuilder.Options);
                 });
             }
         }
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
index 4f77e23ec7..32af175ef1 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
@@ -86,7 +86,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                 {
                     services.AddEntityFramework().AddSqlServer();
                     services.AddScoped<BloggingContextWithMigrations>();
-                    services.AddInstance(optionsBuilder.Options);
+                    services.AddSingleton(optionsBuilder.Options);
                 });
 
                 using (var db = BloggingContextWithMigrations.CreateWithoutExternalServiceProvider(optionsBuilder.Options))
@@ -190,7 +190,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                     {
                         services.AddEntityFramework().AddSqlServer();
                         services.AddScoped<BloggingContextWithSnapshotThatThrows>();
-                        services.AddInstance(optionsBuilder.Options);
+                        services.AddSingleton(optionsBuilder.Options);
                     });
 
                 var formData = new FormUrlEncodedContent(new List<KeyValuePair<string, string>>
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
index 97fbab1f46..44574b3e39 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/RuntimeInfoMiddlewareTest.cs
@@ -204,9 +204,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
                     .Returns(responseStream);
                 contextMock
                     .SetupGet(c => c.ApplicationServices)
-                    .Returns(new ServiceCollection().
-                                AddInstance<HtmlEncoder>(new HtmlTestEncoder()).
-                                BuildServiceProvider());
+                    .Returns(new ServiceCollection()
+                                .AddSingleton<HtmlEncoder>(new HtmlTestEncoder())
+                                .BuildServiceProvider());
 
                 // Act
                 await middleware.Invoke(contextMock.Object);