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

Fix build errors

This commit is contained in:
Victor Hurdugaci 2016-02-10 14:08:12 -08:00
parent 67611a81cb
commit 81ef98b7d5
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
[InlineData(RuntimeFlavor.Clr, "http://localhost:5080/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.Clr, "http://localhost:5080/", RuntimeArchitecture.x64)]
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5081/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5081/", RuntimeArchitecture.x64)]
public Task RunSite_WindowsOnly(RuntimeFlavor runtimeFlavor, string applicationBaseUrl, RuntimeArchitecture runtimeArchitecture) public Task RunSite_WindowsOnly(RuntimeFlavor runtimeFlavor, string applicationBaseUrl, RuntimeArchitecture runtimeArchitecture)
{ {
var testRunner = new TestRunner(_applicationPath); var testRunner = new TestRunner(_applicationPath);
@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.Windows)]
[InlineData(RuntimeFlavor.Mono, "http://localhost:5080/", RuntimeArchitecture.x64)] [InlineData(RuntimeFlavor.Clr, "http://localhost:5080/", RuntimeArchitecture.x64)]
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5081/", RuntimeArchitecture.x64)] [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5081/", RuntimeArchitecture.x64)]
public Task RunSite_NonWindowsOnly(RuntimeFlavor runtimeFlavor, string applicationBaseUrl, RuntimeArchitecture runtimeArchitecture) public Task RunSite_NonWindowsOnly(RuntimeFlavor runtimeFlavor, string applicationBaseUrl, RuntimeArchitecture runtimeArchitecture)
{ {

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

@ -21,8 +21,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
[InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)]
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)]
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Windows( public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Windows(
RuntimeFlavor runtimeFlavor, RuntimeFlavor runtimeFlavor,
string applicationBaseUrl, string applicationBaseUrl,
@ -41,8 +41,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
[InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)]
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)]
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Windows( public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Windows(
RuntimeFlavor runtimeFlavor, RuntimeFlavor runtimeFlavor,
string applicationBaseUrl, string applicationBaseUrl,
@ -61,8 +61,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
[InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)]
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)]
public Task Localization_ResourcesInFolder_ReturnNonLocalizedValue_CultureHierarchyTooDeep_Windows( public Task Localization_ResourcesInFolder_ReturnNonLocalizedValue_CultureHierarchyTooDeep_Windows(
RuntimeFlavor runtimeFlavor, RuntimeFlavor runtimeFlavor,
string applicationBaseUrl, string applicationBaseUrl,
@ -81,12 +81,12 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
[ConditionalFact] [ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.Windows)]
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Mono() public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Clr()
{ {
var testRunner = new TestRunner(_applicationPath); var testRunner = new TestRunner(_applicationPath);
return testRunner.RunTestAndVerifyResponse( return testRunner.RunTestAndVerifyResponse(
RuntimeFlavor.Mono, RuntimeFlavor.Clr,
RuntimeArchitecture.x86, RuntimeArchitecture.x64,
"http://localhost:5072", "http://localhost:5072",
"ResourcesInFolder", "ResourcesInFolder",
"fr-FR", "fr-FR",
@ -96,12 +96,12 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
[ConditionalFact] [ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.Windows)]
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Mono() public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Clr()
{ {
var testRunner = new TestRunner(_applicationPath); var testRunner = new TestRunner(_applicationPath);
return testRunner.RunTestAndVerifyResponse( return testRunner.RunTestAndVerifyResponse(
RuntimeFlavor.Mono, RuntimeFlavor.Clr,
RuntimeArchitecture.x86, RuntimeArchitecture.x64,
"http://localhost:5072", "http://localhost:5072",
"ResourcesInFolder", "ResourcesInFolder",
"fr-FR-test", "fr-FR-test",
@ -141,8 +141,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
[ConditionalTheory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
[InlineData(RuntimeFlavor.Clr, "http://localhost:5074/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.Clr, "http://localhost:5074/", RuntimeArchitecture.x64)]
[InlineData(RuntimeFlavor.CoreClr, "http://localhost:5075/", RuntimeArchitecture.x86)] [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5075/", RuntimeArchitecture.x64)]
public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Windows( public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Windows(
RuntimeFlavor runtimeFlavor, RuntimeFlavor runtimeFlavor,
string applicationBaseUrl, string applicationBaseUrl,
@ -161,12 +161,12 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
[ConditionalFact] [ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.Windows)]
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Mono() public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Clr()
{ {
var testRunner = new TestRunner(_applicationPath); var testRunner = new TestRunner(_applicationPath);
return testRunner.RunTestAndVerifyResponse( return testRunner.RunTestAndVerifyResponse(
RuntimeFlavor.Mono, RuntimeFlavor.Clr,
RuntimeArchitecture.x86, RuntimeArchitecture.x64,
"http://localhost:5076", "http://localhost:5076",
"ResourcesAtRootFolder", "ResourcesAtRootFolder",
"fr-FR", "fr-FR",

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

@ -35,7 +35,6 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
var deploymentParameters = new DeploymentParameters(_applicationPath, ServerType.Kestrel, runtimeFlavor, runtimeArchitecture) var deploymentParameters = new DeploymentParameters(_applicationPath, ServerType.Kestrel, runtimeFlavor, runtimeArchitecture)
{ {
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
Command = "web",
EnvironmentName = environmentName EnvironmentName = environmentName
}; };