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

Resolve test application paths more robustly 

This fixes tests on Mono for full framework
This commit is contained in:
= 2016-03-31 15:06:28 -07:00
parent 867b3b42cc
commit 6b6c658f6c
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,8 +12,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
{ {
public class LocalizationSampleTest public class LocalizationSampleTest
{ {
private static readonly string _applicationPath = Path.GetFullPath( private static readonly string _applicationPath = Path.Combine("samples", "LocalizationSample");
Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "..", "..", "..", "..", "..", "..", "samples", "LocalizationSample"));
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]

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

@ -12,8 +12,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
{ {
public class LocalizationTest public class LocalizationTest
{ {
private static readonly string _applicationPath = Path.GetFullPath( private static readonly string _applicationPath = Path.Combine("test", "LocalizationWebsite");
Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "..", "..", "..", "..", "..", "LocalizationWebsite"));
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]

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

@ -2,11 +2,13 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.IO;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.Testing; using Microsoft.AspNetCore.Server.Testing;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.PlatformAbstractions;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Localization.FunctionalTests namespace Microsoft.AspNetCore.Localization.FunctionalTests
@ -17,7 +19,27 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
public TestRunner(string applicationPath) public TestRunner(string applicationPath)
{ {
_applicationPath = applicationPath; _applicationPath = Path.Combine(ResolveRootFolder(PlatformServices.Default.Application.ApplicationBasePath), applicationPath);
}
private static string ResolveRootFolder(string projectFolder)
{
var di = new DirectoryInfo(projectFolder);
while (di.Parent != null)
{
var globalJsonPath = Path.Combine(di.FullName, "global.json");
if (File.Exists(globalJsonPath))
{
return di.FullName;
}
di = di.Parent;
}
// If we don't find any files then make the project folder the root
return projectFolder;
} }
private async Task<string> RunTestAndGetResponse( private async Task<string> RunTestAndGetResponse(