Honor UI language override in test runs

nguerrera · nguerrera · commit a1c423c0f64c · 2017-07-18T22:03:31.000-07:00
Also fix some incorrect unlocalized test expectations that slipped in.
diff --git a/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs b/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs
@@ -28,6 +28,7 @@ public class EnvironmentFilter
         private IEnumerable<string> _environmentVariablesToKeep = new string []
         {
             "DOTNET_CLI_TELEMETRY_SESSIONID",
+            "DOTNET_CLI_UI_LANGUAGE",
             "DOTNET_MULTILEVEL_LOOKUP",
             "DOTNET_RUNTIME_ID",
             "DOTNET_SKIP_FIRST_TIME_EXPERIENCE",
diff --git a/src/Microsoft.DotNet.Cli.Utils/Product.cs b/src/Microsoft.DotNet.Cli.Utils/Product.cs
@@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Utils
 {
     public class Product
     {
-        public static readonly string LongName = LocalizableStrings.DotNetCommandLineTools;
+        public static string LongName => LocalizableStrings.DotNetCommandLineTools;
         public static readonly string Version = GetProductVersion();
 
         private static string GetProductVersion()
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -23,6 +24,15 @@ public abstract class TestBase : IDisposable
         private TempRoot _temp;
         private static TestAssets s_testAssets;
 
+        static TestBase()
+        {
+            // set culture of test process to match CLI sub-processes when the UI language is overriden.
+            string overriddenUILanguage = Environment.GetEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE");
+            if (overriddenUILanguage != null)
+            {
+                CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo(overriddenUILanguage);
+            }
+        }
 
         protected static string RepoRoot
         {
diff --git a/test/dotnet-new.Tests/NewCommandTests.cs b/test/dotnet-new.Tests/NewCommandTests.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.DotNet.New.Tests
 {
-    public class NewCommandTests
+    public class NewCommandTests : TestBase
     {
         [Fact]
         public void WhenSwitchIsSkippedThenItPrintsError()
@@ -16,7 +16,10 @@ public void WhenSwitchIsSkippedThenItPrintsError()
 
             cmd.ExitCode.Should().NotBe(0);
 
-            cmd.StdErr.Should().StartWith("No templates matched the input template name: Web1.1.");
+            if (!DotnetUnderTest.IsLocalized())
+            {
+                cmd.StdErr.Should().StartWith("No templates matched the input template name: Web1.1.");
+            }
         }
 
         [Fact]
@@ -26,7 +29,10 @@ public void WhenTemplateNameIsNotUniquelyMatchedThenItIndicatesProblemToUser()
 
             cmd.ExitCode.Should().NotBe(0);
 
-            cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: c.");
+            if (!DotnetUnderTest.IsLocalized())
+            {
+                cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: c.");
+            }
         }
     }
 }
diff --git a/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs b/test/dotnet-run.Tests/GivenDotnetRunRunsCsProj.cs
@@ -7,6 +7,8 @@
 using Microsoft.DotNet.Tools.Test.Utilities;
 using Xunit;
 
+using LocalizableStrings = Microsoft.DotNet.Tools.Run.LocalizableStrings;
+
 namespace Microsoft.DotNet.Cli.Run.Tests
 {
     public class GivenDotnetRunBuildsCsproj : TestBase
@@ -280,7 +282,7 @@ public void ItGivesAnErrorWhenAttemptingToUseALaunchProfileThatDoesNotExistWhenT
                 .ExecuteWithCapturedOutput("--launch-profile test")
                 .Should().Pass()
                          .And.HaveStdOutContaining("Hello World!")
-                         .And.HaveStdErrContaining("The specified launch profile could not be located.");
+                         .And.HaveStdErrContaining(LocalizableStrings.RunCommandExceptionCouldNotLocateALaunchSettingsFile);
         }
 
         [Fact]
@@ -368,7 +370,7 @@ public void ItGivesAnErrorWhenTheLaunchProfileNotFound()
                 .ExecuteWithCapturedOutput("--launch-profile Third")
                 .Should().Pass()
                          .And.HaveStdOutContaining("(NO MESSAGE)")
-                         .And.HaveStdErrContaining("The launch profile \"Third\" could not be applied.");
+                         .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, "Third", "").Trim());
         }
 
         [Fact]
@@ -396,7 +398,7 @@ public void ItGivesAnErrorWhenTheLaunchProfileCanNotBeHandled()
                 .ExecuteWithCapturedOutput("--launch-profile \"IIS Express\"")
                 .Should().Pass()
                          .And.HaveStdOutContaining("(NO MESSAGE)")
-                         .And.HaveStdErrContaining("The launch profile \"IIS Express\" could not be applied.");
+                         .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, "IIS Express", "").Trim());
         }
 
         [Fact]
@@ -485,7 +487,7 @@ public void ItSkipsLaunchProfilesWhenThereIsNoUsableDefault()
 
             cmd.Should().Pass()
                 .And.HaveStdOutContaining("(NO MESSAGE)")
-                .And.HaveStdErrContaining("The launch profile \"(Default)\" could not be applied.");
+                .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, LocalizableStrings.DefaultLaunchProfileDisplayName, "").Trim());
         }
 
         [Fact]
@@ -514,7 +516,7 @@ public void ItPrintsAnErrorWhenLaunchSettingsAreCorrupted()
 
             cmd.Should().Pass()
                 .And.HaveStdOutContaining("(NO MESSAGE)")
-                .And.HaveStdErrContaining("The launch profile \"(Default)\" could not be applied.");
+                .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, LocalizableStrings.DefaultLaunchProfileDisplayName, "").Trim());
         }
     }
 }
diff --git a/test/dotnet.Tests/ParserTests/ValdidationMessageTests.cs b/test/dotnet.Tests/ParserTests/ValdidationMessageTests.cs
@@ -11,8 +11,6 @@ namespace Microsoft.DotNet.Tests.ParserTests
 {
     public class ValidationMessageTests
     {
-        private readonly ITestOutputHelper output;
-
         [Fact]
         public void ValidationMessagesFormatCorrectly()
         {

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public class EnvironmentFilter`
`28`	`28`	`private IEnumerable<string> _environmentVariablesToKeep = new string []`
`29`	`29`	`{`
`30`	`30`	`"DOTNET_CLI_TELEMETRY_SESSIONID",`
	`31`	`+ "DOTNET_CLI_UI_LANGUAGE",`
`31`	`32`	`"DOTNET_MULTILEVEL_LOOKUP",`
`32`	`33`	`"DOTNET_RUNTIME_ID",`
`33`	`34`	`"DOTNET_SKIP_FIRST_TIME_EXPERIENCE",`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Utils`
`7`	`7`	`{`
`8`	`8`	`public class Product`
`9`	`9`	`{`
`10`		`- public static readonly string LongName = LocalizableStrings.DotNetCommandLineTools;`
	`10`	`+ public static string LongName => LocalizableStrings.DotNetCommandLineTools;`
`11`	`11`	`public static readonly string Version = GetProductVersion();`
`12`	`12`
`13`	`13`	`private static string GetProductVersion()`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace Microsoft.DotNet.New.Tests`
`9`	`9`	`{`
`10`		`- public class NewCommandTests`
	`10`	`+ public class NewCommandTests : TestBase`
`11`	`11`	`{`
`12`	`12`	`[Fact]`
`13`	`13`	`public void WhenSwitchIsSkippedThenItPrintsError()`
`@@ -16,7 +16,10 @@ public void WhenSwitchIsSkippedThenItPrintsError()`
`16`	`16`
`17`	`17`	`cmd.ExitCode.Should().NotBe(0);`
`18`	`18`
`19`		`- cmd.StdErr.Should().StartWith("No templates matched the input template name: Web1.1.");`
	`19`	`+ if (!DotnetUnderTest.IsLocalized())`
	`20`	`+ {`
	`21`	`+ cmd.StdErr.Should().StartWith("No templates matched the input template name: Web1.1.");`
	`22`	`+ }`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`[Fact]`
`@@ -26,7 +29,10 @@ public void WhenTemplateNameIsNotUniquelyMatchedThenItIndicatesProblemToUser()`
`26`	`29`
`27`	`30`	`cmd.ExitCode.Should().NotBe(0);`
`28`	`31`
`29`		`- cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: c.");`
	`32`	`+ if (!DotnetUnderTest.IsLocalized())`
	`33`	`+ {`
	`34`	`+ cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: c.");`
	`35`	`+ }`
`30`	`36`	`}`
`31`	`37`	`}`
`32`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`using Microsoft.DotNet.Tools.Test.Utilities;`
`8`	`8`	`using Xunit;`
`9`	`9`
	`10`	`+using LocalizableStrings = Microsoft.DotNet.Tools.Run.LocalizableStrings;`
	`11`	`+`
`10`	`12`	`namespace Microsoft.DotNet.Cli.Run.Tests`
`11`	`13`	`{`
`12`	`14`	`public class GivenDotnetRunBuildsCsproj : TestBase`
`@@ -280,7 +282,7 @@ public void ItGivesAnErrorWhenAttemptingToUseALaunchProfileThatDoesNotExistWhenT`
`280`	`282`	`.ExecuteWithCapturedOutput("--launch-profile test")`
`281`	`283`	`.Should().Pass()`
`282`	`284`	`.And.HaveStdOutContaining("Hello World!")`
`283`		`- .And.HaveStdErrContaining("The specified launch profile could not be located.");`
	`285`	`+ .And.HaveStdErrContaining(LocalizableStrings.RunCommandExceptionCouldNotLocateALaunchSettingsFile);`
`284`	`286`	`}`
`285`	`287`
`286`	`288`	`[Fact]`
`@@ -368,7 +370,7 @@ public void ItGivesAnErrorWhenTheLaunchProfileNotFound()`
`368`	`370`	`.ExecuteWithCapturedOutput("--launch-profile Third")`
`369`	`371`	`.Should().Pass()`
`370`	`372`	`.And.HaveStdOutContaining("(NO MESSAGE)")`
`371`		`- .And.HaveStdErrContaining("The launch profile \"Third\" could not be applied.");`
	`373`	`+ .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, "Third", "").Trim());`
`372`	`374`	`}`
`373`	`375`
`374`	`376`	`[Fact]`
`@@ -396,7 +398,7 @@ public void ItGivesAnErrorWhenTheLaunchProfileCanNotBeHandled()`
`396`	`398`	`.ExecuteWithCapturedOutput("--launch-profile \"IIS Express\"")`
`397`	`399`	`.Should().Pass()`
`398`	`400`	`.And.HaveStdOutContaining("(NO MESSAGE)")`
`399`		`- .And.HaveStdErrContaining("The launch profile \"IIS Express\" could not be applied.");`
	`401`	`+ .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, "IIS Express", "").Trim());`
`400`	`402`	`}`
`401`	`403`
`402`	`404`	`[Fact]`
`@@ -485,7 +487,7 @@ public void ItSkipsLaunchProfilesWhenThereIsNoUsableDefault()`
`485`	`487`
`486`	`488`	`cmd.Should().Pass()`
`487`	`489`	`.And.HaveStdOutContaining("(NO MESSAGE)")`
`488`		`- .And.HaveStdErrContaining("The launch profile \"(Default)\" could not be applied.");`
	`490`	`+ .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, LocalizableStrings.DefaultLaunchProfileDisplayName, "").Trim());`
`489`	`491`	`}`
`490`	`492`
`491`	`493`	`[Fact]`
`@@ -514,7 +516,7 @@ public void ItPrintsAnErrorWhenLaunchSettingsAreCorrupted()`
`514`	`516`
`515`	`517`	`cmd.Should().Pass()`
`516`	`518`	`.And.HaveStdOutContaining("(NO MESSAGE)")`
`517`		`- .And.HaveStdErrContaining("The launch profile \"(Default)\" could not be applied.");`
	`519`	`+ .And.HaveStdErrContaining(string.Format(LocalizableStrings.RunCommandExceptionCouldNotApplyLaunchSettings, LocalizableStrings.DefaultLaunchProfileDisplayName, "").Trim());`
`518`	`520`	`}`
`519`	`521`	`}`
`520`	`522`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ namespace Microsoft.DotNet.Tests.ParserTests`
`11`	`11`	`{`
`12`	`12`	`public class ValidationMessageTests`
`13`	`13`	`{`
`14`		`- private readonly ITestOutputHelper output;`
`15`		`-`
`16`	`14`	`[Fact]`
`17`	`15`	`public void ValidationMessagesFormatCorrectly()`
`18`	`16`	`{`