Merge branch 'sam/validation3' into dm/validation

Author: darrelmiller

src/Microsoft.OpenApi/Properties/SRResource.Designer.cs

@@ -129,6 +129,9 @@
   <data name="IndentationLevelInvalid" xml:space="preserve">
     <value>Indentation level cannot be lower than 0.</value>
   </data>
+  <data name="InputItemShouldBeType" xml:space="preserve">
+    <value>The input item should be in type of '{0}'.</value>
+  </data>
   <data name="ObjectScopeNeededForPropertyNameWriting" xml:space="preserve">
     <value>The active scope must be an object scope for property name '{0}' to be written.</value>
   </data>

src/Microsoft.OpenApi/Properties/SRResource.resx

@@ -20,7 +20,7 @@ internal static class OpenApiExternalDocsRules
             new ValidationRule<OpenApiExternalDocs>(
                 (context, item) =>
                 {
-                    // title
+                    // url
                     context.Push("url");
                     if (item.Url == null)
                     {

src/Microsoft.OpenApi/Validations/Rules/OpenApiExternalDocsRules.cs

@@ -13,7 +13,7 @@ namespace Microsoft.OpenApi.Validations.Rules
     public static class OpenApiPathsRules
     {
         /// <summary>
-        /// A relative path to an individual endpoint. The field name MUST begin with a slash. 
+        /// A relative path to an individual endpoint. The field name MUST begin with a slash.
         /// </summary>
         public static ValidationRule<OpenApiPaths> PathNameMustBeginWithSlash =>
             new ValidationRule<OpenApiPaths>(

src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs

@@ -20,7 +20,7 @@ internal static class OpenApiResponseRules
             new ValidationRule<OpenApiResponse>(
                 (context, response) =>
                 {
-                    // title
+                    // description
                     context.Push("description");
                     if (String.IsNullOrEmpty(response.Description))
                     {

src/Microsoft.OpenApi/Validations/Rules/OpenApiResponseRules.cs

@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Validations.Rules
     public static class OpenApiServerRules
     {
         /// <summary>
-        /// REQUIRED.
+        /// Validate the field is required.
         /// </summary>
         public static ValidationRule<OpenApiServer> FieldIsRequired =>
             new ValidationRule<OpenApiServer>(

src/Microsoft.OpenApi/Validations/Rules/OpenApiServerRules.cs

@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.Validations.Rules
     public static class OpenApiTagRules
     {
         /// <summary>
-        /// REQUIRED.
+        /// Validate the field is required.
         /// </summary>
         public static ValidationRule<OpenApiTag> FieldIsRequired =>
             new ValidationRule<OpenApiTag>(
@@ -24,7 +24,7 @@ public static class OpenApiTagRules
                     if (String.IsNullOrEmpty(tag.Name))
                     {
                         ValidationError error = new ValidationError(ErrorReason.Required, context.PathString,
-                            String.Format(SRResource.Validation_FieldIsRequired, "name", "Tag"));
+                            String.Format(SRResource.Validation_FieldIsRequired, "name", "tag"));
                         context.AddError(error);
                     }
                     context.Pop();

src/Microsoft.OpenApi/Validations/Rules/OpenApiTagRules.cs

@@ -11,7 +11,7 @@ internal static class RuleHelpers
         /// Input string must be in the format of an email address
         /// </summary>
         /// <param name="input">The input string.</param>
-        /// <returns></returns>
+        /// <returns>True if it's an email address. Otherwise False.</returns>
         public static bool IsEmailAddress(this string input)
         {
             if (String.IsNullOrEmpty(input))

src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs

@@ -58,7 +58,7 @@ public ValidationError(ErrorReason reason, string path, string message)
         /// <returns>The error string.</returns>
         public override string ToString()
         {
-            return "ErroCode: " + ErrorCode + ", " + ErrorPath + " | " + ErrorMessage;
+            return "ErrorCode: " + ErrorCode + ", " + ErrorPath + " | " + ErrorMessage;
         }
     }
 }

src/Microsoft.OpenApi/Validations/ValidationError.cs

@@ -2,8 +2,8 @@
 // Licensed under the MIT license. 
 
 using System;
-using System.Diagnostics;
 using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Properties;
 
 namespace Microsoft.OpenApi.Validations
 {
@@ -49,7 +49,21 @@ internal override Type ElementType
 
         internal override void Evaluate(ValidationContext context, object item)
         {
-            Debug.Assert(item is T, "item should be " + typeof(T));
+            if (context == null)
+            {
+                throw Error.ArgumentNull(nameof(context));
+            }
+
+            if (item == null)
+            {
+                return;
+            }
+
+            if (!(item is T))
+            {
+                throw Error.Argument(string.Format(SRResource.InputItemShouldBeType, typeof(T).FullName));
+            }
+
             T typedItem = (T)item;
             this._validate(context, typedItem);
         }