From 1d76db4d3636420f1ecf1cbc1e12cbb1c8595d94 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 17 Mar 2016 16:43:52 -0700
Subject: [PATCH] Removing ifdefs from test Fixes #210

---
 samples/LocalizationSample/Startup.cs                 |  1 +
 .../LocalizationSampleTest.cs                         |  9 +++------
 .../LocalizationTest.cs                               |  9 +++------
 .../TestRunner.cs                                     | 11 ++++++-----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/samples/LocalizationSample/Startup.cs b/samples/LocalizationSample/Startup.cs
index c906275082..658abcc84f 100644
--- a/samples/LocalizationSample/Startup.cs
+++ b/samples/LocalizationSample/Startup.cs
@@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.PlatformAbstractions;
 
 namespace LocalizationSample
 {
diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs
index f1cd78c8ee..240439f675 100644
--- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs
+++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs
@@ -5,18 +5,15 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.Testing;
 using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.PlatformAbstractions;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Localization.FunctionalTests
 {
     public class LocalizationSampleTest
     {
-        private static readonly string _applicationPath =
-#if NET451
-            Path.GetFullPath(Path.Combine("..", "..", "..", "..", "..", "..", "samples", "LocalizationSample"));
-#else
-            Path.GetFullPath(Path.Combine("..", "..", "samples", "LocalizationSample"));
-#endif
+        private static readonly string _applicationPath = Path.GetFullPath(
+            Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "..", "..", "..", "..", "..", "..", "samples", "LocalizationSample"));
 
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs
index 4ca1734c38..e93e6601be 100644
--- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs
+++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs
@@ -5,18 +5,15 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.Testing;
 using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.Extensions.PlatformAbstractions;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Localization.FunctionalTests
 {
     public class LocalizationTest
     {
-        private static readonly string _applicationPath =
-#if NET451
-            Path.GetFullPath(Path.Combine("..", "..", "..", "..", "..", "LocalizationWebsite"));
-#else
-            Path.GetFullPath(Path.Combine("..", "LocalizationWebsite"));
-#endif
+        private static readonly string _applicationPath = Path.GetFullPath(
+            Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "..", "..", "..", "..", "..", "LocalizationWebsite"));
         
         [ConditionalTheory]
         [OSSkipCondition(OperatingSystems.Linux)]
diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs
index 436eef991e..a09456ecb6 100644
--- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs
+++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs
@@ -14,11 +14,12 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
     public class TestRunner
     {
         private string _applicationPath;
-        
-        public TestRunner(string applicationPath){
+
+        public TestRunner(string applicationPath)
+        {
             _applicationPath = applicationPath;
         }
-        
+
         private async Task<string> RunTestAndGetResponse(
             RuntimeFlavor runtimeFlavor,
             RuntimeArchitecture runtimeArchitecture,
@@ -61,7 +62,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
                 }
             }
         }
-        
+
         public async Task RunTestAndVerifyResponse(
             RuntimeFlavor runtimeFlavor,
             RuntimeArchitecture runtimeArchitecture,
@@ -74,7 +75,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
             Console.WriteLine("Response Text " + responseText);
             Assert.Equal(expectedText, responseText);
         }
-        
+
         public async Task RunTestAndVerifyResponseHeading(
             RuntimeFlavor runtimeFlavor,
             RuntimeArchitecture runtimeArchitecture,