(#199) Change the nextlink comparison to use QueryHelpers

Author: Adrian Hall

tests/CommunityToolkit.Datasync.Server.Test/Helpers/LiveControllerTests.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Datasync.TestCommon;
 using Microsoft.AspNetCore.Mvc;
 using System.Net;
 
@@ -107,8 +108,7 @@ private async Task MovieQueryTest(string pathAndQuery, int itemCount, string nex
 
         if (nextLinkQuery is not null)
         {
-            result.NextLink.Should().NotBeNull();
-            Uri.UnescapeDataString(result.NextLink).Should().Be(nextLinkQuery);
+            result.NextLink.Should().NotBeNull().And.MatchQueryString(nextLinkQuery);
         }
         else
         {

tests/CommunityToolkit.Datasync.Server.Test/Service/Query_Tests.cs

@@ -3935,13 +3935,12 @@ private async Task MovieQueryTest(string pathAndQuery, int itemCount, string nex
         PageOfItems<ClientMovie> result = JsonSerializer.Deserialize<PageOfItems<ClientMovie>>(content, this.serializerOptions);
 
         // Payload has the right content
-        Assert.Equal(itemCount, result!.Items!.Length);
-        Assert.Equal(nextLinkQuery, result.NextLink == null ? null : Uri.UnescapeDataString(result.NextLink));
-        Assert.Equal(totalCount, result.Count);
+        result?.Items?.Length.Should().Be(itemCount);
+        result.NextLink.Should().MatchQueryString(nextLinkQuery);
+        result.Count.Should().Be(totalCount);
 
         // The first n items must match what is expected
-        Assert.True(result.Items.Length >= firstItems.Length);
-        Assert.Equal(firstItems, result.Items.Take(firstItems.Length).Select(m => m.Id).ToArray());
+        result.Items.Take(firstItems.Length).Select(m => m.Id).ToList().Should().ContainInConsecutiveOrder(firstItems);
         for (int idx = 0; idx < firstItems.Length; idx++)
         {
             InMemoryMovie expected = this.factory.GetServerEntityById<InMemoryMovie>(firstItems[idx])!;

tests/CommunityToolkit.Datasync.TestCommon/FluentExtensions/StringAssertions.cs

@@ -5,6 +5,8 @@
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 using FluentAssertions;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Primitives;
 
 namespace CommunityToolkit.Datasync.TestCommon;
 
@@ -22,4 +24,18 @@ public static AndConstraint<StringAssertions> BeAGuid(this StringAssertions curr
             .FailWith("Expected object to be a Guid, but found {0}", current.Subject);
         return new AndConstraint<StringAssertions>(current);
     }
+
+    public static AndConstraint<StringAssertions> MatchQueryString(this StringAssertions current, string queryString, string because = "", params object[] becauseArgs)
+    {
+        Dictionary<string, StringValues> q1 = QueryHelpers.ParseNullableQuery(queryString) ?? [];
+        Dictionary<string, StringValues> q2 = QueryHelpers.ParseNullableQuery(current.Subject) ?? [];
+        bool isEquivalent = q1.Count == q2.Count && !q1.Except(q2).Any();
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .ForCondition(isEquivalent)
+            .FailWith("Expected query string to match '{0}', but found '{1}'", queryString, current.Subject);
+        return new AndConstraint<StringAssertions>(current);
+
+    }
 }