From e78e9fbc169467342975552511a7cd0a915afc3f Mon Sep 17 00:00:00 2001 From: Joyless <65855333+Joy-less@users.noreply.github.com> Date: Thu, 23 Jan 2025 18:15:37 +0000 Subject: [PATCH 1/3] Upgrade packages --- .../LinkDotNet.StringBuilder.csproj | 20 +++++++++++-------- ...LinkDotNet.StringBuilder.Benchmarks.csproj | 8 ++++++-- .../LinkDotNet.StringBuilder.UnitTests.csproj | 16 +++++++++------ 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/LinkDotNet.StringBuilder/LinkDotNet.StringBuilder.csproj b/src/LinkDotNet.StringBuilder/LinkDotNet.StringBuilder.csproj index 36d5cd4..4b010cc 100644 --- a/src/LinkDotNet.StringBuilder/LinkDotNet.StringBuilder.csproj +++ b/src/LinkDotNet.StringBuilder/LinkDotNet.StringBuilder.csproj @@ -33,16 +33,16 @@ - - AllEnabledByDefault - true - 8 - true - MIT - + + AllEnabledByDefault + true + 8 + true + MIT + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -50,6 +50,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + \ No newline at end of file diff --git a/tests/LinkDotNet.StringBuilder.Benchmarks/LinkDotNet.StringBuilder.Benchmarks.csproj b/tests/LinkDotNet.StringBuilder.Benchmarks/LinkDotNet.StringBuilder.Benchmarks.csproj index c714f0a..ed2eab8 100644 --- a/tests/LinkDotNet.StringBuilder.Benchmarks/LinkDotNet.StringBuilder.Benchmarks.csproj +++ b/tests/LinkDotNet.StringBuilder.Benchmarks/LinkDotNet.StringBuilder.Benchmarks.csproj @@ -9,11 +9,15 @@ - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj b/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj index ca3ea97..906c390 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj +++ b/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj @@ -1,4 +1,4 @@ - + net8.0;net9.0 @@ -8,21 +8,25 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + From 219e0fc9a06213de2dbd9ca74969c7494b083ed5 Mon Sep 17 00:00:00 2001 From: Joyless <65855333+Joy-less@users.noreply.github.com> Date: Thu, 23 Jan 2025 18:23:06 +0000 Subject: [PATCH 2/3] Migrate from FluentAssertions to Shouldly --- .../LinkDotNet.StringBuilder.UnitTests.csproj | 4 +- .../ValueStringBuilder.Append.Tests.cs | 38 ++++---- .../ValueStringBuilder.AppendFormat.Tests.cs | 10 +- .../ValueStringBuilder.AppendJoin.Tests.cs | 8 +- .../ValueStringBuilder.Insert.Tests.cs | 10 +- .../ValueStringBuilder.Pad.Tests.cs | 8 +- .../ValueStringBuilder.Replace.Tests.cs | 30 +++--- .../ValueStringBuilder.Trim.Tests.cs | 12 +-- .../ValueStringBuilderExtensionsTests.cs | 6 +- .../ValueStringBuilderTests.cs | 96 +++++++++---------- 10 files changed, 111 insertions(+), 111 deletions(-) diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj b/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj index 906c390..ff3499c 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj +++ b/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj @@ -8,8 +8,8 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -30,7 +30,7 @@ - + diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Append.Tests.cs b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Append.Tests.cs index e582764..ccc7b2c 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Append.Tests.cs +++ b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Append.Tests.cs @@ -11,7 +11,7 @@ public void ShouldAddString() stringBuilder.Append("That is a string"); - stringBuilder.ToString().Should().Be("That is a string"); + stringBuilder.ToString().ShouldBe("That is a string"); } [Fact] @@ -24,7 +24,7 @@ public void ShouldAddMultipleStrings() stringBuilder.Append("a"); stringBuilder.Append("test"); - stringBuilder.ToString().Should().Be("Thisisatest"); + stringBuilder.ToString().ShouldBe("Thisisatest"); } [Fact] @@ -34,7 +34,7 @@ public void ShouldAddLargeStrings() stringBuilder.Append(new string('c', 99)); - stringBuilder.ToString().Should().MatchRegex("[c]{99}"); + stringBuilder.ToString().ShouldMatch("[c]{99}"); } [Fact] @@ -44,7 +44,7 @@ public void ShouldAppendLine() stringBuilder.AppendLine("Hello"); - stringBuilder.ToString().Should().Contain("Hello").And.Contain(Environment.NewLine); + stringBuilder.ToString().ShouldContain("Hello" + Environment.NewLine); } [Fact] @@ -54,9 +54,9 @@ public void ShouldAppendSpan() var returned = stringBuilder.AppendSpan(2); - stringBuilder.Length.Should().Be(2); + stringBuilder.Length.ShouldBe(2); - stringBuilder.ToString().Should().Be(returned.ToString()); + stringBuilder.ToString().ShouldBe(returned.ToString()); } [Fact] @@ -66,7 +66,7 @@ public void ShouldOnlyAddNewline() stringBuilder.AppendLine(); - stringBuilder.ToString().Should().Be(Environment.NewLine); + stringBuilder.ToString().ShouldBe(Environment.NewLine); } [Fact] @@ -76,7 +76,7 @@ public void ShouldGetIndexIfGiven() stringBuilder.Append("Hello"); - stringBuilder[2].Should().Be('l'); + stringBuilder[2].ShouldBe('l'); } [Fact] @@ -86,7 +86,7 @@ public void ShouldAppendSpanFormattable() builder.Append(2.2f); - builder.ToString().Should().Be("2.2"); + builder.ToString().ShouldBe("2.2"); } [Fact] @@ -99,7 +99,7 @@ public void ShouldAppendMultipleChars() builder.Append('c'); } - builder.ToString().Should().MatchRegex("[c]{64}"); + builder.ToString().ShouldMatch("[c]{64}"); } [Fact] @@ -111,7 +111,7 @@ public void ShouldAppendMultipleDoubles() builder.Append(1d / 3d); builder.Append(1d / 3d); - builder.ToString().Should().Be("0.33333333333333330.33333333333333330.3333333333333333"); + builder.ToString().ShouldBe("0.33333333333333330.33333333333333330.3333333333333333"); } [Fact] @@ -121,7 +121,7 @@ public void ShouldAppendGuid() builder.Append(Guid.Empty); - builder.ToString().Should().Be("00000000-0000-0000-0000-000000000000"); + builder.ToString().ShouldBe("00000000-0000-0000-0000-000000000000"); } [Fact] @@ -151,7 +151,7 @@ public void ShouldAppendBoolean(bool value, string expected) builder.Append(value); - builder.ToString().Should().Be(expected); + builder.ToString().ShouldBe(expected); } [Fact] @@ -165,7 +165,7 @@ public unsafe void ShouldAddCharPointer() builder.Append(pText, 5); } - builder.ToString().Should().Be("Hello"); + builder.ToString().ShouldBe("Hello"); } [Fact] @@ -178,7 +178,7 @@ public void GivenMemorySlice_ShouldAppend() builder.Append(slice); - builder.ToString().Should().Be("ccccc"); + builder.ToString().ShouldBe("ccccc"); } [Fact] @@ -189,7 +189,7 @@ public void GivenAStringWithWhitespace_WhenTrimIsCalled_ThenTheStringShouldBeTri builder.Trim(); - builder.ToString().Should().Be("Hello World"); + builder.ToString().ShouldBe("Hello World"); } [Fact] @@ -206,7 +206,7 @@ public void GivenMultipleValues_WhenCallingAppend_NotCrashing() builder.Append(false); - builder.ToString().Should().NotBeNull(); + builder.ToString().ShouldNotBeNull(); } [Fact] @@ -215,7 +215,7 @@ public void GivenStringBuilder_WhenAddingSingleCharacter_ThenShouldBeAdded() using var builder = new ValueStringBuilder(); builder.Append('c'); - builder.ToString().Should().Be("c"); + builder.ToString().ShouldBe("c"); } [Fact] @@ -229,6 +229,6 @@ public void GivenStringBuilder_WhenAddingIncreasinglyLargerStrings_ThenShouldBeA builder.Append(new string('e', 4096)); builder.Append(new string('f', 8192)); - builder.ToString().Should().MatchRegex("[a]{256}[b]{512}[c]{1024}[d]{2048}[e]{4096}[f]{8192}"); + builder.ToString().ShouldMatch("[a]{256}[b]{512}[c]{1024}[d]{2048}[e]{4096}[f]{8192}"); } } \ No newline at end of file diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.AppendFormat.Tests.cs b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.AppendFormat.Tests.cs index fa8310f..43cfce4 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.AppendFormat.Tests.cs +++ b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.AppendFormat.Tests.cs @@ -15,7 +15,7 @@ public void ShouldAppendFormatWithOneArgument(string format, object arg, string builder.AppendFormat(format, arg); - builder.ToString().Should().Be(expected); + builder.ToString().ShouldBe(expected); } [Theory] @@ -50,7 +50,7 @@ public void ShouldAppendFormatWithTwoArguments(string format, object arg1, objec builder.AppendFormat(format, arg1, arg2); - builder.ToString().Should().Be(expected); + builder.ToString().ShouldBe(expected); } [Theory] @@ -64,7 +64,7 @@ public void ShouldAppendFormatWithThreeArguments(string format, object arg1, obj builder.AppendFormat(format, arg1, arg2, arg3); - builder.ToString().Should().Be(expected); + builder.ToString().ShouldBe(expected); } [Theory] @@ -78,7 +78,7 @@ public void ShouldAppendFormatWithFourArguments(string format, object arg1, obje builder.AppendFormat(format, arg1, arg2, arg3, arg4); - builder.ToString().Should().Be(expected); + builder.ToString().ShouldBe(expected); } [Theory] @@ -92,6 +92,6 @@ public void ShouldAppendFormatWithFiveArguments(string format, object arg1, obje builder.AppendFormat(format, arg1, arg2, arg3, arg4, arg5); - builder.ToString().Should().Be(expected); + builder.ToString().ShouldBe(expected); } } \ No newline at end of file diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.AppendJoin.Tests.cs b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.AppendJoin.Tests.cs index 6a53769..37328f8 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.AppendJoin.Tests.cs +++ b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.AppendJoin.Tests.cs @@ -29,7 +29,7 @@ public void ShouldAppendWithStringSeparator(string separator, IEnumerable v stringBuilder.AppendJoin(separator, values); - stringBuilder.ToString().Should().Be(expected); + stringBuilder.ToString().ShouldBe(expected); } [Fact] @@ -50,7 +50,7 @@ public void ShouldAddDataWithStringSeparator() stringBuilder.AppendJoin(",", new object[] { 1, 1.05f }); - stringBuilder.ToString().Should().Be("1,1.05"); + stringBuilder.ToString().ShouldBe("1,1.05"); } [Fact] @@ -60,6 +60,6 @@ public void ShouldAddDataWithCharSeparator() stringBuilder.AppendJoin(',', new object[] { 1, 1.05f }); - stringBuilder.ToString().Should().Be("1,1.05"); + stringBuilder.ToString().ShouldBe("1,1.05"); } } \ No newline at end of file diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Insert.Tests.cs b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Insert.Tests.cs index 5486f8d..9b4e4f1 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Insert.Tests.cs +++ b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Insert.Tests.cs @@ -12,7 +12,7 @@ public void ShouldInsertString() valueStringBuilder.Insert(6, "dear "); - valueStringBuilder.ToString().Should().Be("Hello dear World"); + valueStringBuilder.ToString().ShouldBe("Hello dear World"); } [Fact] @@ -22,7 +22,7 @@ public void ShouldInsertWhenEmpty() valueStringBuilder.Insert(0, "Hello"); - valueStringBuilder.ToString().Should().Be("Hello"); + valueStringBuilder.ToString().ShouldBe("Hello"); } [Fact] @@ -32,7 +32,7 @@ public void ShouldAppendSpanFormattable() builder.Insert(0, 2.2f); - builder.ToString().Should().Be("2.2"); + builder.ToString().ShouldBe("2.2"); } [Fact] @@ -114,7 +114,7 @@ public void ShouldInsertGuid() builder.Insert(0, Guid.Empty); - builder.ToString().Should().Be("00000000-0000-0000-0000-000000000000"); + builder.ToString().ShouldBe("00000000-0000-0000-0000-000000000000"); } [Fact] @@ -142,6 +142,6 @@ public void ShouldInsertBool() builder.Insert(0, true); - builder.ToString().Should().Be("True"); + builder.ToString().ShouldBe("True"); } } \ No newline at end of file diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Pad.Tests.cs b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Pad.Tests.cs index 5c494a5..4bef74e 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Pad.Tests.cs +++ b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Pad.Tests.cs @@ -9,7 +9,7 @@ public void ShouldPadLeft() stringBuilder.PadLeft(10, ' '); - stringBuilder.ToString().Should().Be(" Hello"); + stringBuilder.ToString().ShouldBe(" Hello"); } [Fact] @@ -19,7 +19,7 @@ public void ShouldPadRight() stringBuilder.PadRight(10, ' '); - stringBuilder.ToString().Should().Be("Hello "); + stringBuilder.ToString().ShouldBe("Hello "); } [Fact] @@ -29,7 +29,7 @@ public void GivenTotalWidthIsSmallerThanCurrentLength_WhenPadLeft_ThenShouldNotC stringBuilder.PadLeft(3, ' '); - stringBuilder.ToString().Should().Be("Hello"); + stringBuilder.ToString().ShouldBe("Hello"); } [Fact] @@ -39,6 +39,6 @@ public void GivenTotalWidthIsSmallerThanCurrentLength_WhenPadRight_ThenShouldNot stringBuilder.PadRight(3, ' '); - stringBuilder.ToString().Should().Be("Hello"); + stringBuilder.ToString().ShouldBe("Hello"); } } \ No newline at end of file diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Replace.Tests.cs b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Replace.Tests.cs index bcb5450..319812c 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Replace.Tests.cs +++ b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Replace.Tests.cs @@ -12,7 +12,7 @@ public void ShouldReplaceAllCharacters() builder.Replace('C', 'B'); - builder.ToString().Should().MatchRegex("[B]{100}"); + builder.ToString().ShouldMatch("[B]{100}"); } [Fact] @@ -23,7 +23,7 @@ public void ShouldReplaceAllCharactersInGivenSpan() builder.Replace('C', 'B', 1, 2); - builder.ToString().Should().Be("CBBC"); + builder.ToString().ShouldBe("CBBC"); } [Theory] @@ -54,7 +54,7 @@ public void ShouldReplaceAllText() builder.Replace("Hello", "Hallöchen"); - builder.ToString().Should().Be("Hallöchen World. How are you doing. Hallöchen world examples are always fun."); + builder.ToString().ShouldBe("Hallöchen World. How are you doing. Hallöchen world examples are always fun."); } [Fact] @@ -64,7 +64,7 @@ public void ShouldReplacePartThatIsShorter() builder.Replace("Hello", "Ha"); - builder.ToString().Should().Be("Ha World"); + builder.ToString().ShouldBe("Ha World"); } [Fact] @@ -74,7 +74,7 @@ public void ShouldReplacePartThatIsLonger() builder.Replace("Hello", "Hallöchen"); - builder.ToString().Should().Be("Hallöchen World"); + builder.ToString().ShouldBe("Hallöchen World"); } [Fact] @@ -84,7 +84,7 @@ public void ShouldReplacePartThatIsPartiallySimilar() builder.Replace("##Key##", "World"); - builder.ToString().Should().Be("Hello World"); + builder.ToString().ShouldBe("Hello World"); } [Theory] @@ -98,7 +98,7 @@ public void ShouldNotReplaceWhenLengthMismatch(string text, string word) builder.Replace(word, "Something"); - builder.ToString().Should().Be(text); + builder.ToString().ShouldBe(text); } [Fact] @@ -109,7 +109,7 @@ public void ShouldBeTheSameWhenOldAndNewTheSame() builder.Replace("word", "word"); - builder.ToString().Should().Be("text"); + builder.ToString().ShouldBe("text"); } [Fact] @@ -120,7 +120,7 @@ public void ShouldNotAlterIfNotFound() builder.Replace("Test", "Not"); - builder.ToString().Should().Be("Hello"); + builder.ToString().ShouldBe("Hello"); } [Fact] @@ -131,7 +131,7 @@ public void ShouldReplaceInSpan() builder.Replace("Hello", "Hallöchen", 0, 10); - builder.ToString().Should().Be("Hallöchen World. How are you doing. Hello world examples are always fun."); + builder.ToString().ShouldBe("Hallöchen World. How are you doing. Hello world examples are always fun."); } [Fact] @@ -142,7 +142,7 @@ public void ShouldReplaceISpanFormattable() builder.ReplaceGeneric("{0}", 1.2f); - builder.ToString().Should().Be("1.2"); + builder.ToString().ShouldBe("1.2"); } [Fact] @@ -153,7 +153,7 @@ public void ShouldReplaceISpanFormattableSlice() builder.ReplaceGeneric("{0}", 1, 0, 6); - builder.ToString().Should().Be("11{0}"); + builder.ToString().ShouldBe("11{0}"); } [Fact] @@ -164,7 +164,7 @@ public void ShouldReplaceNonISpanFormattable() builder.ReplaceGeneric("{0}", default(MyStruct)); - builder.ToString().Should().Be("Hello"); + builder.ToString().ShouldBe("Hello"); } [Fact] @@ -175,7 +175,7 @@ public void ShouldReplaceNonISpanFormattableInSlice() builder.ReplaceGeneric("{0}", default(MyStruct), 0, 6); - builder.ToString().Should().Be("HelloHello{0}"); + builder.ToString().ShouldBe("HelloHello{0}"); } [Fact] @@ -186,7 +186,7 @@ public void ShouldReplaceAllOccurrences() builder.Replace("A", "C"); - builder.ToString().Should().MatchRegex("[CB]{100}"); + builder.ToString().ShouldMatch("[CB]{100}"); } private struct MyStruct diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Trim.Tests.cs b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Trim.Tests.cs index f7ce2ff..f616681 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Trim.Tests.cs +++ b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilder.Trim.Tests.cs @@ -14,7 +14,7 @@ public void GivenStringWithWhitespaces_WhenTrimStart_ThenShouldRemoveWhitespaces valueStringBuilder.TrimStart(); - valueStringBuilder.ToString().Should().Be(expected); + valueStringBuilder.ToString().ShouldBe(expected); } [Theory] @@ -29,7 +29,7 @@ public void GivenStringWithWhitespaces_WhenTrimEnd_ThenShouldRemoveWhitespaces(s valueStringBuilder.TrimEnd(); - valueStringBuilder.ToString().Should().Be(expected); + valueStringBuilder.ToString().ShouldBe(expected); } [Theory] @@ -44,7 +44,7 @@ public void GivenStringWithWhitespaces_WhenTrim_ThenShouldRemoveWhitespaces(stri valueStringBuilder.Trim(); - valueStringBuilder.ToString().Should().Be(expected); + valueStringBuilder.ToString().ShouldBe(expected); } [Fact] @@ -55,7 +55,7 @@ public void GivenString_WhenTrimStartCharacter_ThenShouldRemoveCharacter() valueStringBuilder.TrimStart('H'); - valueStringBuilder.ToString().Should().Be("eeHH"); + valueStringBuilder.ToString().ShouldBe("eeHH"); } [Fact] @@ -66,7 +66,7 @@ public void GivenString_WhenTrimEndCharacter_ThenShouldRemoveCharacter() valueStringBuilder.TrimEnd('H'); - valueStringBuilder.ToString().Should().Be("HHee"); + valueStringBuilder.ToString().ShouldBe("HHee"); } [Fact] @@ -77,6 +77,6 @@ public void GivenString_WhenTrimCharacter_ThenShouldRemoveCharacter() valueStringBuilder.Trim('H'); - valueStringBuilder.ToString().Should().Be("ee"); + valueStringBuilder.ToString().ShouldBe("ee"); } } \ No newline at end of file diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilderExtensionsTests.cs b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilderExtensionsTests.cs index 9ff75fb..b1f28f8 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilderExtensionsTests.cs +++ b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilderExtensionsTests.cs @@ -12,7 +12,7 @@ public void ShouldConvertToStringBuilder() var fromBuilder = valueStringBuilder.ToStringBuilder().ToString(); - fromBuilder.Should().Be("Hello"); + fromBuilder.ShouldBe("Hello"); } [Fact] @@ -23,7 +23,7 @@ public void ShouldConvertFromStringBuilder() var toBuilder = stringBuilder.ToValueStringBuilder(); - toBuilder.ToString().Should().Be("Hello"); + toBuilder.ToString().ShouldBe("Hello"); } [Fact] @@ -33,6 +33,6 @@ public void ShouldThrowWhenStringBuilderNull() Action act = () => sb.ToValueStringBuilder(); - act.Should().Throw(); + act.ShouldThrow(); } } \ No newline at end of file diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilderTests.cs b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilderTests.cs index 35ee56f..eb3c5d6 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilderTests.cs +++ b/tests/LinkDotNet.StringBuilder.UnitTests/ValueStringBuilderTests.cs @@ -32,8 +32,8 @@ public void ShouldTryToCopySpan() var result = stringBuilder.TryCopyTo(mySpan); - result.Should().BeTrue(); - mySpan.ToString().Should().Be("Hello"); + result.ShouldBeTrue(); + mySpan.ToString().ShouldBe("Hello"); } [Fact] @@ -44,7 +44,7 @@ public void ShouldReturnSpan() var output = stringBuilder.AsSpan().ToString(); - output.Should().Be("Hello"); + output.ShouldBe("Hello"); } [Fact] @@ -55,7 +55,7 @@ public void ShouldReturnLength() var length = stringBuilder.Length; - length.Should().Be(5); + length.ShouldBe(5); } [Fact] @@ -66,8 +66,8 @@ public void ShouldClear() stringBuilder.Clear(); - stringBuilder.Length.Should().Be(0); - stringBuilder.ToString().Should().Be(string.Empty); + stringBuilder.Length.ShouldBe(0); + stringBuilder.ToString().ShouldBe(string.Empty); } [Fact] @@ -75,7 +75,7 @@ public void ShouldReturnEmptyStringWhenInitialized() { using var stringBuilder = new ValueStringBuilder(); - stringBuilder.ToString().Should().Be(string.Empty); + stringBuilder.ToString().ShouldBe(string.Empty); } [Fact] @@ -86,8 +86,8 @@ public void ShouldRemoveRange() stringBuilder.Remove(0, 6); - stringBuilder.Length.Should().Be(5); - stringBuilder.ToString().Should().Be("World"); + stringBuilder.Length.ShouldBe(5); + stringBuilder.ToString().ShouldBe("World"); } [Theory] @@ -120,7 +120,7 @@ public void ShouldNotRemoveEntriesWhenLengthIsEqualToZero() stringBuilder.Remove(0, 0); - stringBuilder.ToString().Should().Be("Hello"); + stringBuilder.ToString().ShouldBe("Hello"); } [Fact] @@ -131,9 +131,9 @@ public unsafe void ShouldGetPinnableReference() fixed (char* c = stringBuilder) { - c[0].Should().Be('H'); - c[1].Should().Be('e'); - c[2].Should().Be('y'); + c[0].ShouldBe('H'); + c[1].ShouldBe('e'); + c[2].ShouldBe('y'); } } @@ -145,7 +145,7 @@ public void ShouldGetIndexOfWord() var index = stringBuilder.IndexOf("World"); - index.Should().Be(6); + index.ShouldBe(6); } [Fact] @@ -156,7 +156,7 @@ public void ShouldFindInSubstring() var index = stringBuilder.IndexOf("l", 6); - index.Should().Be(3); + index.ShouldBe(3); } [Fact] @@ -203,7 +203,7 @@ public void ShouldReturnMinusOneIfNotFound() var index = stringBuilder.IndexOf("Mountain"); - index.Should().Be(-1); + index.ShouldBe(-1); } [Fact] @@ -213,7 +213,7 @@ public void ShouldReturnZeroIfBothEmpty() var index = stringBuilder.IndexOf(string.Empty); - index.Should().Be(0); + index.ShouldBe(0); } [Fact] @@ -224,7 +224,7 @@ public void ShouldReturnMinusOneWordIsLongerThanString() var index = stringBuilder.IndexOf("Hello World but longer"); - index.Should().Be(-1); + index.ShouldBe(-1); } [Fact] @@ -235,7 +235,7 @@ public void ShouldReturnMinusOneIfStringIsEmpty() var index = stringBuilder.IndexOf("word"); - index.Should().Be(-1); + index.ShouldBe(-1); } [Fact] @@ -245,7 +245,7 @@ public void ShouldSetCapacity() builder.EnsureCapacity(128); - builder.Capacity.Should().Be(128); + builder.Capacity.ShouldBe(128); } [Fact] @@ -256,7 +256,7 @@ public void ShouldNotSetCapacityWhenSmallerThanCurrentString() builder.EnsureCapacity(16); - builder.Length.Should().BeGreaterOrEqualTo(128); + builder.Length.ShouldBeGreaterThanOrEqualTo(128); } [Fact] @@ -267,7 +267,7 @@ public void ShouldFindLastOccurence() var index = builder.LastIndexOf("Hello"); - index.Should().Be(6); + index.ShouldBe(6); } [Fact] @@ -278,7 +278,7 @@ public void ShouldFindLastOccurenceInSlice() var index = builder.LastIndexOf("Hello", 6); - index.Should().Be(0); + index.ShouldBe(0); } [Fact] @@ -286,7 +286,7 @@ public void ShouldFindLastIndex() { using var builder = new ValueStringBuilder("Hello"); - builder.LastIndexOf("o").Should().Be(4); + builder.LastIndexOf("o").ShouldBe(4); } [Fact] @@ -297,7 +297,7 @@ public void ShouldReturnZeroWhenEmptyStringInIndexOf() var index = builder.IndexOf(string.Empty, 6); - index.Should().Be(0); + index.ShouldBe(0); } [Fact] @@ -307,7 +307,7 @@ public void ShouldReturnZeroIfBothEmptyLastIndexOf() var index = stringBuilder.LastIndexOf(string.Empty); - index.Should().Be(0); + index.ShouldBe(0); } [Fact] @@ -318,7 +318,7 @@ public void ShouldReturnZeroWhenEmptyStringInLastIndexOf() var index = builder.LastIndexOf(string.Empty, 6); - index.Should().Be(0); + index.ShouldBe(0); } [Theory] @@ -332,7 +332,7 @@ public void ShouldReturnIfStringIsPresent(string word, bool expected) var index = builder.Contains(word); - index.Should().Be(expected); + index.ShouldBe(expected); } [Fact] @@ -343,7 +343,7 @@ public void ShouldUseInitialBuffer() builder.Append("Hello"); - builder.ToString().Should().Be("Hello"); + builder.ToString().ShouldBe("Hello"); } [Fact] @@ -361,7 +361,7 @@ public void ShouldConcatStringsTogether() { var result = ValueStringBuilder.Concat("Hello", " ", "World"); - result.Should().Be("Hello World"); + result.ShouldBe("Hello World"); } [Fact] @@ -369,7 +369,7 @@ public void ConcatDifferentTypesWithTwoArguments() { var result = ValueStringBuilder.Concat("Test", 1); - result.Should().Be("Test1"); + result.ShouldBe("Test1"); } [Fact] @@ -377,7 +377,7 @@ public void ConcatDifferentTypesWithThreeArguments() { var result = ValueStringBuilder.Concat("Test", 1, 2); - result.Should().Be("Test12"); + result.ShouldBe("Test12"); } [Fact] @@ -385,7 +385,7 @@ public void ConcatDifferentTypesWithFourArguments() { var result = ValueStringBuilder.Concat("Test", 1, 2, 3); - result.Should().Be("Test123"); + result.ShouldBe("Test123"); } [Fact] @@ -393,7 +393,7 @@ public void ConcatDifferentTypesWithFiveArguments() { var result = ValueStringBuilder.Concat("Test", 1, 2, 3, 4); - result.Should().Be("Test1234"); + result.ShouldBe("Test1234"); } [Fact] @@ -401,7 +401,7 @@ public void ShouldAcceptInitialCharBuffer() { var result = new ValueStringBuilder("Hello World").ToString(); - result.Should().Be("Hello World"); + result.ShouldBe("Hello World"); } [Fact] @@ -409,7 +409,7 @@ public void ReturnSubstring() { var result = new ValueStringBuilder("Hello World").ToString(1, 3); - result.Should().Be("ell"); + result.ShouldBe("ell"); } [Fact] @@ -417,7 +417,7 @@ public void ImplicitCastFromStringToValueStringBuilder() { using ValueStringBuilder sb = "Hello World"; - sb.ToString().Should().Be("Hello World"); + sb.ToString().ShouldBe("Hello World"); } [Fact] @@ -425,7 +425,7 @@ public void ImplicitCastFromReadOnlySpanToValueStringBuilder() { using ValueStringBuilder sb = "Hello World".AsSpan(); - sb.ToString().Should().Be("Hello World"); + sb.ToString().ShouldBe("Hello World"); } [Fact] @@ -433,7 +433,7 @@ public void ConcatArbitraryValues() { var result = ValueStringBuilder.Concat("Hello", " ", "World"); - result.Should().Be("Hello World"); + result.ShouldBe("Hello World"); } [Fact] @@ -441,7 +441,7 @@ public void ShouldReturnEmptyStringIfEmptyArray() { var result = ValueStringBuilder.Concat(Array.Empty()); - result.Should().Be(string.Empty); + result.ShouldBe(string.Empty); } [Fact] @@ -449,7 +449,7 @@ public void ConcatBooleanWithNumber() { var result = ValueStringBuilder.Concat(true, 1); - result.Should().Be("True1"); + result.ShouldBe("True1"); } [Theory] @@ -461,7 +461,7 @@ public void GivenReadOnlySpan_WhenCallingEquals_ThenReturningWhenEqual(string in var isEqual = builder.Equals(input); - isEqual.Should().Be(expected); + isEqual.ShouldBe(expected); } [Fact] @@ -469,7 +469,7 @@ public void ConcatShouldHandleNullValues() { string[]? array = null; - ValueStringBuilder.Concat(array!).Should().Be(string.Empty); + ValueStringBuilder.Concat(array!).ShouldBe(string.Empty); } [Fact] @@ -479,7 +479,7 @@ public void ShouldReverseString() builder.Reverse(); - builder.ToString().Should().Be("olleH"); + builder.ToString().ShouldBe("olleH"); } [Fact] @@ -487,7 +487,7 @@ public void GivenAString_WhenCallingToStringWithRange_ThenShouldReturnSubstring( { using var builder = new ValueStringBuilder("Hello World"); - builder.ToString(1..4).Should().Be("ell"); + builder.ToString(1..4).ShouldBe("ell"); } [Fact] @@ -501,7 +501,7 @@ public void GivenAString_WhenEnumerating_ThenShouldReturnCharacters() output += c; } - output.Should().Be("Hello World"); + output.ShouldBe("Hello World"); } [Fact] @@ -511,7 +511,7 @@ public void GivenStringBuilder_WhenDisposed_ThenEmptyStringReturned() builder.Dispose(); - builder.ToString().Should().Be(string.Empty); + builder.ToString().ShouldBe(string.Empty); } [Fact] @@ -519,6 +519,6 @@ public void ShouldInitializeWithCapacity() { using var builder = new ValueStringBuilder(128); - builder.Capacity.Should().Be(128); + builder.Capacity.ShouldBe(128); } } \ No newline at end of file From 980455183dc9f574e6c7705eb6f7af8cc4ce90a6 Mon Sep 17 00:00:00 2001 From: Joyless <65855333+Joy-less@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:17:36 +0000 Subject: [PATCH 3/3] Moved SonarAnalyzer.CSharp from .csproj to Directory.Build.props --- Directory.Build.props | 2 +- .../LinkDotNet.StringBuilder.csproj | 6 +----- .../LinkDotNet.StringBuilder.Benchmarks.csproj | 6 +----- .../LinkDotNet.StringBuilder.UnitTests.csproj | 4 ---- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index a6fd40d..23ee8ed 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/LinkDotNet.StringBuilder/LinkDotNet.StringBuilder.csproj b/src/LinkDotNet.StringBuilder/LinkDotNet.StringBuilder.csproj index 4b010cc..fa16f69 100644 --- a/src/LinkDotNet.StringBuilder/LinkDotNet.StringBuilder.csproj +++ b/src/LinkDotNet.StringBuilder/LinkDotNet.StringBuilder.csproj @@ -1,4 +1,4 @@ - + net8.0;net9.0 @@ -50,10 +50,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - \ No newline at end of file diff --git a/tests/LinkDotNet.StringBuilder.Benchmarks/LinkDotNet.StringBuilder.Benchmarks.csproj b/tests/LinkDotNet.StringBuilder.Benchmarks/LinkDotNet.StringBuilder.Benchmarks.csproj index ed2eab8..d0e0251 100644 --- a/tests/LinkDotNet.StringBuilder.Benchmarks/LinkDotNet.StringBuilder.Benchmarks.csproj +++ b/tests/LinkDotNet.StringBuilder.Benchmarks/LinkDotNet.StringBuilder.Benchmarks.csproj @@ -1,4 +1,4 @@ - + Exe @@ -10,10 +10,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj b/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj index ff3499c..2161933 100644 --- a/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj +++ b/tests/LinkDotNet.StringBuilder.UnitTests/LinkDotNet.StringBuilder.UnitTests.csproj @@ -19,10 +19,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - all - runtime; build; native; contentfiles; analyzers; buildtransitive -