Cleanup tests for handling special characters

Author: Bart Koelman

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
+using System.Web;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using Humanizer;
@@ -208,7 +209,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                 await dbContext.SaveChangesAsync();
             });
 
-            string route = $"/filterableResources?filter=equals(someDateTimeOffset,'{WebUtility.UrlEncode(resource.SomeDateTimeOffset.ToString("O"))}')";
+            string route = $"/filterableResources?filter=equals(someDateTimeOffset,'{HttpUtility.UrlEncode(resource.SomeDateTimeOffset.ToString("O"))}')";
 
             // Act
             (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs

@@ -37,7 +37,7 @@ public async Task Can_filter_equality_on_special_characters()
             // Arrange
             var resource = new FilterableResource
             {
-                SomeString = "This, that & more"
+                SomeString = "This, that & more + some"
             };
 
             await _testContext.RunOnDatabaseAsync(async dbContext =>

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs

@@ -582,7 +582,6 @@ public async Task Renders_correct_top_level_links_for_page_number(int pageNumber
         {
             // Arrange
             WebAccount account = _fakers.WebAccount.Generate();
-            account.UserName = $"&{account.UserName}";
 
             const int totalCount = 3 * DefaultPageSize + 3;
             List<BlogPost> posts = _fakers.BlogPost.Generate(totalCount);
@@ -599,7 +598,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                 await dbContext.SaveChangesAsync();
             });
 
-            string routePrefix = $"/blogPosts?filter=equals(author.userName,'{WebUtility.UrlEncode(account.UserName)}')" +
+            string routePrefix = $"/blogPosts?filter=equals(author.userName,'{account.UserName}')" +
                 "&fields[webAccounts]=userName&include=author&sort=id&foo=bar,baz";
 
             string route = $"{routePrefix}&page[number]={pageNumber}";