Fix tests, cleanup warning (deprecations)

btecu · btecu · commit ad39fd74d693 · 2018-06-11T23:35:29.000-04:00
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsCustomController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsCustomController.cs
@@ -39,11 +39,6 @@ public class CustomJsonApiController<T, TId>
         private readonly IResourceService<T, TId> _resourceService;
         private readonly IJsonApiContext _jsonApiContext;
 
-        protected IActionResult UnprocessableEntity()
-        {
-            return new StatusCodeResult(422);
-        }
-
         protected IActionResult Forbidden()
         {
             return new StatusCodeResult(403);
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiControllerMixin.cs b/src/JsonApiDotNetCore/Controllers/JsonApiControllerMixin.cs
@@ -7,11 +7,6 @@ namespace JsonApiDotNetCore.Controllers
 {
     public abstract class JsonApiControllerMixin : ControllerBase
     {
-        protected IActionResult UnprocessableEntity()
-        {
-            return new StatusCodeResult(422);
-        }
-
         protected IActionResult Forbidden()
         {
             return new StatusCodeResult(403);
@@ -23,18 +18,19 @@ protected IActionResult Error(Error error)
             {
                 Errors = new List<Error> { error }
             };
-            var result = new ObjectResult(errorCollection);
-            result.StatusCode = error.StatusCode;
 
-            return result;
+            return new ObjectResult(errorCollection)
+            {
+                StatusCode = error.StatusCode
+            };
         }
 
         protected IActionResult Errors(ErrorCollection errors)
         {
-            var result = new ObjectResult(errors);
-            result.StatusCode = GetErrorStatusCode(errors);
-
-            return result;
+            return new ObjectResult(errors)
+            {
+                StatusCode = GetErrorStatusCode(errors)
+            };
         }
 
         private int GetErrorStatusCode(ErrorCollection errors)
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Extensibility/CustomErrorTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Extensibility/CustomErrorTests.cs
@@ -11,7 +11,7 @@ public class CustomErrorTests
         public void Can_Return_Custom_Error_Types()
         {
             // arrange
-            var error = new CustomError("507", "title", "detail", "custom");
+            var error = new CustomError(507, "title", "detail", "custom");
             var errorCollection = new ErrorCollection();
             errorCollection.Add(error);
 
@@ -36,7 +36,7 @@ public void Can_Return_Custom_Error_Types()
         }
 
         class CustomError : Error {
-            public CustomError(string status, string title, string detail, string myProp)
+            public CustomError(int status, string title, string detail, string myProp)
             : base(status, title, detail)
             {
                 MyCustomProperty = myProp;
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/AttributeFilterTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/AttributeFilterTests.cs
@@ -131,7 +131,7 @@ public async Task Can_Filter_On_Not_Equal_Values()
 
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.False(deserializedTodoItems.Any(i => i.Ordinal == todoItem.Ordinal));
+            Assert.DoesNotContain(deserializedTodoItems, x => x.Ordinal == todoItem.Ordinal);
         }
 
         [Fact]
@@ -170,8 +170,8 @@ public async Task Can_Filter_On_In_Array_Values()
             Assert.Equal(guids.Count(), deserializedTodoItems.Count());
             foreach (var item in deserializedTodoItems)
             {
-                Assert.True(guids.Contains(item.GuidProperty));
-                Assert.False(notInGuids.Contains(item.GuidProperty));
+                Assert.Contains(item.GuidProperty, guids);
+                Assert.DoesNotContain(item.GuidProperty, notInGuids);
             }
         }
 
@@ -207,7 +207,7 @@ public async Task Can_Filter_On_Related_In_Array_Values()
             Assert.NotNull(included);
             Assert.NotEmpty(included);
             foreach (var item in included)
-                Assert.True(ownerFirstNames.Contains(item.Attributes["first-name"]));
+                Assert.Contains(item.Attributes["first-name"], ownerFirstNames);
 
         }
     }
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/Included.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/Included.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -174,7 +174,7 @@ public async Task GET_Included_DoesNot_Duplicate_Records_ForMultipleRelationship
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.NotEmpty(documents.Included);
-            Assert.Equal(1, documents.Included.Count);
+            Assert.Single(documents.Included);
         }
 
         [Fact]
@@ -209,7 +209,7 @@ public async Task GET_Included_DoesNot_Duplicate_Records_If_HasOne_Exists_Twice(
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.NotEmpty(documents.Included);
-            Assert.Equal(1, documents.Included.Count);
+            Assert.Single(documents.Included);
         }
 
         [Fact]
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/PagingTests.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/PagingTests.cs
@@ -1,12 +1,11 @@
-﻿using System.Net;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using JsonApiDotNetCoreExample;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Newtonsoft.Json;
 using Xunit;
-using Person = JsonApiDotNetCoreExample.Models.Person;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCoreExample.Data;
 using Bogus;
@@ -18,28 +17,16 @@ namespace JsonApiDotNetCoreExampleTests.Acceptance.Spec.DocumentTests
     [Collection("WebHostCollection")]
     public class PagingTests
     {
-        private TestFixture<TestStartup> _fixture;
-        private AppDbContext _context;
-        private Faker<Person> _personFaker;
-        private Faker<TodoItem> _todoItemFaker;
-        private Faker<TodoItemCollection> _todoItemCollectionFaker;
-        private DateTime CurrentTime;
+        private readonly AppDbContext _context;
+        private readonly Faker<TodoItem> _todoItemFaker;
 
         public PagingTests(TestFixture<TestStartup> fixture)
         {
-            _fixture = fixture;
             _context = fixture.GetService<AppDbContext>();
-            _personFaker = new Faker<Person>()
-                .RuleFor(p => p.FirstName, f => f.Name.FirstName())
-                .RuleFor(p => p.LastName, f => f.Name.LastName());
-
             _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());
-
-            _todoItemCollectionFaker = new Faker<TodoItemCollection>()
-                .RuleFor(t => t.Name, f => f.Company.CatchPhrase());
         }
 
         [Fact]
diff --git a/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/QueryParameters.cs b/test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/QueryParameters.cs
@@ -39,7 +39,7 @@ public async Task Server_Returns_400_ForUnknownQueryParam()
 
             // assert
             Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-            Assert.Equal(1, body.Errors.Count);
+            Assert.Single(body.Errors);
             Assert.Equal($"[{queryKey}, {queryValue}] is not a valid query.", body.Errors[0].Title);
         }
     }
diff --git a/test/OperationsExampleTests/Add/AddTests.cs b/test/OperationsExampleTests/Add/AddTests.cs
@@ -156,7 +156,7 @@ public async Task Can_Create_Author_With_Article()
             Assert.Equal(author.Name, lastAuthor.Name);
 
             // article validation
-            Assert.Equal(1, lastAuthor.Articles.Count);
+            Assert.Single(lastAuthor.Articles);
             Assert.Equal(article.Name, lastAuthor.Articles[0].Name);
             Assert.Equal(articleOperationResult.DataObject.Id, lastAuthor.Articles[0].StringId);
         }
diff --git a/test/OperationsExampleTests/Get/GetByIdTests.cs b/test/OperationsExampleTests/Get/GetByIdTests.cs
@@ -36,14 +36,14 @@ public async Task Can_Get_Author_By_Id()
             };
 
             // act
-            var result = await PatchAsync<OperationsDocument>("api/bulk", content);
+            var (response, data) = await PatchAsync<OperationsDocument>("api/bulk", content);
 
             // assert
-            Assert.NotNull(result.response);
-            Assert.NotNull(result.data);
-            Assert.Equal(HttpStatusCode.OK, result.response.StatusCode);
-            Assert.Equal(1, result.data.Operations.Count);
-            Assert.Equal(author.Id.ToString(), result.data.Operations.Single().DataObject.Id);
+            Assert.NotNull(response);
+            Assert.NotNull(data);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Single(data.Operations);
+            Assert.Equal(author.Id.ToString(), data.Operations.Single().DataObject.Id);
         }
 
         [Fact]
@@ -69,7 +69,7 @@ public async Task Get_Author_By_Id_Returns_404_If_NotFound()
             Assert.NotNull(response);
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
             Assert.NotNull(data);
-            Assert.Equal(1, data.Errors.Count);
+            Assert.Single(data.Errors);
             Assert.True(data.Errors[0].Detail.Contains("authors"), "The error detail should contain the name of the entity that could not be found.");
             Assert.True(data.Errors[0].Detail.Contains(authorId), "The error detail should contain the entity id that could not be found");
             Assert.True(data.Errors[0].Title.Contains("operation[0]"), "The error title should contain the operation identifier that failed");
diff --git a/test/OperationsExampleTests/Get/GetRelationshipTests.cs b/test/OperationsExampleTests/Get/GetRelationshipTests.cs
@@ -43,7 +43,7 @@ public async Task Can_Get_Article_Author()
             Assert.NotNull(response);
             Assert.NotNull(data);
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.Equal(1, data.Operations.Count);
+            Assert.Single(data.Operations);
             var resourceObject = data.Operations.Single().DataObject;
             Assert.Equal(author.Id.ToString(), resourceObject.Id);
             Assert.Equal("authors", resourceObject.Type);
diff --git a/test/OperationsExampleTests/Get/GetTests.cs b/test/OperationsExampleTests/Get/GetTests.cs
@@ -44,7 +44,7 @@ public async Task Can_Get_Authors()
             Assert.NotNull(result.response);
             Assert.NotNull(result.data);
             Assert.Equal(HttpStatusCode.OK, result.response.StatusCode);
-            Assert.Equal(1, result.data.Operations.Count);
+            Assert.Single(result.data.Operations);
             Assert.Equal(expectedCount, result.data.Operations.Single().DataList.Count);
         }
     }
diff --git a/test/OperationsExampleTests/Transactions/TransactionFailureTests.cs b/test/OperationsExampleTests/Transactions/TransactionFailureTests.cs
@@ -68,7 +68,7 @@ public async Task Cannot_Create_Author_If_Article_Creation_Fails()
             // for now, it is up to application implementations to perform validation and 
             // provide the proper HTTP response code
             Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
-            Assert.Equal(1, data.Errors.Count);
+            Assert.Single(data.Errors);
             Assert.Contains("operation[1] (add)", data.Errors[0].Title);
 
             var dbAuthors = await context.Authors.Where(a => a.Name == author.Name).ToListAsync();
diff --git a/test/OperationsExampleTests/Update/UpdateTests.cs b/test/OperationsExampleTests/Update/UpdateTests.cs
@@ -52,7 +52,7 @@ public async Task Can_Update_Author()
             Assert.NotNull(response);
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.NotNull(data);
-            Assert.Equal(1, data.Operations.Count);
+            Assert.Single(data.Operations);
 
             var attrs = data.Operations.Single().DataObject.Attributes;
             Assert.Equal(updates.Name, attrs["name"]);
diff --git a/test/UnitTests/Builders/DocumentBuilder_Tests.cs b/test/UnitTests/Builders/DocumentBuilder_Tests.cs
@@ -190,7 +190,7 @@ public void Build_Can_Build_Arrays()
 
             var documents = documentBuilder.Build(entities);
 
-            Assert.Equal(1, documents.Data.Count);
+            Assert.Single(documents.Data);
         }
 
         [Fact]
@@ -201,7 +201,7 @@ public void Build_Can_Build_CustomIEnumerables()
 
             var documents = documentBuilder.Build(entities);
 
-            Assert.Equal(1, documents.Data.Count);
+            Assert.Single(documents.Data);
         }
 
 
diff --git a/test/UnitTests/Controllers/JsonApiControllerMixin_Tests.cs b/test/UnitTests/Controllers/JsonApiControllerMixin_Tests.cs
@@ -16,26 +16,26 @@ public void Errors_Correctly_Infers_Status_Code()
             // arrange
             var errors422 = new ErrorCollection {
                 Errors = new List<Error> {
-                    new Error("422", "bad specific"),
-                    new Error("422", "bad other specific"),
+                    new Error(422, "bad specific"),
+                    new Error(422, "bad other specific"),
                 }
             };
 
             var errors400 = new ErrorCollection {
                 Errors = new List<Error> {
-                    new Error("200", "weird"),
-                    new Error("400", "bad"),
-                    new Error("422", "bad specific"),
+                    new Error(200, "weird"),
+                    new Error(400, "bad"),
+                    new Error(422, "bad specific"),
                 }
             };
 
             var errors500 = new ErrorCollection {
                 Errors = new List<Error> {
-                    new Error("200", "weird"),
-                    new Error("400", "bad"),
-                    new Error("422", "bad specific"),
-                    new Error("500", "really bad"),
-                    new Error("502", "really bad specific"),
+                    new Error(200, "weird"),
+                    new Error(400, "bad"),
+                    new Error(422, "bad specific"),
+                    new Error(500, "really bad"),
+                    new Error(502, "really bad specific"),
                 }
             };
             
diff --git a/test/UnitTests/Internal/ContextGraphBuilder_Tests.cs b/test/UnitTests/Internal/ContextGraphBuilder_Tests.cs
@@ -33,7 +33,7 @@ public void Adding_DbContext_Members_That_DoNot_Implement_IIdentifiable_Creates_
             var contextGraph = contextGraphBuilder.Build() as ContextGraph;
 
             // assert
-            Assert.Equal(1, contextGraph.ValidationResults.Count);
+            Assert.Single(contextGraph.ValidationResults);
             Assert.Contains(contextGraph.ValidationResults, v => v.LogLevel == LogLevel.Warning);
         }
 
diff --git a/test/UnitTests/Serialization/JsonApiDeSerializerTests.cs b/test/UnitTests/Serialization/JsonApiDeSerializerTests.cs
@@ -181,7 +181,7 @@ public void Immutable_Attrs_Are_Not_Included_In_AttributesToUpdate()
 
             // assert
             Assert.NotNull(result.ComplexMember);
-            Assert.Equal(1, attributesToUpdate.Count);
+            Assert.Single(attributesToUpdate);
 
             foreach (var attr in attributesToUpdate)
                 Assert.False(attr.Key.IsImmutable);

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,6 @@ namespace JsonApiDotNetCore.Controllers`
`7`	`7`	`{`
`8`	`8`	`public abstract class JsonApiControllerMixin : ControllerBase`
`9`	`9`	`{`
`10`		`- protected IActionResult UnprocessableEntity()`
`11`		`- {`
`12`		`- return new StatusCodeResult(422);`
`13`		`- }`
`14`		`-`
`15`	`10`	`protected IActionResult Forbidden()`
`16`	`11`	`{`
`17`	`12`	`return new StatusCodeResult(403);`
`@@ -23,18 +18,19 @@ protected IActionResult Error(Error error)`
`23`	`18`	`{`
`24`	`19`	`Errors = new List<Error> { error }`
`25`	`20`	`};`
`26`		`- var result = new ObjectResult(errorCollection);`
`27`		`- result.StatusCode = error.StatusCode;`
`28`	`21`
`29`		`- return result;`
	`22`	`+ return new ObjectResult(errorCollection)`
	`23`	`+ {`
	`24`	`+ StatusCode = error.StatusCode`
	`25`	`+ };`
`30`	`26`	`}`
`31`	`27`
`32`	`28`	`protected IActionResult Errors(ErrorCollection errors)`
`33`	`29`	`{`
`34`		`- var result = new ObjectResult(errors);`
`35`		`- result.StatusCode = GetErrorStatusCode(errors);`
`36`		`-`
`37`		`- return result;`
	`30`	`+ return new ObjectResult(errors)`
	`31`	`+ {`
	`32`	`+ StatusCode = GetErrorStatusCode(errors)`
	`33`	`+ };`
`38`	`34`	`}`
`39`	`35`
`40`	`36`	`private int GetErrorStatusCode(ErrorCollection errors)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class CustomErrorTests`
`11`	`11`	`public void Can_Return_Custom_Error_Types()`
`12`	`12`	`{`
`13`	`13`	`// arrange`
`14`		`- var error = new CustomError("507", "title", "detail", "custom");`
	`14`	`+ var error = new CustomError(507, "title", "detail", "custom");`
`15`	`15`	`var errorCollection = new ErrorCollection();`
`16`	`16`	`errorCollection.Add(error);`
`17`	`17`
`@@ -36,7 +36,7 @@ public void Can_Return_Custom_Error_Types()`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`class CustomError : Error {`
`39`		`- public CustomError(string status, string title, string detail, string myProp)`
	`39`	`+ public CustomError(int status, string title, string detail, string myProp)`
`40`	`40`	`: base(status, title, detail)`
`41`	`41`	`{`
`42`	`42`	`MyCustomProperty = myProp;`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public async Task Can_Filter_On_Not_Equal_Values()`
`131`	`131`
`132`	`132`	`// assert`
`133`	`133`	`Assert.Equal(HttpStatusCode.OK, response.StatusCode);`
`134`		`- Assert.False(deserializedTodoItems.Any(i => i.Ordinal == todoItem.Ordinal));`
	`134`	`+ Assert.DoesNotContain(deserializedTodoItems, x => x.Ordinal == todoItem.Ordinal);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`[Fact]`
`@@ -170,8 +170,8 @@ public async Task Can_Filter_On_In_Array_Values()`
`170`	`170`	`Assert.Equal(guids.Count(), deserializedTodoItems.Count());`
`171`	`171`	`foreach (var item in deserializedTodoItems)`
`172`	`172`	`{`
`173`		`- Assert.True(guids.Contains(item.GuidProperty));`
`174`		`- Assert.False(notInGuids.Contains(item.GuidProperty));`
	`173`	`+ Assert.Contains(item.GuidProperty, guids);`
	`174`	`+ Assert.DoesNotContain(item.GuidProperty, notInGuids);`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
`@@ -207,7 +207,7 @@ public async Task Can_Filter_On_Related_In_Array_Values()`
`207`	`207`	`Assert.NotNull(included);`
`208`	`208`	`Assert.NotEmpty(included);`
`209`	`209`	`foreach (var item in included)`
`210`		`- Assert.True(ownerFirstNames.Contains(item.Attributes["first-name"]));`
	`210`	`+ Assert.Contains(item.Attributes["first-name"], ownerFirstNames);`
`211`	`211`
`212`	`212`	`}`
`213`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public async Task Server_Returns_400_ForUnknownQueryParam()`
`39`	`39`
`40`	`40`	`// assert`
`41`	`41`	`Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);`
`42`		`- Assert.Equal(1, body.Errors.Count);`
	`42`	`+ Assert.Single(body.Errors);`
`43`	`43`	`Assert.Equal($"[{queryKey}, {queryValue}] is not a valid query.", body.Errors[0].Title);`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public async Task Can_Create_Author_With_Article()`
`156`	`156`	`Assert.Equal(author.Name, lastAuthor.Name);`
`157`	`157`
`158`	`158`	`// article validation`
`159`		`- Assert.Equal(1, lastAuthor.Articles.Count);`
	`159`	`+ Assert.Single(lastAuthor.Articles);`
`160`	`160`	`Assert.Equal(article.Name, lastAuthor.Articles[0].Name);`
`161`	`161`	`Assert.Equal(articleOperationResult.DataObject.Id, lastAuthor.Articles[0].StringId);`
`162`	`162`	`}`