Merge pull request #443 from RSuter/master

Release v9.4.4
RicoSuter · Aug 4, 2017 · 3d3d55b · 3d3d55b
2 parents b9e6151 + 6953ef9
commit 3d3d55b
Show file tree

Hide file tree

Showing 11 changed files with 119 additions and 7 deletions.
diff --git a/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj b/src/NJsonSchema.CodeGeneration.CSharp/NJsonSchema.CodeGeneration.CSharp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
     <Description>JSON Schema draft v4 reader, generator and validator for .NET</Description>
-    <Version>9.4.3</Version>
+    <Version>9.4.4</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj b/src/NJsonSchema.CodeGeneration.TypeScript/NJsonSchema.CodeGeneration.TypeScript.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
     <Description>JSON Schema draft v4 reader, generator and validator for .NET</Description>
-    <Version>9.4.3</Version>
+    <Version>9.4.4</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj b/src/NJsonSchema.CodeGeneration/NJsonSchema.CodeGeneration.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net451</TargetFrameworks>
     <Description>JSON Schema draft v4 reader, generator and validator for .NET</Description>
-    <Version>9.4.3</Version>
+    <Version>9.4.4</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema.Tests/Conversion/TypeToSchemaTests.cs b/src/NJsonSchema.Tests/Conversion/TypeToSchemaTests.cs
@@ -88,6 +88,24 @@ public async Task When_converting_regex_property_then_it_should_be_set_as_patter
             Assert.AreEqual("regex", schema.Properties["RegexString"].Pattern);
         }
 
+        public class ClassWithRegexDictionaryProperty
+        {
+            [RegularExpression("^\\d+\\.\\d+\\.\\d+\\.\\d+$")]
+            public Dictionary<string, string> Versions { get; set; }
+        }
+
+        [TestMethod]
+        public async Task When_dictionary_property_has_regex_attribute_then_regex_is_added_to_additionalProperties()
+        {
+            //// Act
+            var schema = await JsonSchema4.FromTypeAsync<ClassWithRegexDictionaryProperty>();
+            var json = schema.ToJson();
+
+            //// Assert
+            Assert.IsNull(schema.Properties["Versions"].Pattern);
+            Assert.IsNotNull(schema.Properties["Versions"].AdditionalPropertiesSchema.ActualSchema.Pattern);
+        }
+
         [TestMethod]
         public async Task When_converting_range_property_then_it_should_be_set_as_min_max()
         {

diff --git a/src/NJsonSchema.Tests/NJsonSchema.Tests.csproj b/src/NJsonSchema.Tests/NJsonSchema.Tests.csproj
@@ -89,6 +89,7 @@
     <Compile Include="Generation\XmlObjectTests.cs" />
     <Compile Include="Serialization\ExtensionDataTests.cs" />
     <Compile Include="Validation\EnumValidationTests.cs" />
+    <Compile Include="Validation\FormatTimeSpanTests.cs" />
     <Compile Include="Validation\FormatTimeTests.cs" />
     <Compile Include="Validation\FormatDateTests.cs" />
     <Compile Include="Validation\LineInformationTest.cs" />

diff --git a/src/NJsonSchema.Tests/Validation/EnumValidationTests.cs b/src/NJsonSchema.Tests/Validation/EnumValidationTests.cs
@@ -10,7 +10,7 @@ public class EnumValidationTests
         public async Task When_enum_is_defined_without_type_then_validation_succeeds_for_correct_value()
         {
             //// Arrange
-            var json = 
+            var json =
             @"{
                 ""enum"": [
                     ""commercial"",
@@ -45,5 +45,38 @@ public async Task When_enum_is_defined_without_type_then_validation_fails_for_wr
             //// Assert
             Assert.AreEqual(1, errors.Count);
         }
+
+        [TestMethod]
+        public async Task When_enumeration_has_null_then_validation_works()
+        {
+            //// Arrange
+            var json = @"
+            {
+                ""properties"": {
+                    ""SalutationType"": {
+                        ""type"": [
+                            ""string"",
+                            ""null""
+                        ],
+                        ""enum"": [
+                            ""Mr"",
+                            ""Mrs"",
+                            ""Dr"",
+                            ""Ms"",
+                            null
+                        ]
+                    }
+                }
+            }";
+
+            //// Act
+            var schema = await JsonSchema4.FromJsonAsync(json);
+
+            //// Act
+            var errors = schema.Validate(@"{ ""SalutationType"": ""Prof"" }");
+
+            //// Assert
+            Assert.AreEqual(1, errors.Count);
+        }
     }
 }
diff --git a/src/NJsonSchema.Tests/Validation/FormatTimeSpanTests.cs b/src/NJsonSchema.Tests/Validation/FormatTimeSpanTests.cs
@@ -0,0 +1,45 @@
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json.Linq;
+using NJsonSchema.Validation;
+
+namespace NJsonSchema.Tests.Validation
+{
+    [TestClass]
+    public class FormatTimeSpanTests
+    {
+        [TestMethod]
+        public void When_format_time_span_incorrect_then_validation_fails()
+        {
+            //// Arrange
+            var schema = new JsonSchema4();
+            schema.Type = JsonObjectType.String;
+            schema.Format = JsonFormatStrings.TimeSpan;
+
+            var token = new JValue("test");
+
+            //// Act
+            var errors = schema.Validate(token);
+
+            //// Assert
+            Assert.AreEqual(ValidationErrorKind.TimeSpanExpected, errors.First().Kind);
+        }
+
+        [TestMethod]
+        public void When_format_time_span_correct_then_validation_succeeds()
+        {
+            //// Arrange
+            var schema = new JsonSchema4();
+            schema.Type = JsonObjectType.String;
+            schema.Format = JsonFormatStrings.TimeSpan;
+
+            var token = new JValue("1:30:45");
+
+            //// Act
+            var errors = schema.Validate(token);
+
+            //// Assert
+            Assert.AreEqual(0, errors.Count());
+        }
+    }
+}
diff --git a/src/NJsonSchema/Generation/JsonSchemaGenerator.cs b/src/NJsonSchema/Generation/JsonSchemaGenerator.cs
@@ -698,7 +698,12 @@ public void ApplyPropertyAnnotations(JsonSchema4 jsonProperty, Newtonsoft.Json.S
 
             dynamic regexAttribute = attributes.TryGetIfAssignableTo("System.ComponentModel.DataAnnotations.RegularExpressionAttribute");
             if (regexAttribute != null)
-                jsonProperty.Pattern = regexAttribute.Pattern;
+            {
+                if (propertyTypeDescription.IsDictionary)
+                    jsonProperty.AdditionalPropertiesSchema.Pattern = regexAttribute.Pattern;
+                else
+                    jsonProperty.Pattern = regexAttribute.Pattern;
+            }
 
             if (propertyTypeDescription.Type == JsonObjectType.Number ||
                 propertyTypeDescription.Type == JsonObjectType.Integer)

diff --git a/src/NJsonSchema/NJsonSchema.csproj b/src/NJsonSchema/NJsonSchema.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;net40;net45</TargetFrameworks>
     <Description>JSON Schema draft v4 reader, generator and validator for .NET</Description>
-    <Version>9.4.3</Version>
+    <Version>9.4.4</Version>
     <PackageTags>json schema validation generator .net</PackageTags>
     <Copyright>Copyright © Rico Suter, 2017</Copyright>
     <PackageLicenseUrl>https://github.com/rsuter/NJsonSchema/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/src/NJsonSchema/Validation/JsonSchemaValidator.cs b/src/NJsonSchema/Validation/JsonSchemaValidator.cs
@@ -151,7 +151,7 @@ private void ValidateNull(JToken token, JsonSchema4 schema, JsonObjectType type,
 
         private void ValidateEnum(JToken token, JsonSchema4 schema, string propertyName, string propertyPath, List<ValidationError> errors)
         {
-            if (schema.Enumeration.Count > 0 && schema.Enumeration.All(v => v.ToString() != token.ToString()))
+            if (schema.Enumeration.Count > 0 && schema.Enumeration.All(v => v?.ToString() != token?.ToString()))
                 errors.Add(new ValidationError(ValidationErrorKind.NotInEnumeration, propertyName, propertyPath, token, schema));
         }
 
@@ -200,6 +200,13 @@ private void ValidateString(JToken token, JsonSchema4 schema, JsonObjectType typ
                                 errors.Add(new ValidationError(ValidationErrorKind.TimeExpected, propertyName, propertyPath, token, schema));
                         }
 
+                        if (schema.Format == JsonFormatStrings.TimeSpan)
+                        {
+                            TimeSpan timeSpanResult;
+                            if (token.Type != JTokenType.TimeSpan && TimeSpan.TryParse(value, out timeSpanResult) == false)
+                                errors.Add(new ValidationError(ValidationErrorKind.TimeSpanExpected, propertyName, propertyPath, token, schema));
+                        }
+
                         if (schema.Format == JsonFormatStrings.Uri)
                         {
                             Uri uriResult;

diff --git a/src/NJsonSchema/Validation/ValidationErrorKind.cs b/src/NJsonSchema/Validation/ValidationErrorKind.cs
@@ -74,6 +74,9 @@ public enum ValidationErrorKind
         /// <summary>A time is expected. </summary>
         TimeExpected,
 
+        /// <summary>A time-span is expected. </summary>
+        TimeSpanExpected,
+
         /// <summary>An URI is expected. </summary>
         UriExpected,