From 7bd7b32fcb71311bbc5b9f2a3d4761f7eb4784a8 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 4 Mar 2016 10:30:35 -0800
Subject: [PATCH] Reacting to Localization CookieName change

---
 src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs | 2 +-
 .../LocalizationSampleTest.cs                              | 7 ++++---
 .../ViewEngineTests.cs                                     | 7 +++++--
 .../RazorPageActivatorTest.cs                              | 1 -
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs b/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
index 3fddf90af7..3e2dbd0429 100644
--- a/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
@@ -8,7 +8,7 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.PlatformAbstractions;
 
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LocalizationSampleTest.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LocalizationSampleTest.cs
index ccd74a80aa..a65edd7c0c 100644
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LocalizationSampleTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LocalizationSampleTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Testing;
 using Microsoft.Net.Http.Headers;
 using Xunit;
@@ -61,7 +62,7 @@ mypartial
             var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/");
             request.Headers.Add(
                 "Cookie",
-                new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString());
+                new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
 
             // Act
             var response = await Client.SendAsync(request);
@@ -99,7 +100,7 @@ mypartial
             var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Home/Locpage");
             request.Headers.Add(
                 "Cookie",
-                new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString());
+                new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
 
             // Act
             var response = await Client.SendAsync(request);
@@ -126,7 +127,7 @@ mypartial
             var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/Home/GetInvalidUser");
             request.Headers.Add(
                 "Cookie",
-                new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString());
+                new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
 
             // Act
             var response = await Client.SendAsync(request);
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
index fbd06344d5..88a1a4235d 100644
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Localization;
 using Microsoft.AspNetCore.Testing;
 using Microsoft.Net.Http.Headers;
 using Xunit;
@@ -148,7 +149,8 @@ expander-partial";
             // Arrange
             var cultureCookie = "c=" + value + "|uic=" + value;
             var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TemplateExpander");
-            request.Headers.Add("Cookie", new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString());
+            request.Headers.Add("Cookie",
+                new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
 
             // Act
             var response = await Client.SendAsync(request);
@@ -289,7 +291,8 @@ index-content";
             // Arrange
             var cultureCookie = "c=" + value + "|uic=" + value;
             var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost/TemplateExpander/ViewWithLayout");
-            request.Headers.Add("Cookie", new CookieHeaderValue("ASPNET_CULTURE", cultureCookie).ToString());
+            request.Headers.Add("Cookie",
+                new CookieHeaderValue(CookieRequestCultureProvider.DefaultCookieName, cultureCookie).ToString());
 
             // Act
             var response = await Client.SendAsync(request);
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
index 14fe2fc8c9..87b4fe7639 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
@@ -319,7 +319,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor
             }
         }
 
-        private class MyService : IViewContextAware
         private class HasIncorrectViewDataPropertyType : RazorPage<MyModel>
         {
             [RazorInject]