Ensured ArgumentException included nameof(parameter)

JeremyCaney · JeremyCaney · commit 8ac9d24b4ed2 · 2020-12-17T15:43:38.000-08:00
Not all cases where an `ArgumentException` can be thrown include the parameter name. In these cases, the general preference is to use `nameof(parameter)` so that the name is validated against the actual parameter name, and mismatches will be detected if the parameter name changes.
diff --git a/OnTopic/Collections/AttributeValueCollection.cs b/OnTopic/Collections/AttributeValueCollection.cs
@@ -554,7 +554,8 @@ protected override void InsertItem(int index, AttributeValue item) {
           throw new ArgumentException(
             $"An {nameof(AttributeValue)} with the Key '{item.Key}' already exists. The Value of the existing item is " +
             $"{this[item.Key].Value}; the new item's Value is '{item.Value}'. These {nameof(AttributeValue)}s are associated " +
-            $"with the {nameof(Topic)} '{_associatedTopic.GetUniqueKey()}'."
+            $"with the {nameof(Topic)} '{_associatedTopic.GetUniqueKey()}'.",
+            nameof(item)
           );
         }
       }
diff --git a/OnTopic/Internal/Reflection/TypeMemberInfoCollection.cs b/OnTopic/Internal/Reflection/TypeMemberInfoCollection.cs
@@ -488,7 +488,9 @@ protected override void InsertItem(int index, MemberInfoCollection item) {
       else {
         throw new ArgumentException(
           $"The '{nameof(TypeMemberInfoCollection)}' already contains the {nameof(MemberInfoCollection)} of the Type " +
-          $"'{item.Type}'.");
+          $"'{item.Type}'.",
+          nameof(item)
+        );
       }
     }
 
diff --git a/OnTopic/Repositories/TopicRepositoryBase.cs b/OnTopic/Repositories/TopicRepositoryBase.cs
@@ -315,7 +315,8 @@ public virtual int Save([ValidatedNotNull]Topic topic, bool isRecursive = false)
       if (contentTypeDescriptor is null) {
         throw new ArgumentException(
           $"The Content Type \"{topic.ContentType}\" referenced by \"{topic.Key}\" could not be found under " +
-          $"\"Configuration:ContentTypes\". There are currently {contentTypeDescriptors.Count} ContentTypes in the Repository."
+          $"\"Configuration:ContentTypes\". There are currently {contentTypeDescriptors.Count} ContentTypes in the Repository.",
+          nameof(topic)
         );
       }
 

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,8 @@ protected override void InsertItem(int index, AttributeValue item) {`
`554`	`554`	`throw new ArgumentException(`
`555`	`555`	`$"An {nameof(AttributeValue)} with the Key '{item.Key}' already exists. The Value of the existing item is " +`
`556`	`556`	`$"{this[item.Key].Value}; the new item's Value is '{item.Value}'. These {nameof(AttributeValue)}s are associated " +`
`557`		`- $"with the {nameof(Topic)} '{_associatedTopic.GetUniqueKey()}'."`
	`557`	`+ $"with the {nameof(Topic)} '{_associatedTopic.GetUniqueKey()}'.",`
	`558`	`+ nameof(item)`
`558`	`559`	`);`
`559`	`560`	`}`
`560`	`561`	`}`
Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,9 @@ protected override void InsertItem(int index, MemberInfoCollection item) {`
`488`	`488`	`else {`
`489`	`489`	`throw new ArgumentException(`
`490`	`490`	`$"The '{nameof(TypeMemberInfoCollection)}' already contains the {nameof(MemberInfoCollection)} of the Type " +`
`491`		`- $"'{item.Type}'.");`
	`491`	`+ $"'{item.Type}'.",`
	`492`	`+ nameof(item)`
	`493`	`+ );`
`492`	`494`	`}`
`493`	`495`	`}`
`494`	`496`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,8 @@ public virtual int Save([ValidatedNotNull]Topic topic, bool isRecursive = false)`
`315`	`315`	`if (contentTypeDescriptor is null) {`
`316`	`316`	`throw new ArgumentException(`
`317`	`317`	`$"The Content Type \"{topic.ContentType}\" referenced by \"{topic.Key}\" could not be found under " +`
`318`		`- $"\"Configuration:ContentTypes\". There are currently {contentTypeDescriptors.Count} ContentTypes in the Repository."`
	`318`	`+ $"\"Configuration:ContentTypes\". There are currently {contentTypeDescriptors.Count} ContentTypes in the Repository.",`
	`319`	`+ nameof(topic)`
`319`	`320`	`);`
`320`	`321`	`}`
`321`	`322`