From fc1017fba8761ddfede9b96a24787472bf15d874 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Tue, 24 Mar 2015 13:42:27 -0700 Subject: [PATCH] Quick fixes: Clean up test code - remove useless `configuration` variables and `Configuration` instances - remove "Review" code comment - unintentionally included in commit 4b5dd19 - reduce repeated code in `TestHelper` for functional tests - `CreateServer()` methods had duplicate code, an ambiguous match, and an odd order - rename `GetTestConfiguration()` to `UseCultureReplacer()` in functional tests --- .../RazorPreCompileModule.cs | 1 - .../TestHelper.cs | 55 ++++++++++--------- .../MvcServiceCollectionExtensionsTest.cs | 4 +- .../ActionConstraintsWebSite/Startup.cs | 2 +- test/WebSites/ActionResultsWebSite/Startup.cs | 2 +- test/WebSites/ActivatorWebSite/Startup.cs | 2 +- test/WebSites/AddServicesWebSite/Startup.cs | 2 +- test/WebSites/AntiForgeryWebSite/Startup.cs | 2 +- test/WebSites/ApiExplorerWebSite/Startup.cs | 2 +- .../ApplicationModelWebSite/Startup.cs | 2 +- test/WebSites/AutofacWebSite/Startup.cs | 2 +- test/WebSites/BasicWebSite/Startup.cs | 2 +- .../Startup.cs | 2 +- .../CompositeViewEngineWebSite/Startup.cs | 2 +- .../ContentNegotiationWebSite/Startup.cs | 2 +- .../Startup.cs | 2 +- .../ControllersFromServicesWebSite/Startup.cs | 2 +- .../WebSites/CorsMiddlewareWebSite/Startup.cs | 2 +- test/WebSites/CorsWebSite/Startup.cs | 2 +- test/WebSites/CustomRouteWebSite/Startup.cs | 2 +- .../ErrorPageMiddlewareWebSite/Startup.cs | 2 +- test/WebSites/FilesWebSite/Startup.cs | 2 +- test/WebSites/FiltersWebSite/Startup.cs | 2 +- test/WebSites/FormatFilterWebSite/Startup.cs | 2 +- test/WebSites/FormatterWebSite/Startup.cs | 2 +- .../InlineConstraintsWebSite/Startup.cs | 2 +- test/WebSites/LoggingWebSite/Startup.cs | 2 +- test/WebSites/LowercaseUrlsWebSite/Startup.cs | 2 +- .../BuilderExtensions.cs | 13 +---- test/WebSites/ModelBindingWebSite/Startup.cs | 2 +- test/WebSites/MvcTagHelpersWebSite/Startup.cs | 2 +- .../WebSites/PrecompilationWebSite/Startup.cs | 2 +- .../RazorCompilerCacheWebSite/Startup.cs | 2 +- .../RazorEmbeddedViewsWebSite/Startup.cs | 2 +- .../Startup.cs | 2 +- test/WebSites/RazorWebSite/Startup.cs | 2 +- .../RequestServicesWebSite/Startup.cs | 2 +- test/WebSites/ResponseCacheWebSite/Startup.cs | 2 +- test/WebSites/RoutingWebSite/Startup.cs | 2 +- test/WebSites/TagHelpersWebSite/Startup.cs | 2 +- test/WebSites/TempDataWebSite/Startup.cs | 2 +- test/WebSites/UrlHelperWebSite/Startup.cs | 2 +- test/WebSites/ValidationWebSite/Startup.cs | 2 +- .../WebSites/ValueProvidersWebSite/Startup.cs | 2 +- test/WebSites/VersioningWebSite/Startup.cs | 2 +- test/WebSites/ViewComponentWebSite/Startup.cs | 2 +- .../WebApiCompatShimWebSite/Startup.cs | 2 +- test/WebSites/XmlFormattersWebSite/Startup.cs | 2 +- 48 files changed, 76 insertions(+), 85 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs b/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs index c67cd5930b..9984456c19 100644 --- a/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs +++ b/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs @@ -77,7 +77,6 @@ namespace Microsoft.AspNet.Mvc { } - // REVIEW: Welcome back to life delegating SP!!! private class WrappingServiceProvider : IServiceProvider { private readonly IServiceProvider _fallback; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs index 0f1a2f6860..2fe97df9ea 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs @@ -28,7 +28,11 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests string applicationWebSiteName, string applicationPath) { - return CreateServer(builder, applicationWebSiteName, applicationPath, configureServices: null); + return CreateServer( + builder, + applicationWebSiteName, + applicationPath, + configureServices: (Action)null); } public static TestServer CreateServer( @@ -43,6 +47,29 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests configureServices: configureServices); } + public static TestServer CreateServer( + Action builder, + string applicationWebSiteName, + string applicationPath, + Action configureServices) + { + return TestServer.Create( + builder, + services => AddTestServices(services, applicationWebSiteName, applicationPath, configureServices)); + } + + public static TestServer CreateServer( + Action builder, + string applicationWebSiteName, + Func configureServices) + { + return CreateServer( + builder, + applicationWebSiteName, + applicationPath: null, + configureServices: configureServices); + } + public static TestServer CreateServer( Action builder, string applicationWebSiteName, @@ -59,32 +86,6 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests }); } - public static TestServer CreateServer( - Action builder, - string applicationWebSiteName, - Func configureServices) - { - return TestServer.Create( - CallContextServiceLocator.Locator.ServiceProvider, - builder, - services => - { - AddTestServices(services, applicationWebSiteName, applicationPath: null, configureServices: null); - return configureServices(services); - }); - } - - public static TestServer CreateServer( - Action builder, - string applicationWebSiteName, - string applicationPath, - Action configureServices) - { - return TestServer.Create( - builder, - services => AddTestServices(services, applicationWebSiteName, applicationPath, configureServices)); - } - private static void AddTestServices( IServiceCollection services, string applicationWebSiteName, diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs index 42e1fdace5..4a04a4cc1e 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs @@ -52,12 +52,10 @@ namespace Microsoft.AspNet.Mvc // Arrange var collection = new ServiceCollection(); var assemblies = new[] { GetType().Assembly }; - var configuration = new Configuration(); var controllerTypes = new[] { typeof(ControllerTypeA), typeof(TypeBController) }; // Act - MvcServiceCollectionExtensions.WithControllersAsServices(collection, - assemblies); + MvcServiceCollectionExtensions.WithControllersAsServices(collection, assemblies); // Assert var services = collection.ToList(); diff --git a/test/WebSites/ActionConstraintsWebSite/Startup.cs b/test/WebSites/ActionConstraintsWebSite/Startup.cs index 9dc086c41a..56fdf979a0 100644 --- a/test/WebSites/ActionConstraintsWebSite/Startup.cs +++ b/test/WebSites/ActionConstraintsWebSite/Startup.cs @@ -21,7 +21,7 @@ namespace ActionConstraintsWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorReporter(); diff --git a/test/WebSites/ActionResultsWebSite/Startup.cs b/test/WebSites/ActionResultsWebSite/Startup.cs index 1831c91441..ac9c956220 100644 --- a/test/WebSites/ActionResultsWebSite/Startup.cs +++ b/test/WebSites/ActionResultsWebSite/Startup.cs @@ -23,7 +23,7 @@ namespace ActionResultsWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/ActivatorWebSite/Startup.cs b/test/WebSites/ActivatorWebSite/Startup.cs index aea7e32804..4cc6c77511 100644 --- a/test/WebSites/ActivatorWebSite/Startup.cs +++ b/test/WebSites/ActivatorWebSite/Startup.cs @@ -19,7 +19,7 @@ namespace ActivatorWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Used to report exceptions that MVC doesn't handle app.UseErrorReporter(); diff --git a/test/WebSites/AddServicesWebSite/Startup.cs b/test/WebSites/AddServicesWebSite/Startup.cs index ea551fee82..1ea169a487 100644 --- a/test/WebSites/AddServicesWebSite/Startup.cs +++ b/test/WebSites/AddServicesWebSite/Startup.cs @@ -9,7 +9,7 @@ namespace AddServicesWebSite { public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Not calling AddMvc() here. // The purpose of the Website is to demonstrate that it throws diff --git a/test/WebSites/AntiForgeryWebSite/Startup.cs b/test/WebSites/AntiForgeryWebSite/Startup.cs index a50256c979..c739f7c981 100644 --- a/test/WebSites/AntiForgeryWebSite/Startup.cs +++ b/test/WebSites/AntiForgeryWebSite/Startup.cs @@ -16,7 +16,7 @@ namespace AntiForgeryWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorReporter(); diff --git a/test/WebSites/ApiExplorerWebSite/Startup.cs b/test/WebSites/ApiExplorerWebSite/Startup.cs index a35eb07fe9..fed4c62045 100644 --- a/test/WebSites/ApiExplorerWebSite/Startup.cs +++ b/test/WebSites/ApiExplorerWebSite/Startup.cs @@ -33,7 +33,7 @@ namespace ApiExplorerWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/ApplicationModelWebSite/Startup.cs b/test/WebSites/ApplicationModelWebSite/Startup.cs index 28bf7b5789..9f01f0d79c 100644 --- a/test/WebSites/ApplicationModelWebSite/Startup.cs +++ b/test/WebSites/ApplicationModelWebSite/Startup.cs @@ -24,7 +24,7 @@ namespace ApplicationModelWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/AutofacWebSite/Startup.cs b/test/WebSites/AutofacWebSite/Startup.cs index aef045f7d5..5a2ed66a9d 100644 --- a/test/WebSites/AutofacWebSite/Startup.cs +++ b/test/WebSites/AutofacWebSite/Startup.cs @@ -28,7 +28,7 @@ namespace AutofacWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/BasicWebSite/Startup.cs b/test/WebSites/BasicWebSite/Startup.cs index b2829640d2..52a69f5322 100644 --- a/test/WebSites/BasicWebSite/Startup.cs +++ b/test/WebSites/BasicWebSite/Startup.cs @@ -26,7 +26,7 @@ namespace BasicWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Add MVC to the request pipeline app.UseMvc(routes => diff --git a/test/WebSites/BestEffortLinkGenerationWebSite/Startup.cs b/test/WebSites/BestEffortLinkGenerationWebSite/Startup.cs index 0e91fbafa2..573fd0b357 100644 --- a/test/WebSites/BestEffortLinkGenerationWebSite/Startup.cs +++ b/test/WebSites/BestEffortLinkGenerationWebSite/Startup.cs @@ -22,7 +22,7 @@ namespace BestEffortLinkGenerationWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/CompositeViewEngineWebSite/Startup.cs b/test/WebSites/CompositeViewEngineWebSite/Startup.cs index b22550865d..496bcd521d 100644 --- a/test/WebSites/CompositeViewEngineWebSite/Startup.cs +++ b/test/WebSites/CompositeViewEngineWebSite/Startup.cs @@ -22,7 +22,7 @@ namespace CompositeViewEngineWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Add MVC to the request pipeline app.UseMvc(routes => diff --git a/test/WebSites/ContentNegotiationWebSite/Startup.cs b/test/WebSites/ContentNegotiationWebSite/Startup.cs index 2eb29bd44a..52502729a7 100644 --- a/test/WebSites/ContentNegotiationWebSite/Startup.cs +++ b/test/WebSites/ContentNegotiationWebSite/Startup.cs @@ -22,7 +22,7 @@ namespace ContentNegotiationWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorReporter(); diff --git a/test/WebSites/ControllerDiscoveryConventionsWebSite/Startup.cs b/test/WebSites/ControllerDiscoveryConventionsWebSite/Startup.cs index 8088071840..ca73d56fb1 100644 --- a/test/WebSites/ControllerDiscoveryConventionsWebSite/Startup.cs +++ b/test/WebSites/ControllerDiscoveryConventionsWebSite/Startup.cs @@ -16,7 +16,7 @@ namespace ControllerDiscoveryConventionsWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/ControllersFromServicesWebSite/Startup.cs b/test/WebSites/ControllersFromServicesWebSite/Startup.cs index e401bbb095..2068193550 100644 --- a/test/WebSites/ControllersFromServicesWebSite/Startup.cs +++ b/test/WebSites/ControllersFromServicesWebSite/Startup.cs @@ -46,7 +46,7 @@ namespace ControllersFromServicesWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/CorsMiddlewareWebSite/Startup.cs b/test/WebSites/CorsMiddlewareWebSite/Startup.cs index 992b42ff67..87eb28ceae 100644 --- a/test/WebSites/CorsMiddlewareWebSite/Startup.cs +++ b/test/WebSites/CorsMiddlewareWebSite/Startup.cs @@ -15,7 +15,7 @@ namespace CorsMiddlewareWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseCors(policy => policy.WithOrigins("http://example.com")); app.UseMvc(); diff --git a/test/WebSites/CorsWebSite/Startup.cs b/test/WebSites/CorsWebSite/Startup.cs index d1fe200f5b..c80a725129 100644 --- a/test/WebSites/CorsWebSite/Startup.cs +++ b/test/WebSites/CorsWebSite/Startup.cs @@ -51,7 +51,7 @@ namespace CorsWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(); } diff --git a/test/WebSites/CustomRouteWebSite/Startup.cs b/test/WebSites/CustomRouteWebSite/Startup.cs index 745cd52d69..92d7356566 100644 --- a/test/WebSites/CustomRouteWebSite/Startup.cs +++ b/test/WebSites/CustomRouteWebSite/Startup.cs @@ -16,7 +16,7 @@ namespace CustomRouteWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs b/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs index 4ae731bd57..43f8ea9cca 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs +++ b/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs @@ -16,7 +16,7 @@ namespace ErrorPageMiddlewareWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorPage(); app.UseMvc(); diff --git a/test/WebSites/FilesWebSite/Startup.cs b/test/WebSites/FilesWebSite/Startup.cs index e2ad22d5c4..dc76c1f32a 100644 --- a/test/WebSites/FilesWebSite/Startup.cs +++ b/test/WebSites/FilesWebSite/Startup.cs @@ -16,7 +16,7 @@ namespace FilesWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMiddleware(); diff --git a/test/WebSites/FiltersWebSite/Startup.cs b/test/WebSites/FiltersWebSite/Startup.cs index 1d676396f6..c4a9abd87b 100644 --- a/test/WebSites/FiltersWebSite/Startup.cs +++ b/test/WebSites/FiltersWebSite/Startup.cs @@ -54,7 +54,7 @@ namespace FiltersWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorReporter(); diff --git a/test/WebSites/FormatFilterWebSite/Startup.cs b/test/WebSites/FormatFilterWebSite/Startup.cs index 304364b4fc..be74bbb352 100644 --- a/test/WebSites/FormatFilterWebSite/Startup.cs +++ b/test/WebSites/FormatFilterWebSite/Startup.cs @@ -32,7 +32,7 @@ namespace FormatFilterWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/FormatterWebSite/Startup.cs b/test/WebSites/FormatterWebSite/Startup.cs index 08c715a3c2..2fc267db76 100644 --- a/test/WebSites/FormatterWebSite/Startup.cs +++ b/test/WebSites/FormatterWebSite/Startup.cs @@ -28,7 +28,7 @@ namespace FormatterWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Add MVC to the request pipeline app.UseMvc(routes => diff --git a/test/WebSites/InlineConstraintsWebSite/Startup.cs b/test/WebSites/InlineConstraintsWebSite/Startup.cs index b900df5080..d7da3d4054 100644 --- a/test/WebSites/InlineConstraintsWebSite/Startup.cs +++ b/test/WebSites/InlineConstraintsWebSite/Startup.cs @@ -18,7 +18,7 @@ namespace InlineConstraints public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorReporter(); diff --git a/test/WebSites/LoggingWebSite/Startup.cs b/test/WebSites/LoggingWebSite/Startup.cs index a6ad5bc08f..3ff716705f 100644 --- a/test/WebSites/LoggingWebSite/Startup.cs +++ b/test/WebSites/LoggingWebSite/Startup.cs @@ -22,7 +22,7 @@ namespace LoggingWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.Map("/logs", (appBuilder) => { diff --git a/test/WebSites/LowercaseUrlsWebSite/Startup.cs b/test/WebSites/LowercaseUrlsWebSite/Startup.cs index 0dd95a6385..f09ba37ed6 100644 --- a/test/WebSites/LowercaseUrlsWebSite/Startup.cs +++ b/test/WebSites/LowercaseUrlsWebSite/Startup.cs @@ -19,7 +19,7 @@ namespace LowercaseUrlsWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/BuilderExtensions.cs b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/BuilderExtensions.cs index b66f98bd9d..dda25d6d7e 100644 --- a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/BuilderExtensions.cs +++ b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/BuilderExtensions.cs @@ -2,22 +2,15 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc.TestConfiguration; -using Microsoft.Framework.ConfigurationModel; -using Microsoft.Framework.DependencyInjection; namespace Microsoft.AspNet.Builder { public static class BuilderExtensions { - public static IConfiguration GetTestConfiguration(this IApplicationBuilder app) + // Should be added to the pipeline as early as possible. + public static IApplicationBuilder UseCultureReplacer(this IApplicationBuilder app) { - // Unconditionally place CultureReplacerMiddleware as early as possible in the pipeline. - app.UseMiddleware(); - - // Until we update all references, return a useful configuration. - var configuration = app.ApplicationServices.GetService() ?? new Configuration(); - - return configuration; + return app.UseMiddleware(); } public static IApplicationBuilder UseErrorReporter(this IApplicationBuilder app) diff --git a/test/WebSites/ModelBindingWebSite/Startup.cs b/test/WebSites/ModelBindingWebSite/Startup.cs index bac64f8e5a..a41113fa6f 100644 --- a/test/WebSites/ModelBindingWebSite/Startup.cs +++ b/test/WebSites/ModelBindingWebSite/Startup.cs @@ -37,7 +37,7 @@ namespace ModelBindingWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorReporter(); diff --git a/test/WebSites/MvcTagHelpersWebSite/Startup.cs b/test/WebSites/MvcTagHelpersWebSite/Startup.cs index e1eadfcf63..50fa8cd680 100644 --- a/test/WebSites/MvcTagHelpersWebSite/Startup.cs +++ b/test/WebSites/MvcTagHelpersWebSite/Startup.cs @@ -18,7 +18,7 @@ namespace MvcTagHelpersWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/PrecompilationWebSite/Startup.cs b/test/WebSites/PrecompilationWebSite/Startup.cs index 7a2df2e9d6..5a97b89547 100644 --- a/test/WebSites/PrecompilationWebSite/Startup.cs +++ b/test/WebSites/PrecompilationWebSite/Startup.cs @@ -17,7 +17,7 @@ namespace PrecompilationWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/RazorCompilerCacheWebSite/Startup.cs b/test/WebSites/RazorCompilerCacheWebSite/Startup.cs index a420f451d9..7fd492d1b9 100644 --- a/test/WebSites/RazorCompilerCacheWebSite/Startup.cs +++ b/test/WebSites/RazorCompilerCacheWebSite/Startup.cs @@ -20,7 +20,7 @@ namespace RazorCompilerCacheWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(); } diff --git a/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs b/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs index e5d415ebd3..6ddbe241bd 100644 --- a/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs +++ b/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs @@ -25,7 +25,7 @@ namespace RazorEmbeddedViewsWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs index e11771e1a8..712c39022f 100644 --- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs +++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs @@ -21,7 +21,7 @@ namespace RazorPageExecutionInstrumentationWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.Use(async (HttpContext context, Func next) => { diff --git a/test/WebSites/RazorWebSite/Startup.cs b/test/WebSites/RazorWebSite/Startup.cs index 116cb1561f..6dcb6c4219 100644 --- a/test/WebSites/RazorWebSite/Startup.cs +++ b/test/WebSites/RazorWebSite/Startup.cs @@ -29,7 +29,7 @@ namespace RazorWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Add MVC to the request pipeline app.UseMvc(routes => diff --git a/test/WebSites/RequestServicesWebSite/Startup.cs b/test/WebSites/RequestServicesWebSite/Startup.cs index b24472887f..0b654753c2 100644 --- a/test/WebSites/RequestServicesWebSite/Startup.cs +++ b/test/WebSites/RequestServicesWebSite/Startup.cs @@ -18,7 +18,7 @@ namespace RequestServicesWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Initializes the RequestId service for each request app.UseMiddleware(); diff --git a/test/WebSites/ResponseCacheWebSite/Startup.cs b/test/WebSites/ResponseCacheWebSite/Startup.cs index 8fa670b774..51c603bd20 100644 --- a/test/WebSites/ResponseCacheWebSite/Startup.cs +++ b/test/WebSites/ResponseCacheWebSite/Startup.cs @@ -41,7 +41,7 @@ namespace ResponseCacheWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { routes.MapRoute( diff --git a/test/WebSites/RoutingWebSite/Startup.cs b/test/WebSites/RoutingWebSite/Startup.cs index e0fe524b22..fad3606f0e 100644 --- a/test/WebSites/RoutingWebSite/Startup.cs +++ b/test/WebSites/RoutingWebSite/Startup.cs @@ -18,7 +18,7 @@ namespace RoutingWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorReporter(); diff --git a/test/WebSites/TagHelpersWebSite/Startup.cs b/test/WebSites/TagHelpersWebSite/Startup.cs index 363e456070..f1c2109c43 100644 --- a/test/WebSites/TagHelpersWebSite/Startup.cs +++ b/test/WebSites/TagHelpersWebSite/Startup.cs @@ -16,7 +16,7 @@ namespace TagHelpersWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/TempDataWebSite/Startup.cs b/test/WebSites/TempDataWebSite/Startup.cs index ddbf91a8af..e59dbacd6b 100644 --- a/test/WebSites/TempDataWebSite/Startup.cs +++ b/test/WebSites/TempDataWebSite/Startup.cs @@ -18,7 +18,7 @@ namespace TempDataWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseInMemorySession(); app.UseMvc(routes => diff --git a/test/WebSites/UrlHelperWebSite/Startup.cs b/test/WebSites/UrlHelperWebSite/Startup.cs index b170fbd982..53a1e37173 100644 --- a/test/WebSites/UrlHelperWebSite/Startup.cs +++ b/test/WebSites/UrlHelperWebSite/Startup.cs @@ -27,7 +27,7 @@ namespace UrlHelperWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Add MVC to the request pipeline diff --git a/test/WebSites/ValidationWebSite/Startup.cs b/test/WebSites/ValidationWebSite/Startup.cs index cc2e4c09e7..86e2d14e2f 100644 --- a/test/WebSites/ValidationWebSite/Startup.cs +++ b/test/WebSites/ValidationWebSite/Startup.cs @@ -17,7 +17,7 @@ namespace ValidationWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Set up file serving for JavaScript files. app.UseFileServer(); diff --git a/test/WebSites/ValueProvidersWebSite/Startup.cs b/test/WebSites/ValueProvidersWebSite/Startup.cs index 58a1cc54dd..9c1e5753ad 100644 --- a/test/WebSites/ValueProvidersWebSite/Startup.cs +++ b/test/WebSites/ValueProvidersWebSite/Startup.cs @@ -21,7 +21,7 @@ namespace ValueProvidersWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); // Add MVC to the request pipeline app.UseMvc(routes => diff --git a/test/WebSites/VersioningWebSite/Startup.cs b/test/WebSites/VersioningWebSite/Startup.cs index ce62d20d8e..2189bc9d5a 100644 --- a/test/WebSites/VersioningWebSite/Startup.cs +++ b/test/WebSites/VersioningWebSite/Startup.cs @@ -18,7 +18,7 @@ namespace VersioningWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/ViewComponentWebSite/Startup.cs b/test/WebSites/ViewComponentWebSite/Startup.cs index 03155cd33a..2a75336546 100644 --- a/test/WebSites/ViewComponentWebSite/Startup.cs +++ b/test/WebSites/ViewComponentWebSite/Startup.cs @@ -16,7 +16,7 @@ namespace ViewComponentWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseMvc(routes => { diff --git a/test/WebSites/WebApiCompatShimWebSite/Startup.cs b/test/WebSites/WebApiCompatShimWebSite/Startup.cs index a24e1ec041..12ad076f22 100644 --- a/test/WebSites/WebApiCompatShimWebSite/Startup.cs +++ b/test/WebSites/WebApiCompatShimWebSite/Startup.cs @@ -18,7 +18,7 @@ namespace WebApiCompatShimWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorReporter(); diff --git a/test/WebSites/XmlFormattersWebSite/Startup.cs b/test/WebSites/XmlFormattersWebSite/Startup.cs index 2c617752e1..dfc6e05acc 100644 --- a/test/WebSites/XmlFormattersWebSite/Startup.cs +++ b/test/WebSites/XmlFormattersWebSite/Startup.cs @@ -67,7 +67,7 @@ namespace XmlFormattersWebSite public void Configure(IApplicationBuilder app) { - var configuration = app.GetTestConfiguration(); + app.UseCultureReplacer(); app.UseErrorReporter();