Use alternate public name for attribute, to improve test coverage

Bart Koelman · Bart Koelman · commit 2f90361ade38 · 2021-10-28T17:13:09.000+02:00
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs
@@ -55,7 +55,7 @@ public async Task Cannot_create_resource_with_omitted_required_attribute()
             error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
             error.Title.Should().Be("Input validation failed.");
             error.Detail.Should().Be("The Name field is required.");
-            error.Source.Pointer.Should().Be("/data/attributes/name");
+            error.Source.Pointer.Should().Be("/data/attributes/directoryName");
         }
 
         [Fact]
@@ -69,7 +69,7 @@ public async Task Cannot_create_resource_with_null_for_required_attribute_value(
                     type = "systemDirectories",
                     attributes = new
                     {
-                        name = (string)null,
+                        directoryName = (string)null,
                         isCaseSensitive = true
                     }
                 }
@@ -89,7 +89,7 @@ public async Task Cannot_create_resource_with_null_for_required_attribute_value(
             error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
             error.Title.Should().Be("Input validation failed.");
             error.Detail.Should().Be("The Name field is required.");
-            error.Source.Pointer.Should().Be("/data/attributes/name");
+            error.Source.Pointer.Should().Be("/data/attributes/directoryName");
         }
 
         [Fact]
@@ -103,7 +103,7 @@ public async Task Cannot_create_resource_with_invalid_attribute_value()
                     type = "systemDirectories",
                     attributes = new
                     {
-                        name = "!@#$%^&*().-",
+                        directoryName = "!@#$%^&*().-",
                         isCaseSensitive = true
                     }
                 }
@@ -123,7 +123,7 @@ public async Task Cannot_create_resource_with_invalid_attribute_value()
             error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
             error.Title.Should().Be("Input validation failed.");
             error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
-            error.Source.Pointer.Should().Be("/data/attributes/name");
+            error.Source.Pointer.Should().Be("/data/attributes/directoryName");
         }
 
         [Fact]
@@ -137,7 +137,7 @@ public async Task Can_create_resource_with_valid_attribute_value()
                     type = "systemDirectories",
                     attributes = new
                     {
-                        name = "Projects",
+                        directoryName = "Projects",
                         isCaseSensitive = true
                     }
                 }
@@ -152,7 +152,7 @@ public async Task Can_create_resource_with_valid_attribute_value()
             httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
             responseDocument.Data.SingleValue.Should().NotBeNull();
-            responseDocument.Data.SingleValue.Attributes["name"].Should().Be("Projects");
+            responseDocument.Data.SingleValue.Attributes["directoryName"].Should().Be("Projects");
             responseDocument.Data.SingleValue.Attributes["isCaseSensitive"].Should().Be(true);
         }
 
@@ -186,7 +186,7 @@ public async Task Cannot_create_resource_with_multiple_violations()
             error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
             error1.Title.Should().Be("Input validation failed.");
             error1.Detail.Should().Be("The Name field is required.");
-            error1.Source.Pointer.Should().Be("/data/attributes/name");
+            error1.Source.Pointer.Should().Be("/data/attributes/directoryName");
 
             ErrorObject error2 = responseDocument.Errors[1];
             error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
@@ -237,7 +237,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                     type = "systemDirectories",
                     attributes = new
                     {
-                        name = "Projects",
+                        directoryName = "Projects",
                         isCaseSensitive = true
                     },
                     relationships = new
@@ -285,7 +285,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
             responseDocument.Data.SingleValue.Should().NotBeNull();
-            responseDocument.Data.SingleValue.Attributes["name"].Should().Be("Projects");
+            responseDocument.Data.SingleValue.Attributes["directoryName"].Should().Be("Projects");
             responseDocument.Data.SingleValue.Attributes["isCaseSensitive"].Should().Be(true);
         }
 
@@ -398,7 +398,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                     id = directory.StringId,
                     attributes = new
                     {
-                        name = (string)null
+                        directoryName = (string)null
                     }
                 }
             };
@@ -417,7 +417,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
             error.Title.Should().Be("Input validation failed.");
             error.Detail.Should().Be("The Name field is required.");
-            error.Source.Pointer.Should().Be("/data/attributes/name");
+            error.Source.Pointer.Should().Be("/data/attributes/directoryName");
         }
 
         [Fact]
@@ -444,7 +444,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                     id = directory.StringId,
                     attributes = new
                     {
-                        name = "!@#$%^&*().-"
+                        directoryName = "!@#$%^&*().-"
                     }
                 }
             };
@@ -463,7 +463,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
             error.Title.Should().Be("Input validation failed.");
             error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
-            error.Source.Pointer.Should().Be("/data/attributes/name");
+            error.Source.Pointer.Should().Be("/data/attributes/directoryName");
         }
 
         [Fact]
@@ -490,7 +490,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                     id = "-1",
                     attributes = new
                     {
-                        name = "Repositories"
+                        directoryName = "Repositories"
                     },
                     relationships = new
                     {
@@ -556,7 +556,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                     id = directory.StringId,
                     attributes = new
                     {
-                        name = "Repositories"
+                        directoryName = "Repositories"
                     }
                 }
             };
@@ -634,7 +634,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                     id = directory.StringId,
                     attributes = new
                     {
-                        name = "Project Files"
+                        directoryName = "Project Files"
                     },
                     relationships = new
                     {
@@ -707,7 +707,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                     id = directory.StringId,
                     attributes = new
                     {
-                        name = "Project files"
+                        directoryName = "Project files"
                     },
                     relationships = new
                     {
@@ -766,7 +766,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                     id = directory.StringId,
                     attributes = new
                     {
-                        name = "Project files"
+                        directoryName = "Project files"
                     },
                     relationships = new
                     {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs
@@ -33,7 +33,7 @@ public async Task Can_create_resource_with_invalid_attribute_value()
                     type = "systemDirectories",
                     attributes = new
                     {
-                        name = "!@#$%^&*().-",
+                        directoryName = "!@#$%^&*().-",
                         isCaseSensitive = false
                     }
                 }
@@ -48,7 +48,7 @@ public async Task Can_create_resource_with_invalid_attribute_value()
             httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
             responseDocument.Data.SingleValue.Should().NotBeNull();
-            responseDocument.Data.SingleValue.Attributes["name"].Should().Be("!@#$%^&*().-");
+            responseDocument.Data.SingleValue.Attributes["directoryName"].Should().Be("!@#$%^&*().-");
         }
 
         [Fact]
@@ -75,7 +75,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
                     id = directory.StringId,
                     attributes = new
                     {
-                        name = "!@#$%^&*().-"
+                        directoryName = "!@#$%^&*().-"
                     }
                 }
             };
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs
@@ -15,7 +15,7 @@ public sealed class SystemDirectory : Identifiable<int>
         [RegularExpression("^[0-9]+$")]
         public override int Id { get; set; }
 
-        [Attr]
+        [Attr(PublicName = "directoryName")]
         [Required]
         [RegularExpression(@"^[\w\s]+$")]
         public string Name { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public async Task Cannot_create_resource_with_omitted_required_attribute()`
`55`	`55`	`error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);`
`56`	`56`	`error.Title.Should().Be("Input validation failed.");`
`57`	`57`	`error.Detail.Should().Be("The Name field is required.");`
`58`		`- error.Source.Pointer.Should().Be("/data/attributes/name");`
	`58`	`+ error.Source.Pointer.Should().Be("/data/attributes/directoryName");`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`[Fact]`
`@@ -69,7 +69,7 @@ public async Task Cannot_create_resource_with_null_for_required_attribute_value(`
`69`	`69`	`type = "systemDirectories",`
`70`	`70`	`attributes = new`
`71`	`71`	`{`
`72`		`- name = (string)null,`
	`72`	`+ directoryName = (string)null,`
`73`	`73`	`isCaseSensitive = true`
`74`	`74`	`}`
`75`	`75`	`}`
`@@ -89,7 +89,7 @@ public async Task Cannot_create_resource_with_null_for_required_attribute_value(`
`89`	`89`	`error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);`
`90`	`90`	`error.Title.Should().Be("Input validation failed.");`
`91`	`91`	`error.Detail.Should().Be("The Name field is required.");`
`92`		`- error.Source.Pointer.Should().Be("/data/attributes/name");`
	`92`	`+ error.Source.Pointer.Should().Be("/data/attributes/directoryName");`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`[Fact]`
`@@ -103,7 +103,7 @@ public async Task Cannot_create_resource_with_invalid_attribute_value()`
`103`	`103`	`type = "systemDirectories",`
`104`	`104`	`attributes = new`
`105`	`105`	`{`
`106`		`- name = "!@#$%^&*().-",`
	`106`	`+ directoryName = "!@#$%^&*().-",`
`107`	`107`	`isCaseSensitive = true`
`108`	`108`	`}`
`109`	`109`	`}`
`@@ -123,7 +123,7 @@ public async Task Cannot_create_resource_with_invalid_attribute_value()`
`123`	`123`	`error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);`
`124`	`124`	`error.Title.Should().Be("Input validation failed.");`
`125`	`125`	`error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");`
`126`		`- error.Source.Pointer.Should().Be("/data/attributes/name");`
	`126`	`+ error.Source.Pointer.Should().Be("/data/attributes/directoryName");`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`[Fact]`
`@@ -137,7 +137,7 @@ public async Task Can_create_resource_with_valid_attribute_value()`
`137`	`137`	`type = "systemDirectories",`
`138`	`138`	`attributes = new`
`139`	`139`	`{`
`140`		`- name = "Projects",`
	`140`	`+ directoryName = "Projects",`
`141`	`141`	`isCaseSensitive = true`
`142`	`142`	`}`
`143`	`143`	`}`
`@@ -152,7 +152,7 @@ public async Task Can_create_resource_with_valid_attribute_value()`
`152`	`152`	`httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);`
`153`	`153`
`154`	`154`	`responseDocument.Data.SingleValue.Should().NotBeNull();`
`155`		`- responseDocument.Data.SingleValue.Attributes["name"].Should().Be("Projects");`
	`155`	`+ responseDocument.Data.SingleValue.Attributes["directoryName"].Should().Be("Projects");`
`156`	`156`	`responseDocument.Data.SingleValue.Attributes["isCaseSensitive"].Should().Be(true);`
`157`	`157`	`}`
`158`	`158`
`@@ -186,7 +186,7 @@ public async Task Cannot_create_resource_with_multiple_violations()`
`186`	`186`	`error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);`
`187`	`187`	`error1.Title.Should().Be("Input validation failed.");`
`188`	`188`	`error1.Detail.Should().Be("The Name field is required.");`
`189`		`- error1.Source.Pointer.Should().Be("/data/attributes/name");`
	`189`	`+ error1.Source.Pointer.Should().Be("/data/attributes/directoryName");`
`190`	`190`
`191`	`191`	`ErrorObject error2 = responseDocument.Errors[1];`
`192`	`192`	`error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);`
`@@ -237,7 +237,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`237`	`237`	`type = "systemDirectories",`
`238`	`238`	`attributes = new`
`239`	`239`	`{`
`240`		`- name = "Projects",`
	`240`	`+ directoryName = "Projects",`
`241`	`241`	`isCaseSensitive = true`
`242`	`242`	`},`
`243`	`243`	`relationships = new`
`@@ -285,7 +285,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`285`	`285`	`httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);`
`286`	`286`
`287`	`287`	`responseDocument.Data.SingleValue.Should().NotBeNull();`
`288`		`- responseDocument.Data.SingleValue.Attributes["name"].Should().Be("Projects");`
	`288`	`+ responseDocument.Data.SingleValue.Attributes["directoryName"].Should().Be("Projects");`
`289`	`289`	`responseDocument.Data.SingleValue.Attributes["isCaseSensitive"].Should().Be(true);`
`290`	`290`	`}`
`291`	`291`
`@@ -398,7 +398,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`398`	`398`	`id = directory.StringId,`
`399`	`399`	`attributes = new`
`400`	`400`	`{`
`401`		`- name = (string)null`
	`401`	`+ directoryName = (string)null`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`	`};`
`@@ -417,7 +417,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`417`	`417`	`error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);`
`418`	`418`	`error.Title.Should().Be("Input validation failed.");`
`419`	`419`	`error.Detail.Should().Be("The Name field is required.");`
`420`		`- error.Source.Pointer.Should().Be("/data/attributes/name");`
	`420`	`+ error.Source.Pointer.Should().Be("/data/attributes/directoryName");`
`421`	`421`	`}`
`422`	`422`
`423`	`423`	`[Fact]`
`@@ -444,7 +444,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`444`	`444`	`id = directory.StringId,`
`445`	`445`	`attributes = new`
`446`	`446`	`{`
`447`		`- name = "!@#$%^&*().-"`
	`447`	`+ directoryName = "!@#$%^&*().-"`
`448`	`448`	`}`
`449`	`449`	`}`
`450`	`450`	`};`
`@@ -463,7 +463,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`463`	`463`	`error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);`
`464`	`464`	`error.Title.Should().Be("Input validation failed.");`
`465`	`465`	`error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");`
`466`		`- error.Source.Pointer.Should().Be("/data/attributes/name");`
	`466`	`+ error.Source.Pointer.Should().Be("/data/attributes/directoryName");`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`[Fact]`
`@@ -490,7 +490,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`490`	`490`	`id = "-1",`
`491`	`491`	`attributes = new`
`492`	`492`	`{`
`493`		`- name = "Repositories"`
	`493`	`+ directoryName = "Repositories"`
`494`	`494`	`},`
`495`	`495`	`relationships = new`
`496`	`496`	`{`
`@@ -556,7 +556,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`556`	`556`	`id = directory.StringId,`
`557`	`557`	`attributes = new`
`558`	`558`	`{`
`559`		`- name = "Repositories"`
	`559`	`+ directoryName = "Repositories"`
`560`	`560`	`}`
`561`	`561`	`}`
`562`	`562`	`};`
`@@ -634,7 +634,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`634`	`634`	`id = directory.StringId,`
`635`	`635`	`attributes = new`
`636`	`636`	`{`
`637`		`- name = "Project Files"`
	`637`	`+ directoryName = "Project Files"`
`638`	`638`	`},`
`639`	`639`	`relationships = new`
`640`	`640`	`{`
`@@ -707,7 +707,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`707`	`707`	`id = directory.StringId,`
`708`	`708`	`attributes = new`
`709`	`709`	`{`
`710`		`- name = "Project files"`
	`710`	`+ directoryName = "Project files"`
`711`	`711`	`},`
`712`	`712`	`relationships = new`
`713`	`713`	`{`
`@@ -766,7 +766,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`766`	`766`	`id = directory.StringId,`
`767`	`767`	`attributes = new`
`768`	`768`	`{`
`769`		`- name = "Project files"`
	`769`	`+ directoryName = "Project files"`
`770`	`770`	`},`
`771`	`771`	`relationships = new`
`772`	`772`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async Task Can_create_resource_with_invalid_attribute_value()`
`33`	`33`	`type = "systemDirectories",`
`34`	`34`	`attributes = new`
`35`	`35`	`{`
`36`		`- name = "!@#$%^&*().-",`
	`36`	`+ directoryName = "!@#$%^&*().-",`
`37`	`37`	`isCaseSensitive = false`
`38`	`38`	`}`
`39`	`39`	`}`
`@@ -48,7 +48,7 @@ public async Task Can_create_resource_with_invalid_attribute_value()`
`48`	`48`	`httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);`
`49`	`49`
`50`	`50`	`responseDocument.Data.SingleValue.Should().NotBeNull();`
`51`		`- responseDocument.Data.SingleValue.Attributes["name"].Should().Be("!@#$%^&*().-");`
	`51`	`+ responseDocument.Data.SingleValue.Attributes["directoryName"].Should().Be("!@#$%^&*().-");`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`[Fact]`
`@@ -75,7 +75,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`75`	`75`	`id = directory.StringId,`
`76`	`76`	`attributes = new`
`77`	`77`	`{`
`78`		`- name = "!@#$%^&*().-"`
	`78`	`+ directoryName = "!@#$%^&*().-"`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`};`