From fa95120ddea5157c9897c0a715c6359a974ddfcc Mon Sep 17 00:00:00 2001
From: Hao Kung <haok@microsoft.com>
Date: Thu, 19 Mar 2015 11:38:20 -0700
Subject: [PATCH] React to hosting

---
 .../SessionTests.cs                           | 40 +++++++++----------
 .../project.json                              |  1 -
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/test/Microsoft.AspNet.Session.Tests/SessionTests.cs b/test/Microsoft.AspNet.Session.Tests/SessionTests.cs
index bb4d9447da..7aa2822c89 100644
--- a/test/Microsoft.AspNet.Session.Tests/SessionTests.cs
+++ b/test/Microsoft.AspNet.Session.Tests/SessionTests.cs
@@ -23,14 +23,14 @@ namespace Microsoft.AspNet.Session
         {
             using (var server = TestServer.Create(app =>
             {
-                app.UseServices(services => services.AddOptions());
                 app.UseInMemorySession();
                 app.Run(context =>
                 {
                     Assert.Null(context.Session.GetString("NotFound"));
                     return Task.FromResult(0);
                 });
-            }))
+            },
+            services => services.AddOptions()))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync("/");
@@ -45,7 +45,6 @@ namespace Microsoft.AspNet.Session
         {
             using (var server = TestServer.Create(app =>
             {
-                app.UseServices(services => services.AddOptions());
                 app.UseInMemorySession();
                 app.Run(context =>
                 {
@@ -54,7 +53,8 @@ namespace Microsoft.AspNet.Session
                     Assert.Equal("Value", context.Session.GetString("Key"));
                     return Task.FromResult(0);
                 });
-            }))
+            },
+            services => services.AddOptions()))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync("/");
@@ -71,7 +71,6 @@ namespace Microsoft.AspNet.Session
         {
             using (var server = TestServer.Create(app =>
             {
-                app.UseServices(services => services.AddOptions());
                 app.UseInMemorySession();
                 app.Run(context =>
                 {
@@ -85,7 +84,8 @@ namespace Microsoft.AspNet.Session
                     context.Session.SetInt("Key", value.Value + 1);
                     return context.Response.WriteAsync(value.Value.ToString());
                 });
-            }))
+            },
+            services => services.AddOptions()))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync("/first");
@@ -105,7 +105,6 @@ namespace Microsoft.AspNet.Session
         {
             using (var server = TestServer.Create(app =>
             {
-                app.UseServices(services => services.AddOptions());
                 app.UseInMemorySession();
                 app.Run(context =>
                 {
@@ -129,7 +128,8 @@ namespace Microsoft.AspNet.Session
                     }
                     return context.Response.WriteAsync(value.Value.ToString());
                 });
-            }))
+            },
+            services => services.AddOptions()))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync("/first");
@@ -148,7 +148,6 @@ namespace Microsoft.AspNet.Session
         {
             using (var server = TestServer.Create(app =>
             {
-                app.UseServices(services => services.AddOptions());
                 app.UseInMemorySession();
                 app.Run(context =>
                 {
@@ -172,7 +171,8 @@ namespace Microsoft.AspNet.Session
                     }
                     return context.Response.WriteAsync(value.Value.ToString());
                 });
-            }))
+            },
+            services => services.AddOptions()))
             {
                 var client = server.CreateClient();
                 var response = await client.GetAsync("/first");
@@ -193,17 +193,17 @@ namespace Microsoft.AspNet.Session
             var loggerFactory = new TestLoggerFactory(sink, enabled: true);
             using (var server = TestServer.Create(app =>
             {
-                app.UseServices(services => 
-                {
-                    services.AddOptions();
-                    services.AddInstance(typeof(ILoggerFactory), loggerFactory);
-                });
                 app.UseInMemorySession();
                 app.Run(context =>
                 {
                     context.Session.SetString("Key", "Value");
                     return Task.FromResult(0);
                 });
+            },
+            services =>
+            {
+                services.AddOptions();
+                services.AddInstance(typeof(ILoggerFactory), loggerFactory);
             }))
             {
                 var client = server.CreateClient();
@@ -222,11 +222,6 @@ namespace Microsoft.AspNet.Session
             var loggerFactory = new TestLoggerFactory(sink, enabled: true);
             using (var server = TestServer.Create(app =>
             {
-                app.UseServices(services =>
-                {
-                    services.AddOptions();
-                    services.AddInstance(typeof(ILoggerFactory), loggerFactory);
-                });
                 app.UseInMemorySession(configure: o => {
                     o.IdleTimeout = TimeSpan.FromMilliseconds(30);
                 });
@@ -246,6 +241,11 @@ namespace Microsoft.AspNet.Session
                     }
                     return context.Response.WriteAsync(value.Value.ToString());
                 });
+            },
+            services =>
+            {
+                services.AddOptions();
+                services.AddInstance(typeof(ILoggerFactory), loggerFactory);
             }))
             {
                 var client = server.CreateClient();
diff --git a/test/Microsoft.AspNet.Session.Tests/project.json b/test/Microsoft.AspNet.Session.Tests/project.json
index 2636aa9fc3..cd31e837c8 100644
--- a/test/Microsoft.AspNet.Session.Tests/project.json
+++ b/test/Microsoft.AspNet.Session.Tests/project.json
@@ -1,7 +1,6 @@
 {
   "dependencies": {
     "Microsoft.AspNet.Session": "1.0.0-*",
-    "Microsoft.AspNet.RequestContainer": "1.0.0-*",
     "Microsoft.AspNet.TestHost": "1.0.0-*",
     "Microsoft.Framework.Logging.Testing": "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"