fix: e2e test paging

Author: maurei

src/JsonApiDotNetCore/Query/PageService.cs

@@ -28,7 +28,7 @@ public PageService(IJsonApiOptions options)
         /// <inheritdoc/>
         public bool ShouldPaginate()
         {
-            return !(PageSize > 0) || ((CurrentPage == 1 || CurrentPage == 0) && TotalPages <= 0);
+            return (PageSize > 0) || ((CurrentPage == 1 || CurrentPage == 0) && TotalPages <= 0);
         }
     }
 }

test/JsonApiDotNetCoreExampleTests/Acceptance/Extensibility/NullValuedAttributeHandlingTests.cs

@@ -67,21 +67,14 @@ public async Task CheckNullBehaviorCombination(bool? omitNullValuedAttributes, b
             // Override some null handling options
             NullAttributeResponseBehavior nullAttributeResponseBehavior;
             if (omitNullValuedAttributes.HasValue && allowClientOverride.HasValue)
-            {
                 nullAttributeResponseBehavior = new NullAttributeResponseBehavior(omitNullValuedAttributes.Value, allowClientOverride.Value);
-            }
             else if (omitNullValuedAttributes.HasValue)
-            {
                 nullAttributeResponseBehavior = new NullAttributeResponseBehavior(omitNullValuedAttributes.Value);
-            }
             else if (allowClientOverride.HasValue)
-            {
                 nullAttributeResponseBehavior = new NullAttributeResponseBehavior(allowClientOverride: allowClientOverride.Value);
-            }
             else
-            {
                 nullAttributeResponseBehavior = new NullAttributeResponseBehavior();
-            }
+
             var jsonApiOptions = _fixture.GetService<IJsonApiOptions>();
             jsonApiOptions.NullAttributeResponseBehavior = nullAttributeResponseBehavior;
             jsonApiOptions.AllowCustomQueryParameters = true;
@@ -98,7 +91,7 @@ public async Task CheckNullBehaviorCombination(bool? omitNullValuedAttributes, b
             var body = await response.Content.ReadAsStringAsync();
             var deserializeBody = JsonConvert.DeserializeObject<Document>(body);
 
-            // assert. does response contain a null valued attribute
+            // assert: does response contain a null valued attribute?
             Assert.Equal(omitsNulls, !deserializeBody.SingleData.Attributes.ContainsKey("description"));
             Assert.Equal(omitsNulls, !deserializeBody.Included[0].Attributes.ContainsKey("last-name"));
 

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/Included.cs

@@ -156,8 +156,10 @@ public async Task GET_Included_Contains_SideloadeData_OneToMany()
         public async Task GET_Included_DoesNot_Duplicate_Records_ForMultipleRelationshipsOfSameType()
         {
             // arrange
-            _context.People.RemoveRange(_context.People); // ensure all people have todo-items
-            _context.TodoItems.RemoveRange(_context.TodoItems);
+            _context.RemoveRange(_context.TodoItems);
+            _context.RemoveRange(_context.TodoItemCollections);
+            _context.RemoveRange(_context.People); // ensure all people have todo-items
+            _context.SaveChanges();
             var person = _personFaker.Generate();
             var todoItem = _todoItemFaker.Generate();
             todoItem.Owner = person;

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/UpdatingDataTests.cs

@@ -115,12 +115,13 @@ public async Task Respond_400_If_IdNotInAttributeList()
 
         }
 
-
         [Fact]
         public async Task Can_Patch_Entity()
         {
             // arrange
-            _context.TodoItems.RemoveRange(_context.TodoItems);
+            _context.RemoveRange(_context.TodoItemCollections);
+            _context.RemoveRange(_context.TodoItems);
+            _context.RemoveRange(_context.People);
             _context.SaveChanges();
 
             var todoItem = _todoItemFaker.Generate();

test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs

@@ -46,7 +46,12 @@ public IResponseDeserializer GetDeserializer()
         {
             var graph = new ResourceGraphBuilder()
                 .AddResource<PersonRole>()
+                .AddResource<Article>()
+                .AddResource<Tag>()
+                .AddResource<CamelCasedModel>()
+                .AddResource<User>()
                 .AddResource<Person>()
+                .AddResource<Author>()
                 .AddResource<Passport>()
                 .AddResource<TodoItemClient>("todo-items")
                 .AddResource<TodoItemCollectionClient, Guid>().Build();