From 81ef98b7d52f72ad41a4956770e9b3750b833a23 Mon Sep 17 00:00:00 2001 From: Victor Hurdugaci Date: Wed, 10 Feb 2016 14:08:12 -0800 Subject: [PATCH] Fix build errors --- .../LocalizationSampleTest.cs | 6 ++-- .../LocalizationTest.cs | 34 +++++++++---------- .../TestRunner.cs | 1 - 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs index b5f45aad4b..731c72e633 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs @@ -21,8 +21,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, "http://localhost:5080/", RuntimeArchitecture.x86)] - [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5081/", RuntimeArchitecture.x86)] + [InlineData(RuntimeFlavor.Clr, "http://localhost:5080/", RuntimeArchitecture.x64)] + [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5081/", RuntimeArchitecture.x64)] public Task RunSite_WindowsOnly(RuntimeFlavor runtimeFlavor, string applicationBaseUrl, RuntimeArchitecture runtimeArchitecture) { var testRunner = new TestRunner(_applicationPath); @@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests [ConditionalTheory] [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)] public Task RunSite_NonWindowsOnly(RuntimeFlavor runtimeFlavor, string applicationBaseUrl, RuntimeArchitecture runtimeArchitecture) { diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs index 74b558bebf..7d4c861cc8 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs @@ -21,8 +21,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x86)] - [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x86)] + [InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)] + [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)] public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Windows( RuntimeFlavor runtimeFlavor, string applicationBaseUrl, @@ -41,8 +41,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x86)] - [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x86)] + [InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)] + [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)] public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Windows( RuntimeFlavor runtimeFlavor, string applicationBaseUrl, @@ -61,8 +61,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x86)] - [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x86)] + [InlineData(RuntimeFlavor.Clr, "http://localhost:5070/", RuntimeArchitecture.x64)] + [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5071/", RuntimeArchitecture.x64)] public Task Localization_ResourcesInFolder_ReturnNonLocalizedValue_CultureHierarchyTooDeep_Windows( RuntimeFlavor runtimeFlavor, string applicationBaseUrl, @@ -81,12 +81,12 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests [ConditionalFact] [OSSkipCondition(OperatingSystems.Windows)] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] - public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Mono() + public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Clr() { var testRunner = new TestRunner(_applicationPath); return testRunner.RunTestAndVerifyResponse( - RuntimeFlavor.Mono, - RuntimeArchitecture.x86, + RuntimeFlavor.Clr, + RuntimeArchitecture.x64, "http://localhost:5072", "ResourcesInFolder", "fr-FR", @@ -96,12 +96,12 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests [ConditionalFact] [OSSkipCondition(OperatingSystems.Windows)] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] - public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Mono() + public Task Localization_ResourcesInFolder_ReturnLocalizedValue_WithCultureFallback_Clr() { var testRunner = new TestRunner(_applicationPath); return testRunner.RunTestAndVerifyResponse( - RuntimeFlavor.Mono, - RuntimeArchitecture.x86, + RuntimeFlavor.Clr, + RuntimeArchitecture.x64, "http://localhost:5072", "ResourcesInFolder", "fr-FR-test", @@ -141,8 +141,8 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - [InlineData(RuntimeFlavor.Clr, "http://localhost:5074/", RuntimeArchitecture.x86)] - [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5075/", RuntimeArchitecture.x86)] + [InlineData(RuntimeFlavor.Clr, "http://localhost:5074/", RuntimeArchitecture.x64)] + [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5075/", RuntimeArchitecture.x64)] public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Windows( RuntimeFlavor runtimeFlavor, string applicationBaseUrl, @@ -161,12 +161,12 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests [ConditionalFact] [OSSkipCondition(OperatingSystems.Windows)] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] - public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Mono() + public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Clr() { var testRunner = new TestRunner(_applicationPath); return testRunner.RunTestAndVerifyResponse( - RuntimeFlavor.Mono, - RuntimeArchitecture.x86, + RuntimeFlavor.Clr, + RuntimeArchitecture.x64, "http://localhost:5076", "ResourcesAtRootFolder", "fr-FR", diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs index 68260697b7..ea1702bcdd 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs @@ -35,7 +35,6 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests var deploymentParameters = new DeploymentParameters(_applicationPath, ServerType.Kestrel, runtimeFlavor, runtimeArchitecture) { ApplicationBaseUriHint = applicationBaseUrl, - Command = "web", EnvironmentName = environmentName };