huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing ifdefs from test 

Fixes #210
This commit is contained in:
Pranav K 2016-03-17 16:43:52 -07:00
parent 90235c7008
commit 1d76db4d36
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/LocalizationSample/Startup.cs
View File

@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Localization; using Microsoft.Extensions.Localization;
using Microsoft.Extensions.PlatformAbstractions;
namespace LocalizationSample namespace LocalizationSample
{ {

9
test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs
View File

@ -5,18 +5,15 @@ using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.Testing; using Microsoft.AspNetCore.Server.Testing;
using Microsoft.AspNetCore.Testing.xunit; using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.Extensions.PlatformAbstractions;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Localization.FunctionalTests namespace Microsoft.AspNetCore.Localization.FunctionalTests
{ {
public class LocalizationSampleTest public class LocalizationSampleTest
{ {
private static readonly string _applicationPath = private static readonly string _applicationPath = Path.GetFullPath(
#if NET451 Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "..", "..", "..", "..", "..", "..", "samples", "LocalizationSample"));
Path.GetFullPath(Path.Combine("..", "..", "..", "..", "..", "..", "samples", "LocalizationSample"));
#else
Path.GetFullPath(Path.Combine("..", "..", "samples", "LocalizationSample"));
#endif
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]

9
test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs
View File

@ -5,18 +5,15 @@ using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.Testing; using Microsoft.AspNetCore.Server.Testing;
using Microsoft.AspNetCore.Testing.xunit; using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.Extensions.PlatformAbstractions;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Localization.FunctionalTests namespace Microsoft.AspNetCore.Localization.FunctionalTests
{ {
public class LocalizationTest public class LocalizationTest
{ {
private static readonly string _applicationPath = private static readonly string _applicationPath = Path.GetFullPath(
#if NET451 Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "..", "..", "..", "..", "..", "LocalizationWebsite"));
Path.GetFullPath(Path.Combine("..", "..", "..", "..", "..", "LocalizationWebsite"));
#else
Path.GetFullPath(Path.Combine("..", "LocalizationWebsite"));
#endif
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]

11
test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs
View File

@ -14,11 +14,12 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
public class TestRunner public class TestRunner
{ {
private string _applicationPath; private string _applicationPath;
public TestRunner(string applicationPath){ public TestRunner(string applicationPath)
{
_applicationPath = applicationPath; _applicationPath = applicationPath;
} }
private async Task<string> RunTestAndGetResponse( private async Task<string> RunTestAndGetResponse(
RuntimeFlavor runtimeFlavor, RuntimeFlavor runtimeFlavor,
RuntimeArchitecture runtimeArchitecture, RuntimeArchitecture runtimeArchitecture,
@ -61,7 +62,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
} }
} }
} }
public async Task RunTestAndVerifyResponse( public async Task RunTestAndVerifyResponse(
RuntimeFlavor runtimeFlavor, RuntimeFlavor runtimeFlavor,
RuntimeArchitecture runtimeArchitecture, RuntimeArchitecture runtimeArchitecture,
@ -74,7 +75,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
Console.WriteLine("Response Text " + responseText); Console.WriteLine("Response Text " + responseText);
Assert.Equal(expectedText, responseText); Assert.Equal(expectedText, responseText);
} }
public async Task RunTestAndVerifyResponseHeading( public async Task RunTestAndVerifyResponseHeading(
RuntimeFlavor runtimeFlavor, RuntimeFlavor runtimeFlavor,
RuntimeArchitecture runtimeArchitecture, RuntimeArchitecture runtimeArchitecture,