From 83c46fb8b77110afeaa9aaabc939782138752682 Mon Sep 17 00:00:00 2001 From: Troy Dai Date: Tue, 10 Nov 2015 14:40:19 -0800 Subject: [PATCH] Run CoreCLR test when runtime framework is CoreCLR --- .../LocalizationTest.cs | 62 +++++++++++++------ 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/test/Microsoft.AspNet.Localization.FunctionalTests/LocalizationTest.cs b/test/Microsoft.AspNet.Localization.FunctionalTests/LocalizationTest.cs index d1ef581544..094088840e 100644 --- a/test/Microsoft.AspNet.Localization.FunctionalTests/LocalizationTest.cs +++ b/test/Microsoft.AspNet.Localization.FunctionalTests/LocalizationTest.cs @@ -30,20 +30,31 @@ namespace Microsoft.AspNet.Localization.FunctionalTests "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder"); } - [ConditionalTheory] + [ConditionalFact] [OSSkipCondition(OperatingSystems.Windows)] - [InlineData(RuntimeFlavor.Mono, "http://localhost:5072/", RuntimeArchitecture.x86)] - [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5073/", RuntimeArchitecture.x64)] - public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Mono( - RuntimeFlavor runtimeFlavor, - string applicationBaseUrl, - RuntimeArchitecture runtimeArchitechture) + [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] + public Task Localization_ResourcesInFolder_ReturnLocalizedValue_Mono() { var testRunner = new TestRunner(); return testRunner.RunTestAndVerifyResponse( - runtimeFlavor, - runtimeArchitechture, - applicationBaseUrl, + RuntimeFlavor.Mono, + RuntimeArchitecture.x86, + "http://localhost:5072", + "ResourcesInFolder", + "fr-FR", + "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder"); + } + + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Windows)] + [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + public Task Localization_ResourcesInFolder_ReturnLocalizedValue_CoreCLR_NonWindows() + { + var testRunner = new TestRunner(); + return testRunner.RunTestAndVerifyResponse( + RuntimeFlavor.CoreClr, + RuntimeArchitecture.x64, + "http://localhost:5073/", "ResourcesInFolder", "fr-FR", "Bonjour from StartupResourcesInFolder Bonjour from Test in resources folder Bonjour from Customer in resources folder"); @@ -69,20 +80,31 @@ namespace Microsoft.AspNet.Localization.FunctionalTests "Bonjour from StartupResourcesAtRootFolder Bonjour from Test in root folder Bonjour from Customer in root folder"); } - [ConditionalTheory] + [ConditionalFact] [OSSkipCondition(OperatingSystems.Windows)] - [InlineData(RuntimeFlavor.Mono, "http://localhost:5076/", RuntimeArchitecture.x86)] - [InlineData(RuntimeFlavor.CoreClr, "http://localhost:5077/", RuntimeArchitecture.x64)] - public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Mono( - RuntimeFlavor runtimeFlavor, - string applicationBaseUrl, - RuntimeArchitecture runtimeArchitechture) + [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] + public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_Mono() { var testRunner = new TestRunner(); return testRunner.RunTestAndVerifyResponse( - runtimeFlavor, - runtimeArchitechture, - applicationBaseUrl, + RuntimeFlavor.Mono, + RuntimeArchitecture.x86, + "http://localhost:5076", + "ResourcesAtRootFolder", + "fr-FR", + "Bonjour from StartupResourcesAtRootFolder Bonjour from Test in root folder Bonjour from Customer in root folder"); + } + + [ConditionalFact] + [OSSkipCondition(OperatingSystems.Windows)] + [FrameworkSkipCondition(RuntimeFrameworks.Mono)] + public Task Localization_ResourcesAtRootFolder_ReturnLocalizedValue_CoreCLR_NonWindows() + { + var testRunner = new TestRunner(); + return testRunner.RunTestAndVerifyResponse( + RuntimeFlavor.CoreClr, + RuntimeArchitecture.x64, + "http://localhost:5077/", "ResourcesAtRootFolder", "fr-FR", "Bonjour from StartupResourcesAtRootFolder Bonjour from Test in root folder Bonjour from Customer in root folder");