Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 4 additions & 2 deletions src/BenchmarkDotNet/Extensions/StringAndTextExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,11 @@ internal static StringBuilder AppendArgument(this StringBuilder stringBuilder, s
{
return stringBuilder;
}
argument = " " + argument.Trim();
stringBuilder.Append(argument);

if (stringBuilder.Length != 0)
stringBuilder.Append(' ');

stringBuilder.Append(argument.Trim());
return stringBuilder;
}

Expand Down
68 changes: 53 additions & 15 deletions tests/BenchmarkDotNet.Tests/StringExtensionsTests.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using AwesomeAssertions;
using BenchmarkDotNet.Extensions;
using System.Text;

Expand Down Expand Up @@ -33,29 +34,66 @@ public void HtmlEncodeCharacters()
[InlineData(null, "")]
[InlineData("", "")]
[InlineData(" ", "")]
[InlineData("-n win-x64", " -n win-x64")]
[InlineData(" -n win-x64", " -n win-x64")]
[InlineData("-n win-x64 ", " -n win-x64")]
[InlineData(" -n Win-x64 ", " -n Win-x64")]
[InlineData(" a ", " a")]
[InlineData(" a ", " a")]
[InlineData(" \r\n a \r\n", " a")]
public void AppendArgumentMakesSureOneSpaceBeforeStringArgument(string? input, string expectedOutput)
[InlineData("--test", "--test")]
[InlineData(" --test", "--test")]
[InlineData("--test ", "--test")]
[InlineData("-n win-x64", "-n win-x64")]
[InlineData(" -n win-x64", "-n win-x64")]
[InlineData("-n win-x64 ", "-n win-x64")]
[InlineData(" -n Win-x64 ", "-n Win-x64")]
[InlineData(" a ", "a")]
[InlineData(" a ", "a")]
[InlineData(" \r\n a \r\n", "a")]
public void AppendArgumentWithEmptyStringBuilder(string? input, string expectedOutput)
{
// Arrange
var stringBuilder = new StringBuilder();

// Act
var result = stringBuilder.AppendArgument(input).ToString();

Assert.Equal(expectedOutput, result);
// Assert
result.Should().Be(expectedOutput);
}

[Theory]
[InlineData(null, "")]
[InlineData("", "")]
[InlineData(" ", "")]
[InlineData("--test", "--test")]
[InlineData(" --test", "--test")]
[InlineData(" --test ", "--test")]
[InlineData("-n win-x64", "-n win-x64")]
[InlineData(" -n win-x64", "-n win-x64")]
[InlineData("-n win-x64 ", "-n win-x64")]
[InlineData(" -n Win-x64 ", "-n Win-x64")]
[InlineData(" a ", "a")]
[InlineData(" a ", "a")]
[InlineData(" \r\n a \r\n", "a")]
public void AppendArgumentMultipleTimes(string? input, string expectedOutput)
{
// Arrange
var stringBuilder = new StringBuilder();
stringBuilder.AppendArgument("--firstArg");

// Act
var result = stringBuilder.AppendArgument(input).ToString();

// Assert
if (expectedOutput.IsBlank())
result.Should().Be($"--firstArg");
else
result.Should().Be($"--firstArg {expectedOutput}");
}

[Theory]
[InlineData(null, "")]
[InlineData("http://test.com/", " http://test.com/")]
[InlineData(" http://test.com/", " http://test.com/")]
[InlineData("http://test.com/ ", " http://test.com/")]
[InlineData(" http://test.com/ ", " http://test.com/")]
[InlineData("\r\n http://test.com/ \r\n", " http://test.com/")]
public void AppendArgumentMakesSureOneSpaceBeforeObjectArgument(string? input, string expectedOutput)
[InlineData("http://test.com/", "http://test.com/")]
[InlineData(" http://test.com/", "http://test.com/")]
[InlineData("http://test.com/ ", "http://test.com/")]
[InlineData(" http://test.com/ ", "http://test.com/")]
[InlineData("\r\n http://test.com/ \r\n", "http://test.com/")]
public void AppendArgumentWithObjectArgument(string? input, string expectedOutput)
{
Uri? uri = input != null ? new Uri(input) : null; // Use Uri for our object type since that is what is used in code
var stringBuilder = new StringBuilder();
Expand Down
Loading