Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsCsProj.cs
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ public void ItUsesLaunchProfileOfTheSpecifiedName()
cmd.Should().Pass()
.And.HaveStdOutContaining("Second");

cmd.StdErr.Should().BeEmpty();
cmd.StdErr.Should().Contain("Using launch settings from");
}

[Fact]
Expand All @@ -418,7 +418,6 @@ public void ItDefaultsToTheFirstUsableLaunchProfile()
.Execute();

cmd.Should().Pass()
.And.NotHaveStdOutContaining(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath))
.And.HaveStdOutContaining("First");

cmd.StdErr.Should().BeEmpty();
Comment thread
MichaelSimons marked this conversation as resolved.
Expand All @@ -441,7 +440,7 @@ public void ItSetsTheDotnetLaunchProfileEnvironmentVariableToDefaultLaunchProfil
cmd.Should().Pass()
.And.HaveStdOutContaining("DOTNET_LAUNCH_PROFILE=<<<First>>>");

cmd.StdErr.Should().BeEmpty();
cmd.StdErr.Should().Contain("Using launch settings from");
Comment thread
MichaelSimons marked this conversation as resolved.
Outdated
}

[Fact]
Expand All @@ -461,7 +460,7 @@ public void ItSetsTheDotnetLaunchProfileEnvironmentVariableToSuppliedLaunchProfi
cmd.Should().Pass()
.And.HaveStdOutContaining("DOTNET_LAUNCH_PROFILE=<<<Second>>>");

cmd.StdErr.Should().BeEmpty();
cmd.StdErr.Should().Contain("Using launch settings from");
Comment thread
MichaelSimons marked this conversation as resolved.
Outdated
}

[Fact]
Expand Down Expand Up @@ -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]
Expand All @@ -540,7 +537,7 @@ public void ItPrefersTheValueOfAppUrlFromEnvVarOverTheProp()
cmd.Should().Pass()
.And.HaveStdOutContaining("http://localhost:12345/");

cmd.StdErr.Should().BeEmpty();
cmd.StdErr.Should().Contain("Using launch settings from");
}

[Fact]
Expand All @@ -559,7 +556,7 @@ public void ItUsesTheValueOfAppUrlIfTheEnvVarIsNotSet()
cmd.Should().Pass()
.And.HaveStdOutContaining("http://localhost:54321/");

cmd.StdErr.Should().BeEmpty();
cmd.StdErr.Should().Contain("Using launch settings from");
}

[Fact]
Expand Down
12 changes: 4 additions & 8 deletions test/dotnet.Tests/CommandTests/Run/GivenDotnetRunBuildsVbProj.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public void ItUsesLaunchProfileOfTheSpecifiedName(string launchProfileName)
.And
.HaveStdOutContaining("Second")
.And
.NotHaveStdErr();
.HaveStdErrContaining("Using launch settings from");
}

[Fact]
Expand All @@ -99,17 +99,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");
Comment thread
MichaelSimons marked this conversation as resolved.

cmd.StdErr.Should().BeEmpty();
}

[Fact]
Expand All @@ -126,10 +124,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]
Expand Down
2 changes: 1 addition & 1 deletion test/dotnet.Tests/CommandTests/Run/RunCommandTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void EnvironmentVariableExpansion_Project()
.And.HaveStdOutContaining("TEST_VAR1=<<<VALUE1>>>")
.And.HaveStdOutContaining("ARGS=arg1,arg2,arg3");

cmd.StdErr.Should().BeEmpty();
cmd.StdErr.Should().Contain("Using launch settings from");
}

[Fact]
Expand Down
Loading