diff --git a/Directory.Packages.props b/Directory.Packages.props index b7b1cee3..2f690e84 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -22,11 +22,11 @@ - - - - - + + + + + @@ -65,8 +65,8 @@ - - + + \ No newline at end of file diff --git a/tests/InfiniBlazorTests.Core.Emotes/EmbeddedResourceEmoteDataLoaderTests.cs b/tests/InfiniBlazorTests.Core.Emotes/EmbeddedResourceEmoteDataLoaderTests.cs index 7490339e..1684230e 100644 --- a/tests/InfiniBlazorTests.Core.Emotes/EmbeddedResourceEmoteDataLoaderTests.cs +++ b/tests/InfiniBlazorTests.Core.Emotes/EmbeddedResourceEmoteDataLoaderTests.cs @@ -23,6 +23,6 @@ public async Task CountShouldReturnExpected() { Stream[] streamArray = streams.ToArray(); // Assert - await Assert.That(streamArray).HasCount().GreaterThanOrEqualTo(4); + await Assert.That(streamArray).Count().IsGreaterThanOrEqualTo(4); } } diff --git a/tests/InfiniBlazorTests.Core.Markdown/MdTestDataProviderTests.cs b/tests/InfiniBlazorTests.Core.Markdown/MdTestDataProviderTests.cs index 33489267..a18be4de 100644 --- a/tests/InfiniBlazorTests.Core.Markdown/MdTestDataProviderTests.cs +++ b/tests/InfiniBlazorTests.Core.Markdown/MdTestDataProviderTests.cs @@ -67,7 +67,7 @@ public async Task TryGetFileNames_ReturnsExpected() { // Assert await Assert.That(fileNames) .IsNotNull() - .HasCount().GreaterThanOrEqualTo(2); + .Count().IsGreaterThanOrEqualTo(2); await Assert.That(fileNames) .Contains(filePath => filePath == "bold.xml"); @@ -89,7 +89,7 @@ public async Task TryGetXmlMdTestDataAsync_ReturnsDataSet(string fileName, int m // Assert await Assert.That(data) .IsNotNull() - .HasCount().GreaterThanOrEqualTo(minimumExpectedCount); + .Count().IsGreaterThanOrEqualTo(minimumExpectedCount); } [Test] @@ -104,7 +104,7 @@ public async Task TryGetXmlMdTestData_ReturnsDataSet(string fileName, int minimu // Assert await Assert.That(data) .IsNotNull() - .HasCount().GreaterThanOrEqualTo(minimumExpectedCount); + .Count().IsGreaterThanOrEqualTo(minimumExpectedCount); } [Test] diff --git a/tests/InfiniBlazorTests.Core.Markdown/Parsers/Json/MdSyntaxTreeJsonParserTests.cs b/tests/InfiniBlazorTests.Core.Markdown/Parsers/Json/MdSyntaxTreeJsonParserTests.cs index a376b37b..74914c65 100644 --- a/tests/InfiniBlazorTests.Core.Markdown/Parsers/Json/MdSyntaxTreeJsonParserTests.cs +++ b/tests/InfiniBlazorTests.Core.Markdown/Parsers/Json/MdSyntaxTreeJsonParserTests.cs @@ -118,7 +118,7 @@ public async Task DeserializeFromStreamAsync_ShouldBuildCorrectTree() { await Assert.That(linkNode.Href).IsEqualTo("https://example.com"); List children = linkNode.GetChildren().ToList(); - await Assert.That(children).HasCount().EqualTo(2); + await Assert.That(children).Count().IsEqualTo(2); IMdSyntaxNode firstChild = children[0]; await Assert.That(firstChild).IsNotNull(); @@ -149,7 +149,7 @@ public async Task DeserializeFromFileAsync_ShouldBuildCorrectTree() { await Assert.That(linkNode.Href).IsEqualTo("https://example.com"); List children = linkNode.GetChildren().ToList(); - await Assert.That(children).HasCount().EqualTo(2); + await Assert.That(children).Count().IsEqualTo(2); IMdSyntaxNode firstChild = children[0]; await Assert.That(firstChild).IsNotNull(); diff --git a/tests/InfiniBlazorTests.Core.Markdown/Parsers/Xml/MdSyntaxNodeXmlParserTests.cs b/tests/InfiniBlazorTests.Core.Markdown/Parsers/Xml/MdSyntaxNodeXmlParserTests.cs index 41370df1..d5623605 100644 --- a/tests/InfiniBlazorTests.Core.Markdown/Parsers/Xml/MdSyntaxNodeXmlParserTests.cs +++ b/tests/InfiniBlazorTests.Core.Markdown/Parsers/Xml/MdSyntaxNodeXmlParserTests.cs @@ -101,7 +101,7 @@ public async Task DeserializeFromStreamAsync_ShouldBuildCorrectTree() { await Assert.That(listNode.Href).IsEqualTo("https://example.com"); List children = listNode.GetChildren().ToList(); - await Assert.That(children).HasCount(2); + await Assert.That(children).Count().IsEqualTo(2); IMdSyntaxNode firstChild = children[0]; await Assert.That(firstChild).IsNotNull(); @@ -132,7 +132,7 @@ public async Task DeserializeFromFileAsync_ShouldBuildCorrectTree() { await Assert.That(listNode.Href).IsEqualTo("https://example.com"); List children = listNode.GetChildren().ToList(); - await Assert.That(children).HasCount(2); + await Assert.That(children).Count().IsEqualTo(2); IMdSyntaxNode firstChild = children[0]; await Assert.That(firstChild).IsNotNull(); diff --git a/tests/InfiniBlazorTests.Core.Markdown/Parsers/Xml/XmlMdTestDataTests.cs b/tests/InfiniBlazorTests.Core.Markdown/Parsers/Xml/XmlMdTestDataTests.cs index a508e590..de7a8ae9 100644 --- a/tests/InfiniBlazorTests.Core.Markdown/Parsers/Xml/XmlMdTestDataTests.cs +++ b/tests/InfiniBlazorTests.Core.Markdown/Parsers/Xml/XmlMdTestDataTests.cs @@ -83,8 +83,8 @@ public async Task SerializeDeserializeTest_IntoArray() { // Assert await Assert.That(deserializedData) .IsNotEmpty() - .HasCount(3) - .IsNotNull(); + .IsNotNull() + .Count().IsEqualTo(3); await Assert.That(deserializedData![0]).IsEqualTo(TestEntry); await Assert.That(deserializedData[1]).IsEqualTo(TestEntry); diff --git a/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxNodeModifierExtensionsTests.cs b/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxNodeModifierExtensionsTests.cs index f99ea07d..bd93c737 100644 --- a/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxNodeModifierExtensionsTests.cs +++ b/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxNodeModifierExtensionsTests.cs @@ -20,7 +20,7 @@ public async Task TryGetTitle(string input) { bool result = mod.TryGetTitle(out string? title); // Assert - await Assert.That(mod.Attributes).HasCount(1); + await Assert.That(mod.Attributes).Count().IsEqualTo(1); await Assert.That(mod.Attributes["title"]).IsEqualTo(new Range(7, 16)); await Assert.That(result).IsTrue(); @@ -38,7 +38,7 @@ public async Task GetFit(string input) { bool result = mod.TryGetFit(out bool fit); // Assert - await Assert.That(mod.Attributes).HasCount(1); + await Assert.That(mod.Attributes).Count().IsEqualTo(1); await Assert.That(mod.Attributes["fit"]).IsEqualTo(new Range(4, 4)); await Assert.That(result).IsTrue(); @@ -57,7 +57,7 @@ public async Task TryGetSize(string input) { bool result = mod.TryGetSize(out (int Width, int Height) size); // Assert - await Assert.That(mod.Attributes).HasCount(1); + await Assert.That(mod.Attributes).Count().IsEqualTo(1); await Assert.That(mod.Attributes["size"]).IsEqualTo(new Range(6, 13)); await Assert.That(result).IsTrue(); @@ -74,7 +74,7 @@ public async Task Multiple(string input) { // Act // Assert - await Assert.That(mod.Attributes).HasCount(3); + await Assert.That(mod.Attributes).Count().IsEqualTo(3); await Assert.That(mod.Attributes["size"]).IsEqualTo(new Range(6, 13)); await Assert.That(mod.TryGetSize(out (int Width, int Height) size)).IsTrue(); diff --git a/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxNodeModifierTests.cs b/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxNodeModifierTests.cs index 2d081dc0..50c6ca5d 100644 --- a/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxNodeModifierTests.cs +++ b/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxNodeModifierTests.cs @@ -44,7 +44,7 @@ public async Task TryGetAttributeValue(string input, int count, string[][] expec MdSyntaxNodeModifier mod = MdSyntaxNodeModifier.FromString(input); // Assert - await Assert.That(mod.Attributes).HasCount(count); + await Assert.That(mod.Attributes).Count().IsEqualTo(count); await Parallel.ForEachAsync(expectedOutput, async (expected, _) => { string attributeKey = expected.First(); diff --git a/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxTreeCachedChildren.cs b/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxTreeCachedChildren.cs index 625e839c..16c5c634 100644 --- a/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxTreeCachedChildren.cs +++ b/tests/InfiniBlazorTests.Core.Markdown/Syntax/MdSyntaxTreeCachedChildren.cs @@ -70,7 +70,7 @@ public async Task StoreCachedChildrenByType_ShouldCreateCorrectCache(MdSyntaxTre // Assert await Assert.That(result).IsTrue(); - await Assert.That(cachedChildren).HasCount(expectedChildren.Length); + await Assert.That(cachedChildren).Count().IsEqualTo(expectedChildren.Length); for (int i = 0; i < expectedChildren.Length; i++) { IMdSyntaxNode cached = cachedChildren![i];