test(*): fix tests broken after aspnet and ef core 2.0 upgrades

jaredcnance · jaredcnance · commit 0366d026595e · 2017-12-05T06:56:15.000-06:00
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/CreatingDataTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/CreatingDataTests.cs
@@ -272,6 +272,8 @@ public async Task Can_Create_And_Set_HasMany_Relationships()
             var body = await response.Content.ReadAsStringAsync();
             var deserializedBody = (TodoItemCollection)_fixture.GetService<IJsonApiDeSerializer>().Deserialize(body);
             var newId = deserializedBody.Id;
+
+            context = _fixture.GetService<AppDbContext>();
             var contextCollection = context.TodoItemCollections
                 .Include(c => c.Owner)
                 .Include(c => c.TodoItems)
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/Included.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/Included.cs
@@ -1,4 +1,5 @@
-﻿using System.Linq;
+﻿using System;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -45,8 +46,14 @@ public Included(TestFixture<Startup> fixture)
         public async Task GET_Included_Contains_SideloadedData_ForManyToOne()
         {
             // arrange
-            var builder = new WebHostBuilder()
-                .UseStartup<Startup>();
+            var person = _personFaker.Generate();
+            var todoItem = _todoItemFaker.Generate();
+            todoItem.Owner = person;
+            _context.TodoItems.RemoveRange(_context.TodoItems);
+            _context.TodoItems.Add(todoItem);
+            _context.SaveChanges();
+
+            var builder = new WebHostBuilder().UseStartup<Startup>();
 
             var httpMethod = new HttpMethod("GET");
             var route = $"/api/v1/todo-items?include=owner";
@@ -57,13 +64,16 @@ public async Task GET_Included_Contains_SideloadedData_ForManyToOne()
 
             // act
             var response = await client.SendAsync(request);
-            var documents = JsonConvert.DeserializeObject<Documents>(await response.Content.ReadAsStringAsync());
-            var data = documents.Data[0];
 
             // assert
+            var json = await response.Content.ReadAsStringAsync();
+            var documents = JsonConvert.DeserializeObject<Documents>(json);
+            // we only care about counting the todo-items that have owners
+            var expectedCount = documents.Data.Count(d => d.Relationships["owner"].SingleData != null);
+
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.NotEmpty(documents.Included);
-            Assert.Equal(documents.Data.Count, documents.Included.Count);
+            Assert.Equal(expectedCount, documents.Included.Count);
         }
 
         [Fact]
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/FetchingRelationshipsTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/FetchingRelationshipsTests.cs
@@ -66,7 +66,11 @@ public async Task Request_ForRelationshipLink_ThatDoesNotExist_Returns_404()
         {
             // arrange
             var context = _fixture.GetService<AppDbContext>();
-            var todoItem = context.TodoItems.First();
+
+            var todoItem = _todoItemFaker.Generate();
+            context.TodoItems.Add(todoItem);
+            await context.SaveChangesAsync();
+
             var todoItemId = todoItem.Id;
             context.TodoItems.Remove(todoItem);
             await context.SaveChangesAsync();
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/PagingTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/PagingTests.cs
@@ -1,33 +1,22 @@
-using System.Collections.Generic;
-using System;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Bogus;
-using DotNetCoreDocs;
-using DotNetCoreDocs.Models;
-using DotNetCoreDocs.Writers;
 using JsonApiDotNetCore.Serialization;
-using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample;
-using JsonApiDotNetCoreExample.Data;
 using JsonApiDotNetCoreExample.Models;
 using Xunit;
 using Person = JsonApiDotNetCoreExample.Models.Person;
 
-namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec
-{
-    public class PagingTests : TestFixture<Startup>
-    {
+namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec {
+    public class PagingTests : TestFixture<Startup> {
         private readonly Faker<TodoItem> _todoItemFaker = new Faker<TodoItem>()
-                .RuleFor(t => t.Description, f => f.Lorem.Sentence())
-                .RuleFor(t => t.Ordinal, f => f.Random.Number())
-                .RuleFor(t => t.CreatedDate, f => f.Date.Past());
+            .RuleFor(t => t.Description, f => f.Lorem.Sentence())
+            .RuleFor(t => t.Ordinal, f => f.Random.Number())
+            .RuleFor(t => t.CreatedDate, f => f.Date.Past());
 
         [Fact]
-        public async Task Can_Paginate_TodoItems()
-        {
+        public async Task Can_Paginate_TodoItems() {
             // Arrange
             const int expectedEntitiesPerPage = 2;
             var totalCount = expectedEntitiesPerPage * 2;
@@ -56,8 +45,7 @@ public async Task Can_Paginate_TodoItems()
         }
 
         [Fact]
-        public async Task Can_Paginate_TodoItems_From_Start()
-        {
+        public async Task Can_Paginate_TodoItems_From_Start() {
             // Arrange
             const int expectedEntitiesPerPage = 2;
             var totalCount = expectedEntitiesPerPage * 2;
@@ -91,8 +79,7 @@ public async Task Can_Paginate_TodoItems_From_Start()
         }
 
         [Fact]
-        public async Task Can_Paginate_TodoItems_From_End()
-        {
+        public async Task Can_Paginate_TodoItems_From_End() {
             // Arrange
             const int expectedEntitiesPerPage = 2;
             var totalCount = expectedEntitiesPerPage * 2;
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/UpdatingRelationshipsTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/UpdatingRelationshipsTests.cs
@@ -77,6 +77,7 @@ public async Task Can_Update_ToMany_Relationship_ThroughLink()
 
             // Act
             var response = await client.SendAsync(request);
+            _context = _fixture.GetService<AppDbContext>();
             var personsTodoItems = _context.People.Include(p => p.TodoItems).Single(p => p.Id == person.Id).TodoItems;
 
             // Assert
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/TestFixture.cs
@@ -5,11 +5,10 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using JsonApiDotNetCore.Services;
-using Newtonsoft.Json;
 
 namespace JsonApiDotNetCoreExampleTests.Acceptance
 {
-    public class TestFixture<TStartup> where TStartup : class
+    public class TestFixture<TStartup> : IDisposable where TStartup : class
     {
         private readonly TestServer _server;
         private IServiceProvider _services;
@@ -33,5 +32,25 @@ public TestFixture()
         public IJsonApiDeSerializer DeSerializer { get; private set; }
         public IJsonApiContext JsonApiContext { get; private set; }
         public T GetService<T>() => (T)_services.GetService(typeof(T));
+
+        private bool disposedValue = false;
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    Client.Dispose();
+                    _server.Dispose();
+                }
+
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
     }
 }
diff --git a/test/JsonApiDotNetCoreExampleTests/Helpers/Extensions/IQueryableExtensions.cs b/test/JsonApiDotNetCoreExampleTests/Helpers/Extensions/IQueryableExtensions.cs
@@ -4,12 +4,12 @@
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.Internal;
+using Microsoft.EntityFrameworkCore.Storage;
 using Remotion.Linq.Parsing.Structure;
 using Database = Microsoft.EntityFrameworkCore.Storage.Database;
 
 namespace JsonApiDotNetCoreExampleTests.Helpers.Extensions
 {
-
     public static class IQueryableExtensions
     {
         private static readonly TypeInfo QueryCompilerTypeInfo = typeof(QueryCompiler).GetTypeInfo();
@@ -22,19 +22,22 @@ public static class IQueryableExtensions
 
         private static readonly FieldInfo DataBaseField = QueryCompilerTypeInfo.DeclaredFields.Single(x => x.Name == "_database");
 
-        private static readonly FieldInfo QueryCompilationContextFactoryField = typeof(Database).GetTypeInfo().DeclaredFields.Single(x => x.Name == "_queryCompilationContextFactory");
+        private static readonly PropertyInfo DatabaseDependenciesField
+            = typeof(Database).GetTypeInfo().DeclaredProperties.Single(x => x.Name == "Dependencies");
 
         public static string ToSql<TEntity>(this IQueryable<TEntity> query) where TEntity : class
         {
             if (!(query is EntityQueryable<TEntity>) && !(query is InternalDbSet<TEntity>))
+            {
                 throw new ArgumentException("Invalid query");
+            }
 
             var queryCompiler = (IQueryCompiler)QueryCompilerField.GetValue(query.Provider);
             var nodeTypeProvider = (INodeTypeProvider)NodeTypeProviderField.GetValue(queryCompiler);
             var parser = (IQueryParser)CreateQueryParserMethod.Invoke(queryCompiler, new object[] { nodeTypeProvider });
             var queryModel = parser.GetParsedQuery(query.Expression);
             var database = DataBaseField.GetValue(queryCompiler);
-            var queryCompilationContextFactory = (IQueryCompilationContextFactory)QueryCompilationContextFactoryField.GetValue(database);
+            var queryCompilationContextFactory = ((DatabaseDependencies)DatabaseDependenciesField.GetValue(database)).QueryCompilationContextFactory;
             var queryCompilationContext = queryCompilationContextFactory.Create(false);
             var modelVisitor = (RelationalQueryModelVisitor)queryCompilationContext.CreateQueryModelVisitor();
             modelVisitor.CreateQueryExecutor<TEntity>(queryModel);
diff --git a/test/JsonApiDotNetCoreExampleTests/TestFixture.cs b/test/JsonApiDotNetCoreExampleTests/TestFixture.cs
diff --git a/test/JsonApiDotNetCoreExampleTests/WebHostCollection.cs b/test/JsonApiDotNetCoreExampleTests/WebHostCollection.cs
@@ -1,4 +1,5 @@
 using JsonApiDotNetCoreExample;
+using JsonApiDotNetCoreExampleTests.Acceptance;
 using Xunit;
 
 namespace JsonApiDotNetCoreExampleTests
diff --git a/test/JsonApiDotNetCoreExampleTests/appsettings.json b/test/JsonApiDotNetCoreExampleTests/appsettings.json
@@ -6,7 +6,7 @@
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
-      "Default": "Debug",
+      "Default": "Error",
       "System": "Information",
       "Microsoft": "Information"
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using JsonApiDotNetCoreExample;`
	`2`	`+using JsonApiDotNetCoreExampleTests.Acceptance;`
`2`	`3`	`using Xunit;`
`3`	`4`
`4`	`5`	`namespace JsonApiDotNetCoreExampleTests`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"Logging": {`
`7`	`7`	`"IncludeScopes": false,`
`8`	`8`	`"LogLevel": {`
`9`		`- "Default": "Debug",`
	`9`	`+ "Default": "Error",`
`10`	`10`	`"System": "Information",`
`11`	`11`	`"Microsoft": "Information"`
`12`	`12`	`}`