diff --git a/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsCsProj.cs b/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsCsProj.cs index c3d1ff0781da..51331d31142b 100644 --- a/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsCsProj.cs +++ b/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsCsProj.cs @@ -392,6 +392,7 @@ public void ItUsesLaunchProfileOfTheSpecifiedName() .WithSource(); var testProjectDirectory = testInstance.Path; + var launchSettingsPath = Path.Combine(testProjectDirectory, "Properties", "launchSettings.json"); var cmd = new DotnetCommand(Log, "run") .WithWorkingDirectory(testProjectDirectory) @@ -400,7 +401,7 @@ public void ItUsesLaunchProfileOfTheSpecifiedName() cmd.Should().Pass() .And.HaveStdOutContaining("Second"); - cmd.StdErr.Should().BeEmpty(); + cmd.StdErr.Should().Contain(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)); } [Fact] @@ -411,14 +412,12 @@ public void ItDefaultsToTheFirstUsableLaunchProfile() .WithSource(); var testProjectDirectory = testInstance.Path; - var launchSettingsPath = Path.Combine(testProjectDirectory, "Properties", "launchSettings.json"); var cmd = new DotnetCommand(Log, "run", "--verbosity", "quiet") .WithWorkingDirectory(testProjectDirectory) .Execute(); cmd.Should().Pass() - .And.NotHaveStdOutContaining(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)) .And.HaveStdOutContaining("First"); cmd.StdErr.Should().BeEmpty(); @@ -441,7 +440,7 @@ public void ItSetsTheDotnetLaunchProfileEnvironmentVariableToDefaultLaunchProfil cmd.Should().Pass() .And.HaveStdOutContaining("DOTNET_LAUNCH_PROFILE=<<>>"); - cmd.StdErr.Should().BeEmpty(); + cmd.StdErr.Should().Contain(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)); } [Fact] @@ -461,7 +460,7 @@ public void ItSetsTheDotnetLaunchProfileEnvironmentVariableToSuppliedLaunchProfi cmd.Should().Pass() .And.HaveStdOutContaining("DOTNET_LAUNCH_PROFILE=<<>>"); - cmd.StdErr.Should().BeEmpty(); + cmd.StdErr.Should().Contain(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)); } [Fact] @@ -518,10 +517,8 @@ public void ItPrintsUsingLaunchSettingsMessageWhenNotQuiet() .Execute("-v:m"); cmd.Should().Pass() - .And.HaveStdOutContaining(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)) + .And.HaveStdErrContaining(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)) .And.HaveStdOutContaining("First"); - - cmd.StdErr.Should().BeEmpty(); } [Fact] @@ -532,6 +529,7 @@ public void ItPrefersTheValueOfAppUrlFromEnvVarOverTheProp() .WithSource(); var testProjectDirectory = testInstance.Path; + var launchSettingsPath = Path.Combine(testProjectDirectory, "Properties", "launchSettings.json"); var cmd = new DotnetCommand(Log, "run") .WithWorkingDirectory(testProjectDirectory) @@ -540,7 +538,7 @@ public void ItPrefersTheValueOfAppUrlFromEnvVarOverTheProp() cmd.Should().Pass() .And.HaveStdOutContaining("http://localhost:12345/"); - cmd.StdErr.Should().BeEmpty(); + cmd.StdErr.Should().Contain(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)); } [Fact] @@ -551,6 +549,7 @@ public void ItUsesTheValueOfAppUrlIfTheEnvVarIsNotSet() .WithSource(); var testProjectDirectory = testInstance.Path; + var launchSettingsPath = Path.Combine(testProjectDirectory, "Properties", "launchSettings.json"); var cmd = new DotnetCommand(Log, "run") .WithWorkingDirectory(testProjectDirectory) @@ -559,7 +558,7 @@ public void ItUsesTheValueOfAppUrlIfTheEnvVarIsNotSet() cmd.Should().Pass() .And.HaveStdOutContaining("http://localhost:54321/"); - cmd.StdErr.Should().BeEmpty(); + cmd.StdErr.Should().Contain(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)); } [Fact] diff --git a/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsVbProj.cs b/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsVbProj.cs index a73c7efa3f94..924583a73aeb 100644 --- a/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsVbProj.cs +++ b/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsVbProj.cs @@ -80,6 +80,8 @@ public void ItUsesLaunchProfileOfTheSpecifiedName(string launchProfileName) var testInstance = TestAssetsManager.CopyTestAsset(testAppName, identifier: $"LaunchProfileSuccess-{launchProfileName}") .WithSource(); + var launchSettingsPath = Path.Combine(testInstance.Path, "My Project", "launchSettings.json"); + new DotnetCommand(Log, "run") .WithWorkingDirectory(testInstance.Path) .Execute("--launch-profile", launchProfileName) @@ -88,7 +90,7 @@ public void ItUsesLaunchProfileOfTheSpecifiedName(string launchProfileName) .And .HaveStdOutContaining("Second") .And - .NotHaveStdErr(); + .HaveStdErrContaining(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)); } [Fact] @@ -99,17 +101,15 @@ public void ItDefaultsToTheFirstUsableLaunchProfile() .WithSource(); var testProjectDirectory = testInstance.Path; - var launchSettingsPath = Path.Combine(testProjectDirectory, "Properties", "launchSettings.json"); + var launchSettingsPath = Path.Combine(testProjectDirectory, "My Project", "launchSettings.json"); var cmd = new DotnetCommand(Log, "run") .WithWorkingDirectory(testProjectDirectory) .Execute(); cmd.Should().Pass() - .And.NotHaveStdOutContaining(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)) + .And.HaveStdErrContaining(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)) .And.HaveStdOutContaining("First"); - - cmd.StdErr.Should().BeEmpty(); } [Fact] @@ -126,10 +126,8 @@ public void ItPrintsUsingLaunchSettingsMessageWhenNotQuiet() .Execute("-v:m"); cmd.Should().Pass() - .And.HaveStdOutContaining(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)) + .And.HaveStdErrContaining(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)) .And.HaveStdOutContaining("First"); - - cmd.StdErr.Should().BeEmpty(); } [Fact] diff --git a/test/dotnet.Tests/CommandTests/Run/RunCommandTests.cs b/test/dotnet.Tests/CommandTests/Run/RunCommandTests.cs index e67a05e4678b..b8b765ed9d6d 100644 --- a/test/dotnet.Tests/CommandTests/Run/RunCommandTests.cs +++ b/test/dotnet.Tests/CommandTests/Run/RunCommandTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.DotNet.Cli.Commands; using Microsoft.DotNet.Cli.Commands.Run; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ProjectTools; @@ -68,7 +69,7 @@ public void EnvironmentVariableExpansion_Project() .And.HaveStdOutContaining("TEST_VAR1=<<>>") .And.HaveStdOutContaining("ARGS=arg1,arg2,arg3"); - cmd.StdErr.Should().BeEmpty(); + cmd.StdErr.Should().Contain(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath)); } [Fact]