Adjusted test names for meta

Bart Koelman · Bart Koelman · commit cb983b9a6cc8 · 2021-02-04T16:42:17.000+01:00
diff --git a/src/Examples/JsonApiDotNetCoreExample/Models/TodoItem.cs b/src/Examples/JsonApiDotNetCoreExample/Models/TodoItem.cs
@@ -15,13 +15,6 @@ public class TodoItem : Identifiable, IIsLockable
         [Attr]
         public long Ordinal { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.All & ~AttrCapabilities.AllowCreate)]
-        public string AlwaysChangingValue
-        {
-            get => Guid.NewGuid().ToString();
-            set { }
-        }
-
         [Attr]
         public DateTime CreatedDate { get; set; }
 
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Meta/ResourceMetaTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Meta/ResourceMetaTests.cs
@@ -21,7 +21,7 @@ public ResourceMetaTests(ExampleIntegrationTestContext<Startup, AppDbContext> te
         }
 
         [Fact]
-        public async Task ResourceDefinition_That_Implements_GetMeta_Contains_Resource_Meta()
+        public async Task Returns_resource_meta_from_ResourceDefinition()
         {
             // Arrange
             var todoItems = new[]
@@ -54,7 +54,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         }
 
         [Fact]
-        public async Task ResourceDefinition_That_Implements_GetMeta_Contains_Include_Meta()
+        public async Task Returns_resource_meta_from_ResourceDefinition_in_included_resources()
         {
             // Arrange
             var person = new Person
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Meta/ResponseMetaTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Meta/ResponseMetaTests.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Net;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -31,7 +30,7 @@ public ResponseMetaTests(ExampleIntegrationTestContext<Startup, AppDbContext> te
         }
 
         [Fact]
-        public async Task Registered_IResponseMeta_Adds_TopLevel_Meta()
+        public async Task Returns_top_level_meta()
         {
             // Arrange
             await _testContext.RunOnDatabaseAsync(async dbContext => { await dbContext.ClearTableAsync<Person>(); });
@@ -63,23 +62,4 @@ public async Task Registered_IResponseMeta_Adds_TopLevel_Meta()
 }");
         }
     }
-
-    public sealed class TestResponseMeta : IResponseMeta
-    {
-        public IReadOnlyDictionary<string, object> GetMeta()
-        {
-            return new Dictionary<string, object>
-            {
-                ["license"] = "MIT",
-                ["projectUrl"] = "https://github.com/json-api-dotnet/JsonApiDotNetCore/",
-                ["versions"] = new[]
-                {
-                    "v4.0.0",
-                    "v3.1.0",
-                    "v2.5.2",
-                    "v1.3.1"
-                }
-            };
-        }
-    }
 }
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Meta/TestResponseMeta.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Meta/TestResponseMeta.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using JsonApiDotNetCore.Serialization;
+
+namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta
+{
+    public sealed class TestResponseMeta : IResponseMeta
+    {
+        public IReadOnlyDictionary<string, object> GetMeta()
+        {
+            return new Dictionary<string, object>
+            {
+                ["license"] = "MIT",
+                ["projectUrl"] = "https://github.com/json-api-dotnet/JsonApiDotNetCore/",
+                ["versions"] = new[]
+                {
+                    "v4.0.0",
+                    "v3.1.0",
+                    "v2.5.2",
+                    "v1.3.1"
+                }
+            };
+        }
+    }
+}
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCoreExample;
 using JsonApiDotNetCoreExample.Data;
@@ -20,12 +21,17 @@ public TopLevelCountTests(ExampleIntegrationTestContext<Startup, AppDbContext> t
         {
             _testContext = testContext;
 
+            testContext.ConfigureServicesAfterStartup(services =>
+            {
+                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+            });
+
             var options = (JsonApiOptions) testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
             options.IncludeTotalResourceCount = true;
         }
 
         [Fact]
-        public async Task Total_Resource_Count_Included_For_Collection()
+        public async Task Renders_resource_count_for_collection()
         {
             // Arrange
             var todoItem = new TodoItem();
@@ -51,7 +57,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         }
 
         [Fact]
-        public async Task Total_Resource_Count_Included_For_Empty_Collection()
+        public async Task Renders_resource_count_for_empty_collection()
         {
             // Arrange
             await _testContext.RunOnDatabaseAsync(async dbContext => { await dbContext.ClearTableAsync<TodoItem>(); });
@@ -69,7 +75,7 @@ public async Task Total_Resource_Count_Included_For_Empty_Collection()
         }
 
         [Fact]
-        public async Task Total_Resource_Count_Excluded_From_POST_Response()
+        public async Task Hides_resource_count_in_create_resource_response()
         {
             // Arrange
             var requestBody = new
@@ -96,7 +102,7 @@ public async Task Total_Resource_Count_Excluded_From_POST_Response()
         }
 
         [Fact]
-        public async Task Total_Resource_Count_Excluded_From_PATCH_Response()
+        public async Task Hides_resource_count_in_update_resource_response()
         {
             // Arrange
             var todoItem = new TodoItem();

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public ResourceMetaTests(ExampleIntegrationTestContext<Startup, AppDbContext> te`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`[Fact]`
`24`		`- public async Task ResourceDefinition_That_Implements_GetMeta_Contains_Resource_Meta()`
	`24`	`+ public async Task Returns_resource_meta_from_ResourceDefinition()`
`25`	`25`	`{`
`26`	`26`	`// Arrange`
`27`	`27`	`var todoItems = new[]`
`@@ -54,7 +54,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`[Fact]`
`57`		`- public async Task ResourceDefinition_That_Implements_GetMeta_Contains_Include_Meta()`
	`57`	`+ public async Task Returns_resource_meta_from_ResourceDefinition_in_included_resources()`
`58`	`58`	`{`
`59`	`59`	`// Arrange`
`60`	`60`	`var person = new Person`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Threading.Tasks;`
`3`	`3`	`using FluentAssertions;`
`4`	`4`	`using JsonApiDotNetCore.Configuration;`
	`5`	`+using JsonApiDotNetCore.Resources;`
`5`	`6`	`using JsonApiDotNetCore.Serialization.Objects;`
`6`	`7`	`using JsonApiDotNetCoreExample;`
`7`	`8`	`using JsonApiDotNetCoreExample.Data;`
`@@ -20,12 +21,17 @@ public TopLevelCountTests(ExampleIntegrationTestContext<Startup, AppDbContext> t`
`20`	`21`	`{`
`21`	`22`	`_testContext = testContext;`
`22`	`23`
	`24`	`+ testContext.ConfigureServicesAfterStartup(services =>`
	`25`	`+ {`
	`26`	`+ services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));`
	`27`	`+ });`
	`28`	`+`
`23`	`29`	`var options = (JsonApiOptions) testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();`
`24`	`30`	`options.IncludeTotalResourceCount = true;`
`25`	`31`	`}`
`26`	`32`
`27`	`33`	`[Fact]`
`28`		`- public async Task Total_Resource_Count_Included_For_Collection()`
	`34`	`+ public async Task Renders_resource_count_for_collection()`
`29`	`35`	`{`
`30`	`36`	`// Arrange`
`31`	`37`	`var todoItem = new TodoItem();`
`@@ -51,7 +57,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`51`	`57`	`}`
`52`	`58`
`53`	`59`	`[Fact]`
`54`		`- public async Task Total_Resource_Count_Included_For_Empty_Collection()`
	`60`	`+ public async Task Renders_resource_count_for_empty_collection()`
`55`	`61`	`{`
`56`	`62`	`// Arrange`
`57`	`63`	`await _testContext.RunOnDatabaseAsync(async dbContext => { await dbContext.ClearTableAsync<TodoItem>(); });`
`@@ -69,7 +75,7 @@ public async Task Total_Resource_Count_Included_For_Empty_Collection()`
`69`	`75`	`}`
`70`	`76`
`71`	`77`	`[Fact]`
`72`		`- public async Task Total_Resource_Count_Excluded_From_POST_Response()`
	`78`	`+ public async Task Hides_resource_count_in_create_resource_response()`
`73`	`79`	`{`
`74`	`80`	`// Arrange`
`75`	`81`	`var requestBody = new`
`@@ -96,7 +102,7 @@ public async Task Total_Resource_Count_Excluded_From_POST_Response()`
`96`	`102`	`}`
`97`	`103`
`98`	`104`	`[Fact]`
`99`		`- public async Task Total_Resource_Count_Excluded_From_PATCH_Response()`
	`105`	`+ public async Task Hides_resource_count_in_update_resource_response()`
`100`	`106`	`{`
`101`	`107`	`// Arrange`
`102`	`108`	`var todoItem = new TodoItem();`