chore: refactor creatingdata tests

Author: maurei

src/Examples/JsonApiDotNetCoreExample/Models/TodoItemCollection.cs

@@ -9,12 +9,12 @@ public class TodoItemCollection : Identifiable<Guid>
     {
         [Attr("name")]
         public string Name { get; set; }
-        public int OwnerId { get; set; }
 
         [HasMany("todo-items")]
         public virtual List<TodoItem> TodoItems { get; set; }
 
         [HasOne("owner")]
         public virtual Person Owner { get; set; }
+        public int? OwnerId { get; set; }
     }
 }

src/JsonApiDotNetCore/Services/EntityResourceService.cs

@@ -113,9 +113,6 @@ public virtual async Task<IEnumerable<TResource>> GetAsync()
             if (ShouldIncludeRelationships())
                 entities = IncludeRelationships(entities);
 
-            if (_options.IncludeTotalRecordCount)
-                _pageManager.TotalRecords = await _repository.CountAsync(entities);
-
             entities = _repository.Select(entities, _currentRequest.QuerySet?.Fields);
 
             if (!IsNull(_hookExecutor, entities))

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/CreatingDataTests.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Linq.Expressions;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Serialization.Client;
+using JsonApiDotNetCoreExample.Data;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
+using Xunit;
+
+namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec
+{
+    public class EndToEndTest
+    {
+        public static MediaTypeHeaderValue JsonApiContentType = new MediaTypeHeaderValue("application/vnd.api+json");
+        private HttpClient _client;
+        protected TestFixture<TestStartup> _fixture;
+        protected readonly IResponseDeserializer _deserializer;
+        public EndToEndTest(TestFixture<TestStartup> fixture)
+        {
+            _fixture = fixture;
+            _deserializer = GetDeserializer();
+        }
+
+        public AppDbContext PrepareTest<TStartup>() where TStartup : class
+        {
+            var builder = new WebHostBuilder().UseStartup<TStartup>();
+            var server = new TestServer(builder);
+            _client = server.CreateClient();
+
+            var dbContext = GetDbContext();
+            dbContext.RemoveRange(dbContext.TodoItems);
+            dbContext.RemoveRange(dbContext.TodoItemCollections);
+            dbContext.RemoveRange(dbContext.PersonRoles);
+            dbContext.RemoveRange(dbContext.People);
+            dbContext.SaveChanges();
+            return dbContext;
+        }
+
+        public AppDbContext GetDbContext()
+        {
+            return _fixture.GetService<AppDbContext>();
+        }
+
+        public async Task<(string, HttpResponseMessage)> SendRequest(string method, string route, string content)
+        {
+            var request = new HttpRequestMessage(new HttpMethod(method), route);
+            request.Content = new StringContent(content);
+            request.Content.Headers.ContentType = JsonApiContentType;
+            var response = await _client.SendAsync(request);
+            var body = await response.Content?.ReadAsStringAsync();
+            return (body, response);
+        }
+
+        public Task<(string, HttpResponseMessage)> Post(string route, string content)
+        {
+            return SendRequest("POST", route, content);
+        }
+
+        public IRequestSerializer GetSerializer<TResource>(Expression<Func<TResource, dynamic>> attributes = null, Expression<Func<TResource, dynamic>> relationships = null) where TResource : class, IIdentifiable
+        {
+            return _fixture.GetSerializer(attributes, relationships);
+        }
+
+        public IResponseDeserializer GetDeserializer()
+        {
+            return _fixture.GetDeserializer();
+        }
+
+        protected void AssertEqualStatusCode(HttpStatusCode expected, HttpResponseMessage response)
+        {
+            Assert.True(expected == response.StatusCode, $"Got {response.StatusCode} status code with payload instead of {expected}. Payload: {response.Content.ReadAsStringAsync().Result}");
+        }
+    }
+
+}

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/EndToEndTest.cs

@@ -120,12 +120,13 @@ public async Task Fields_Query_Selects_Sparse_Field_Sets()
         public async Task Fields_Query_Selects_All_Fieldset_With_HasOne()
         {
             // arrange
+            _dbContext.TodoItems.RemoveRange(_dbContext.TodoItems);
+            _dbContext.SaveChanges();
             var owner = _personFaker.Generate();
-            var ordinal = _dbContext.TodoItems.Count();
             var todoItem = new TodoItem
             {
                 Description = "s",
-                Ordinal = ordinal,
+                Ordinal = 123,
                 CreatedDate = DateTime.Now,
                 Owner = owner
             };

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/SparseFieldSetTests.cs

@@ -31,6 +31,7 @@ public UpdatingDataTests(TestFixture<TestStartup> fixture)
         {
             _fixture = fixture;
             _context = fixture.GetService<AppDbContext>();
+
             _todoItemFaker = new Faker<TodoItem>()
                 .RuleFor(t => t.Description, f => f.Lorem.Sentence())
                 .RuleFor(t => t.Ordinal, f => f.Random.Number())
@@ -119,6 +120,9 @@ public async Task Respond_400_If_IdNotInAttributeList()
         public async Task Can_Patch_Entity()
         {
             // arrange
+            _context.TodoItems.RemoveRange(_context.TodoItems);
+            _context.SaveChanges();
+
             var todoItem = _todoItemFaker.Generate();
             var person = _personFaker.Generate();
             todoItem.Owner = person;
@@ -153,7 +157,6 @@ public async Task Can_Patch_Entity()
             var updatedTodoItem = _context.TodoItems.AsNoTracking()
                 .Include(t => t.Owner)
                 .SingleOrDefault(t => t.Id == todoItem.Id);
-
             Assert.Equal(person.Id, updatedTodoItem.OwnerId);
             Assert.Equal(newTodoItem.Description, updatedTodoItem.Description);
             Assert.Equal(newTodoItem.Ordinal, updatedTodoItem.Ordinal);

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/UpdatingDataTests.cs

@@ -8,6 +8,9 @@
 using JsonApiDotNetCore.Serialization.Client;
 using System.Linq.Expressions;
 using JsonApiDotNetCore.Models;
+using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCoreExampleTests.Helpers.Models;
+using JsonApiDotNetCoreExample.Models;
 
 namespace JsonApiDotNetCoreExampleTests.Acceptance
 {
@@ -41,7 +44,13 @@ public IRequestSerializer GetSerializer<TResource>(Expression<Func<TResource, dy
         }
         public IResponseDeserializer GetDeserializer()
         {
-            return GetService<IResponseDeserializer>();
+            var graph = new ResourceGraphBuilder()
+                .AddResource<PersonRole>()
+                .AddResource<Person>()
+                .AddResource<Passport>()
+                .AddResource<TodoItemClient>("todo-items")
+                .AddResource<TodoItemCollectionClient, Guid>().Build();
+            return new ResponseDeserializer(graph);
         }
 
         public T GetService<T>() => (T)_services.GetService(typeof(T));

test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs

@@ -17,7 +17,12 @@ public class TodoItemClient : TodoItem
         public new string CalculatedValue { get; set; }
     }
 
-
+    //[Resource("todo-collections")]
+    //public class TodoItemCollectionClient : TodoItemCollection
+    //{
+    //    [HasMany("todo-items")]
+    //    public new List<TodoItemClient> TodoItems { get; set; }
+    //}
 
     [Resource("todo-collections")]
     public class TodoItemCollectionClient : Identifiable<Guid>