diff --git a/test/E2ETests/Common/DeploymentUtility.cs b/test/E2ETests/Common/DeploymentUtility.cs index 1eed4d0b8f..2206c6a5a2 100644 --- a/test/E2ETests/Common/DeploymentUtility.cs +++ b/test/E2ETests/Common/DeploymentUtility.cs @@ -15,13 +15,13 @@ namespace E2ETests { internal class DeploymentUtility { - private static string GetIISExpressPath(KreArchitecture architecture) + private static string GetIISExpressPath(DotnetArchitecture architecture) { // Get path to program files var iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "IIS Express", "iisexpress.exe"); // Get path to 64 bit of IIS Express - if (architecture == KreArchitecture.amd64) + if (architecture == DotnetArchitecture.amd64) { iisExpressPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "IIS Express", "iisexpress.exe"); @@ -61,9 +61,9 @@ namespace E2ETests { startParameters.ApplicationPath = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, APP_RELATIVE_PATH)); - //To avoid the KRE_DEFAULT_LIB of the test process flowing into Helios, set it to empty - var backupKreDefaultLibPath = Environment.GetEnvironmentVariable("KRE_DEFAULT_LIB"); - Environment.SetEnvironmentVariable("KRE_DEFAULT_LIB", string.Empty); + //To avoid the DOTNET_DEFAULT_LIB of the test process flowing into Helios, set it to empty + var backupDotnetDefaultLibPath = Environment.GetEnvironmentVariable("DOTNET_DEFAULT_LIB"); + Environment.SetEnvironmentVariable("DOTNET_DEFAULT_LIB", string.Empty); if (!string.IsNullOrWhiteSpace(startParameters.EnvironmentName)) { @@ -82,16 +82,16 @@ namespace E2ETests Process hostProcess = null; - if (startParameters.KreFlavor == KreFlavor.Mono) + if (startParameters.DotnetFlavor == DotnetFlavor.Mono) { hostProcess = StartMonoHost(startParameters, logger); } else { - //Tweak the %PATH% to the point to the right KREFLAVOR - startParameters.Kre = SwitchPathToKreFlavor(startParameters.KreFlavor, startParameters.KreArchitecture, logger); + //Tweak the %PATH% to the point to the right DOTNETFLAVOR + startParameters.Dotnet = SwitchPathToDotnetFlavor(startParameters.DotnetFlavor, startParameters.DotnetArchitecture, logger); - //Reason to do pack here instead of in a common place is use the right KRE to do the packing. Previous line switches to use the right KRE. + //Reason to do pack here instead of in a common place is use the right Dotnet to do the packing. Previous line switches to use the right Dotnet. if (startParameters.PackApplicationBeforeStart) { if (startParameters.ServerType == ServerType.IISNativeModule || @@ -156,8 +156,8 @@ namespace E2ETests } } - //Restore the KRE_DEFAULT_LIB after starting the host process - Environment.SetEnvironmentVariable("KRE_DEFAULT_LIB", backupKreDefaultLibPath); + //Restore the DOTNET_DEFAULT_LIB after starting the host process + Environment.SetEnvironmentVariable("DOTNET_DEFAULT_LIB", backupDotnetDefaultLibPath); Environment.SetEnvironmentVariable("ASPNET_ENV", string.Empty); return hostProcess; } @@ -165,27 +165,28 @@ namespace E2ETests private static Process StartMonoHost(StartParameters startParameters, ILogger logger) { var path = Environment.GetEnvironmentVariable("PATH"); - var kreBin = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Where(c => c.Contains("KRE-Mono")).FirstOrDefault(); + var dotnetBin = path.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries). + Where(c => c.Contains("dotnet-mono")).FirstOrDefault(); - if (string.IsNullOrWhiteSpace(kreBin)) + if (string.IsNullOrWhiteSpace(dotnetBin)) { - throw new Exception("KRE not detected on the machine."); + throw new Exception("Dotnet not detected on the machine."); } if (startParameters.PackApplicationBeforeStart) { - // We use full path to KRE to pack. - startParameters.Kre = new DirectoryInfo(kreBin).Parent.FullName; + // We use full path to Dotnet to pack. + startParameters.Dotnet = new DirectoryInfo(dotnetBin).Parent.FullName; KpmPack(startParameters, logger); } //Mono does not have a way to pass in a --appbase switch. So it will be an environment variable. - Environment.SetEnvironmentVariable("KRE_APPBASE", startParameters.ApplicationPath); - logger.WriteInformation("Setting the KRE_APPBASE to {0}", startParameters.ApplicationPath); + Environment.SetEnvironmentVariable("DOTNET_APPBASE", startParameters.ApplicationPath); + logger.WriteInformation("Setting the DOTNET_APPBASE to {0}", startParameters.ApplicationPath); var monoPath = "mono"; - var klrMonoManaged = Path.Combine(kreBin, "klr.mono.managed.dll"); - var applicationHost = Path.Combine(kreBin, "Microsoft.Framework.ApplicationHost"); + var klrMonoManaged = Path.Combine(dotnetBin, "klr.mono.managed.dll"); + var applicationHost = Path.Combine(dotnetBin, "Microsoft.Framework.ApplicationHost"); var commandName = startParameters.ServerType == ServerType.Kestrel ? "kestrel" : string.Empty; logger.WriteInformation(string.Format("Executing command: {0} {1} {2} {3}", monoPath, klrMonoManaged, applicationHost, commandName)); @@ -204,7 +205,7 @@ namespace E2ETests Thread.Sleep(25 * 1000); //Clear the appbase so that it does not create issues with successive runs - Environment.SetEnvironmentVariable("KRE_APPBASE", string.Empty); + Environment.SetEnvironmentVariable("DOTNET_APPBASE", string.Empty); return hostProcess; } @@ -232,7 +233,7 @@ namespace E2ETests string.Format("/port:5001 /path:{0}", startParameters.ApplicationPath) : string.Format("/site:{0} /config:{1}", startParameters.SiteName, startParameters.ApplicationHostConfigLocation); - var iisExpressPath = GetIISExpressPath(startParameters.KreArchitecture); + var iisExpressPath = GetIISExpressPath(startParameters.DotnetArchitecture); logger.WriteInformation("Executing command : {0} {1}", iisExpressPath, parameters); @@ -281,37 +282,38 @@ namespace E2ETests return hostProcess; } - private static string SwitchPathToKreFlavor(KreFlavor kreFlavor, KreArchitecture kreArchitecture, ILogger logger) + private static string SwitchPathToDotnetFlavor(DotnetFlavor dotnetFlavor, DotnetArchitecture dotnetArchitecture, ILogger logger) { var pathValue = Environment.GetEnvironmentVariable("PATH"); logger.WriteInformation(string.Empty); logger.WriteInformation("Current %PATH% value : {0}", pathValue); var replaceStr = new StringBuilder(). - Append("KRE"). - Append((kreFlavor == KreFlavor.CoreClr) ? "-CoreCLR" : "-CLR"). - Append((kreArchitecture == KreArchitecture.x86) ? "-x86" : "-amd64"). + Append("dotnet"). + Append((dotnetFlavor == DotnetFlavor.CoreClr) ? "-CoreCLR" : "-CLR"). + Append("win"). + Append((dotnetArchitecture == DotnetArchitecture.x86) ? "-x86" : "-x64"). ToString(); - pathValue = Regex.Replace(pathValue, "KRE-(CLR|CoreCLR)-(x86|amd64)", replaceStr, RegexOptions.IgnoreCase); + pathValue = Regex.Replace(pathValue, "dotnet-(clr|coreclr)-win-(x86|x64)", replaceStr, RegexOptions.IgnoreCase); - var startIndex = pathValue.IndexOf(replaceStr); // First instance of this KRE name. - var kreName = pathValue.Substring(startIndex, pathValue.IndexOf(';', startIndex) - startIndex); - kreName = kreName.Substring(0, kreName.IndexOf('\\')); // Trim the \bin from the path. + var startIndex = pathValue.IndexOf(replaceStr); // First instance of this Dotnet name. + var dotnetName = pathValue.Substring(startIndex, pathValue.IndexOf(';', startIndex) - startIndex); + dotnetName = dotnetName.Substring(0, dotnetName.IndexOf('\\')); // Trim the \bin from the path. - // Tweak the %PATH% to the point to the right KREFLAVOR. + // Tweak the %PATH% to the point to the right DOTNETFLAVOR. Environment.SetEnvironmentVariable("PATH", pathValue); logger.WriteInformation(string.Empty); - logger.WriteInformation("Changing to use KRE : {0}", kreName); - return kreName; + logger.WriteInformation("Changing to use DOTNET : {0}", dotnetName); + return dotnetName; } private static void KpmPack(StartParameters startParameters, ILogger logger, string packRoot = null) { startParameters.PackedApplicationRootPath = Path.Combine(packRoot ?? Path.GetTempPath(), Guid.NewGuid().ToString()); - var parameters = string.Format("pack {0} -o {1} --runtime {2}", startParameters.ApplicationPath, startParameters.PackedApplicationRootPath, startParameters.Kre); + var parameters = string.Format("pack {0} -o {1} --runtime {2}", startParameters.ApplicationPath, startParameters.PackedApplicationRootPath, startParameters.Dotnet); logger.WriteInformation("Executing command kpm {0}", parameters); var startInfo = new ProcessStartInfo diff --git a/test/E2ETests/Common/KreArchitecture.cs b/test/E2ETests/Common/DotnetArchitecture.cs similarity index 63% rename from test/E2ETests/Common/KreArchitecture.cs rename to test/E2ETests/Common/DotnetArchitecture.cs index 04f0772a8b..a0b8b772fb 100644 --- a/test/E2ETests/Common/KreArchitecture.cs +++ b/test/E2ETests/Common/DotnetArchitecture.cs @@ -1,6 +1,6 @@ namespace E2ETests { - public enum KreArchitecture + public enum DotnetArchitecture { amd64, x86 diff --git a/test/E2ETests/Common/KreFlavor.cs b/test/E2ETests/Common/DotnetFlavor.cs similarity index 75% rename from test/E2ETests/Common/KreFlavor.cs rename to test/E2ETests/Common/DotnetFlavor.cs index 9f11d8c5c2..6a8f6646a9 100644 --- a/test/E2ETests/Common/KreFlavor.cs +++ b/test/E2ETests/Common/DotnetFlavor.cs @@ -1,6 +1,6 @@ namespace E2ETests { - public enum KreFlavor + public enum DotnetFlavor { DesktopClr, CoreClr, diff --git a/test/E2ETests/Common/IISApplication.cs b/test/E2ETests/Common/IISApplication.cs index 47168a0c63..2e84fa3e39 100644 --- a/test/E2ETests/Common/IISApplication.cs +++ b/test/E2ETests/Common/IISApplication.cs @@ -57,9 +57,9 @@ namespace E2ETests // Not assigning a runtime version will choose v4.0 default. applicationPool.ManagedRuntimeVersion = NATIVE_MODULE_MANAGED_RUNTIME_VERSION; } - applicationPool.Enable32BitAppOnWin64 = (_startParameters.KreArchitecture == KreArchitecture.x86); + applicationPool.Enable32BitAppOnWin64 = (_startParameters.DotnetArchitecture == DotnetArchitecture.x86); _logger.WriteInformation("Created {0} application pool '{1}' with runtime version '{2}'.", - _startParameters.KreArchitecture, applicationPool.Name, + _startParameters.DotnetArchitecture, applicationPool.Name, applicationPool.ManagedRuntimeVersion ?? "default"); return applicationPool; } diff --git a/test/E2ETests/Common/StartParameters.cs b/test/E2ETests/Common/StartParameters.cs index 188d2c4745..6cd3e9ae23 100644 --- a/test/E2ETests/Common/StartParameters.cs +++ b/test/E2ETests/Common/StartParameters.cs @@ -7,9 +7,9 @@ { public ServerType ServerType { get; set; } - public KreFlavor KreFlavor { get; set; } + public DotnetFlavor DotnetFlavor { get; set; } - public KreArchitecture KreArchitecture { get; set; } + public DotnetArchitecture DotnetArchitecture { get; set; } public string EnvironmentName { get; set; } @@ -25,7 +25,7 @@ public string PackedApplicationRootPath { get; set; } - public string Kre { get; set; } + public string Dotnet { get; set; } public IISApplication IISApplication { get; set; } } diff --git a/test/E2ETests/NtlmAuthentationTest.cs b/test/E2ETests/NtlmAuthentationTest.cs index 222e00ebb4..9f45d518fb 100644 --- a/test/E2ETests/NtlmAuthentationTest.cs +++ b/test/E2ETests/NtlmAuthentationTest.cs @@ -12,21 +12,21 @@ namespace E2ETests { [ConditionalTheory] [OSSkipCondition(OperatingSystems.Unix | OperatingSystems.MacOSX)] - [InlineData(ServerType.IISExpress, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/")] - [InlineData(ServerType.IISExpress, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5001/")] - [InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5002/")] - public void NtlmAuthenticationTest(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + [InlineData(ServerType.IISExpress, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5001/")] + [InlineData(ServerType.IISExpress, DotnetFlavor.DesktopClr, DotnetArchitecture.amd64, "http://localhost:5001/")] + [InlineData(ServerType.WebListener, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5002/")] + public void NtlmAuthenticationTest(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { using (_logger.BeginScope("NtlmAuthenticationTest")) { - _logger.WriteInformation("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", - serverType, kreFlavor, architecture, applicationBaseUrl); + _logger.WriteInformation("Variation Details : HostType = {0}, DotnetFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", + serverType, dotnetFlavor, architecture, applicationBaseUrl); _startParameters = new StartParameters { ServerType = serverType, - KreFlavor = kreFlavor, - KreArchitecture = architecture, + DotnetFlavor = dotnetFlavor, + DotnetArchitecture = architecture, EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication' ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null, SiteName = "MusicStoreNtlmAuthentication" //This is configured in the NtlmAuthentication.config diff --git a/test/E2ETests/PublishAndRunTests.cs b/test/E2ETests/PublishAndRunTests.cs index 048d51bd6a..e29f75cdc7 100644 --- a/test/E2ETests/PublishAndRunTests.cs +++ b/test/E2ETests/PublishAndRunTests.cs @@ -12,42 +12,42 @@ namespace E2ETests { [ConditionalTheory] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] - [InlineData(ServerType.IISExpress, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5001/")] - public void Publish_And_Run_Tests_On_X86(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + [InlineData(ServerType.IISExpress, DotnetFlavor.DesktopClr, DotnetArchitecture.x86, "http://localhost:5001/")] + public void Publish_And_Run_Tests_On_X86(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { - Publish_And_Run_Tests(serverType, kreFlavor, architecture, applicationBaseUrl); + Publish_And_Run_Tests(serverType, dotnetFlavor, architecture, applicationBaseUrl); } [ConditionalTheory] [FrameworkSkipCondition(RuntimeFrameworks.DotNet)] - [InlineData(ServerType.Kestrel, KreFlavor.Mono, KreArchitecture.x86, "http://localhost:5004/")] - public void Publish_And_Run_Tests_On_Mono(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + [InlineData(ServerType.Kestrel, DotnetFlavor.Mono, DotnetArchitecture.x86, "http://localhost:5004/")] + public void Publish_And_Run_Tests_On_Mono(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { - Publish_And_Run_Tests(serverType, kreFlavor, architecture, applicationBaseUrl); + Publish_And_Run_Tests(serverType, dotnetFlavor, architecture, applicationBaseUrl); } [ConditionalTheory] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] - [InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5002/")] + [InlineData(ServerType.WebListener, DotnetFlavor.DesktopClr, DotnetArchitecture.amd64, "http://localhost:5002/")] //https://github.com/aspnet/KRuntime/issues/642 - //[InlineData(ServerType.Helios, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5001/")] - public void Publish_And_Run_Tests_On_AMD64(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + //[InlineData(ServerType.Helios, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5001/")] + public void Publish_And_Run_Tests_On_AMD64(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { - Publish_And_Run_Tests(serverType, kreFlavor, architecture, applicationBaseUrl); + Publish_And_Run_Tests(serverType, dotnetFlavor, architecture, applicationBaseUrl); } - private void Publish_And_Run_Tests(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + private void Publish_And_Run_Tests(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { using (_logger.BeginScope("Publish_And_Run_Tests")) { - _logger.WriteInformation("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", - serverType, kreFlavor, architecture, applicationBaseUrl); + _logger.WriteInformation("Variation Details : HostType = {0}, DotnetFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", + serverType, dotnetFlavor, architecture, applicationBaseUrl); _startParameters = new StartParameters { ServerType = serverType, - KreFlavor = kreFlavor, - KreArchitecture = architecture, + DotnetFlavor = dotnetFlavor, + DotnetArchitecture = architecture, PackApplicationBeforeStart = true }; diff --git a/test/E2ETests/SmokeTests.cs b/test/E2ETests/SmokeTests.cs index 4299785f0c..ed4c3774b9 100644 --- a/test/E2ETests/SmokeTests.cs +++ b/test/E2ETests/SmokeTests.cs @@ -27,44 +27,44 @@ namespace E2ETests [ConditionalTheory] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] - [InlineData(ServerType.IISExpress, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5001/")] - [InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5002/")] - [InlineData(ServerType.Kestrel, KreFlavor.DesktopClr, KreArchitecture.x86, "http://localhost:5004/")] - [InlineData(ServerType.IISExpress, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5001/")] - [InlineData(ServerType.WebListener, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5002/")] - [InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5004/")] - public void SmokeTestSuite_OnX86(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + [InlineData(ServerType.IISExpress, DotnetFlavor.DesktopClr, DotnetArchitecture.x86, "http://localhost:5001/")] + [InlineData(ServerType.WebListener, DotnetFlavor.DesktopClr, DotnetArchitecture.x86, "http://localhost:5002/")] + [InlineData(ServerType.Kestrel, DotnetFlavor.DesktopClr, DotnetArchitecture.x86, "http://localhost:5004/")] + [InlineData(ServerType.IISExpress, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5001/")] + [InlineData(ServerType.WebListener, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5002/")] + [InlineData(ServerType.Kestrel, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5004/")] + public void SmokeTestSuite_OnX86(ServerType serverType, DotnetFlavor dotnetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { - SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); + SmokeTestSuite(serverType, dotnetFlavor, architecture, applicationBaseUrl); } [ConditionalTheory] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] [SkipOn32BitOS] - [InlineData(ServerType.WebListener, KreFlavor.DesktopClr, KreArchitecture.amd64, "http://localhost:5002/")] - [InlineData(ServerType.IISExpress, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5001/")] - [InlineData(ServerType.Kestrel, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5004/")] - public void SmokeTestSuite_OnAMD64(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + [InlineData(ServerType.WebListener, DotnetFlavor.DesktopClr, DotnetArchitecture.amd64, "http://localhost:5002/")] + [InlineData(ServerType.IISExpress, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5001/")] + [InlineData(ServerType.Kestrel, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5004/")] + public void SmokeTestSuite_OnAMD64(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { - SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); + SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl); } [ConditionalTheory] [FrameworkSkipCondition(RuntimeFrameworks.DotNet)] - [InlineData(ServerType.Kestrel, KreFlavor.Mono, KreArchitecture.x86, "http://localhost:5004/")] - public void SmokeTestSuite_OnMono(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + [InlineData(ServerType.Kestrel, DotnetFlavor.Mono, DotnetArchitecture.x86, "http://localhost:5004/")] + public void SmokeTestSuite_OnMono(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { - SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); + SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl); } [ConditionalTheory] [SkipIfNativeModuleNotInstalled] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] [OSSkipCondition(OperatingSystems.Win7And2008R2 | OperatingSystems.MacOSX | OperatingSystems.Unix)] - [InlineData(ServerType.IISNativeModule, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5005/")] - public void SmokeTestSuite_On_NativeModule_X86(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + [InlineData(ServerType.IISNativeModule, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5005/")] + public void SmokeTestSuite_On_NativeModule_X86(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { - SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); + SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl); } [ConditionalTheory] @@ -72,33 +72,33 @@ namespace E2ETests [FrameworkSkipCondition(RuntimeFrameworks.Mono)] [OSSkipCondition(OperatingSystems.Win7And2008R2 | OperatingSystems.MacOSX | OperatingSystems.Unix)] [SkipOn32BitOS] - [InlineData(ServerType.IISNativeModule, KreFlavor.CoreClr, KreArchitecture.amd64, "http://localhost:5005/")] - public void SmokeTestSuite_On_NativeModule_AMD64(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + [InlineData(ServerType.IISNativeModule, DotnetFlavor.CoreClr, DotnetArchitecture.amd64, "http://localhost:5005/")] + public void SmokeTestSuite_On_NativeModule_AMD64(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { - SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); + SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl); } // [ConditionalTheory] [FrameworkSkipCondition(RuntimeFrameworks.Mono)] [OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Unix)] - [InlineData(ServerType.IIS, KreFlavor.CoreClr, KreArchitecture.x86, "http://localhost:5005/")] - public void SmokeTestSuite_On_IIS_X86(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + [InlineData(ServerType.IIS, DotnetFlavor.CoreClr, DotnetArchitecture.x86, "http://localhost:5005/")] + public void SmokeTestSuite_On_IIS_X86(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { - SmokeTestSuite(serverType, kreFlavor, architecture, applicationBaseUrl); + SmokeTestSuite(serverType, donetFlavor, architecture, applicationBaseUrl); } - private void SmokeTestSuite(ServerType serverType, KreFlavor kreFlavor, KreArchitecture architecture, string applicationBaseUrl) + private void SmokeTestSuite(ServerType serverType, DotnetFlavor donetFlavor, DotnetArchitecture architecture, string applicationBaseUrl) { using (_logger.BeginScope("SmokeTestSuite")) { - _logger.WriteInformation("Variation Details : HostType = {0}, KreFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", - serverType, kreFlavor, architecture, applicationBaseUrl); + _logger.WriteInformation("Variation Details : HostType = {0}, DonetFlavor = {1}, Architecture = {2}, applicationBaseUrl = {3}", + serverType, donetFlavor, architecture, applicationBaseUrl); _startParameters = new StartParameters { ServerType = serverType, - KreFlavor = kreFlavor, - KreArchitecture = architecture, + DotnetFlavor = donetFlavor, + DotnetArchitecture = architecture, EnvironmentName = "SocialTesting" };