From 84bfb8da3be4d6337553eb664e2a7955cdebc1fa Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Wed, 21 Oct 2015 14:13:16 -0700
Subject: [PATCH] Remove CallContextServiceLocator usages in tests

---
 .../Infrastructure/DefaultAssemblyProviderTests.cs           | 3 +--
 test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs  | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs
index a7adfadc12..386d5c0f13 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs
@@ -253,8 +253,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
 
             private static ILibraryManager GetLibraryManager()
             {
-                return CallContextServiceLocator.Locator.ServiceProvider
-                    .GetRequiredService<ILibraryManager>();
+                return PlatformServices.Default.LibraryManager;
             }
         }
     }
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs
index 7522a7b664..ce6d8f147e 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs
@@ -91,8 +91,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             Assembly startupAssembly,
             Func<IServiceCollection, IServiceProvider> buildServices)
         {
-            var applicationServices = CallContextServiceLocator.Locator.ServiceProvider;
-            var libraryManager = applicationServices.GetRequiredService<ILibraryManager>();
+            var libraryManager = PlatformServices.Default.LibraryManager;
 
             // When an application executes in a regular context, the application base path points to the root
             // directory where the application is located, for example .../samples/MvcSample.Web. However, when
@@ -104,7 +103,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             var library = libraryManager.GetLibrary(applicationName);
             var applicationRoot = Path.GetDirectoryName(library.Path);
 
-            var applicationEnvironment = applicationServices.GetRequiredService<IApplicationEnvironment>();
+            var applicationEnvironment = PlatformServices.Default.Application;
 
             return (services) =>
             {