-Fixed various schema generation bugs
-Renamed MemberHandler delegate to ObjectConstructor
This commit is contained in:
@@ -30,6 +30,11 @@ using System.Text;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Schema;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.IO;
|
||||
using Newtonsoft.Json.Tests.TestObjects;
|
||||
#if !SILVERLIGHT
|
||||
using System.Data;
|
||||
#endif
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Schema
|
||||
{
|
||||
@@ -144,5 +149,53 @@ namespace Newtonsoft.Json.Tests.Schema
|
||||
// true
|
||||
}
|
||||
|
||||
private void GenerateSchemaAndSerializeFromType<T>(T value)
|
||||
{
|
||||
JsonSchemaGenerator generator = new JsonSchemaGenerator();
|
||||
generator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseAssemblyQualifiedName;
|
||||
JsonSchema typeSchema = generator.Generate(typeof (T));
|
||||
string schema = typeSchema.ToString();
|
||||
|
||||
string json = JsonConvert.SerializeObject(value, Formatting.Indented);
|
||||
JToken token = JToken.ReadFrom(new JsonTextReader(new StringReader(json)));
|
||||
|
||||
List<string> errors = new List<string>();
|
||||
|
||||
token.Validate(typeSchema, (sender, args) =>
|
||||
{
|
||||
errors.Add(args.Message);
|
||||
});
|
||||
|
||||
if (errors.Count > 0)
|
||||
Assert.Fail("Schema generated for type '{0}' is not valid." + Environment.NewLine + string.Join(Environment.NewLine, errors.ToArray()), typeof(T));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GenerateSchemaAndSerializeFromTypeTests()
|
||||
{
|
||||
GenerateSchemaAndSerializeFromType(new List<string> { "1", "Two", "III" });
|
||||
GenerateSchemaAndSerializeFromType(new List<int> { 1 });
|
||||
GenerateSchemaAndSerializeFromType(new Version("1.2.3.4"));
|
||||
GenerateSchemaAndSerializeFromType(new Store());
|
||||
GenerateSchemaAndSerializeFromType(new Person());
|
||||
GenerateSchemaAndSerializeFromType(new PersonRaw());
|
||||
GenerateSchemaAndSerializeFromType(new CircularReferenceClass() { Name = "I'm required" });
|
||||
GenerateSchemaAndSerializeFromType(new CircularReferenceWithIdClass());
|
||||
GenerateSchemaAndSerializeFromType(new ClassWithArray());
|
||||
GenerateSchemaAndSerializeFromType(new ClassWithGuid());
|
||||
#if !NET20 && !PocketPC
|
||||
GenerateSchemaAndSerializeFromType(new NullableDateTimeTestClass());
|
||||
#endif
|
||||
#if !SILVERLIGHT
|
||||
GenerateSchemaAndSerializeFromType(new DataSet());
|
||||
#endif
|
||||
GenerateSchemaAndSerializeFromType(new object());
|
||||
GenerateSchemaAndSerializeFromType(1);
|
||||
GenerateSchemaAndSerializeFromType("Hi");
|
||||
GenerateSchemaAndSerializeFromType(new DateTime(2000, 12, 29, 23, 59, 0, DateTimeKind.Utc));
|
||||
GenerateSchemaAndSerializeFromType(TimeSpan.FromTicks(1000000));
|
||||
GenerateSchemaAndSerializeFromType(DBNull.Value);
|
||||
GenerateSchemaAndSerializeFromType(new JsonPropertyWithHandlingValues());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,14 +59,17 @@ namespace Newtonsoft.Json.Tests.Schema
|
||||
""null""
|
||||
],
|
||||
""items"": {
|
||||
""type"": ""string""
|
||||
""type"": [
|
||||
""string"",
|
||||
""null""
|
||||
]
|
||||
}
|
||||
}
|
||||
}", json);
|
||||
|
||||
Dictionary<string, List<string>> value = new Dictionary<string, List<string>>
|
||||
{
|
||||
{"HasValue", new List<string>() { "first", "second"}},
|
||||
{"HasValue", new List<string>() { "first", "second", null }},
|
||||
{"NoValue", null}
|
||||
};
|
||||
|
||||
@@ -282,7 +285,7 @@ namespace Newtonsoft.Json.Tests.Schema
|
||||
|
||||
Assert.AreEqual(JsonSchemaType.String | JsonSchemaType.Null, schema.Properties["Name"].Type);
|
||||
Assert.AreEqual("MyExplicitId", schema.Id);
|
||||
Assert.AreEqual(JsonSchemaType.Object, schema.Properties["Child"].Type);
|
||||
Assert.AreEqual(JsonSchemaType.Object | JsonSchemaType.Null, schema.Properties["Child"].Type);
|
||||
Assert.AreEqual(schema, schema.Properties["Child"]);
|
||||
}
|
||||
|
||||
@@ -532,6 +535,90 @@ namespace Newtonsoft.Json.Tests.Schema
|
||||
// should succeed
|
||||
Assert.IsNotNull(jsonSchema);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CircularReferenceWithMixedRequires()
|
||||
{
|
||||
JsonSchemaGenerator jsonSchemaGenerator = new JsonSchemaGenerator();
|
||||
|
||||
jsonSchemaGenerator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName;
|
||||
JsonSchema jsonSchema = jsonSchemaGenerator.Generate(typeof(CircularReferenceClass));
|
||||
string json = jsonSchema.ToString();
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""id"": ""Newtonsoft.Json.Tests.TestObjects.CircularReferenceClass"",
|
||||
""optional"": true,
|
||||
""type"": [
|
||||
""object"",
|
||||
""null""
|
||||
],
|
||||
""properties"": {
|
||||
""Name"": {
|
||||
""type"": ""string""
|
||||
},
|
||||
""Child"": {
|
||||
""$ref"": ""Newtonsoft.Json.Tests.TestObjects.CircularReferenceClass""
|
||||
}
|
||||
}
|
||||
}", json);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void JsonPropertyWithHandlingValues()
|
||||
{
|
||||
JsonSchemaGenerator jsonSchemaGenerator = new JsonSchemaGenerator();
|
||||
|
||||
jsonSchemaGenerator.UndefinedSchemaIdHandling = UndefinedSchemaIdHandling.UseTypeName;
|
||||
JsonSchema jsonSchema = jsonSchemaGenerator.Generate(typeof(JsonPropertyWithHandlingValues));
|
||||
string json = jsonSchema.ToString();
|
||||
|
||||
Assert.AreEqual(@"{
|
||||
""id"": ""Newtonsoft.Json.Tests.TestObjects.JsonPropertyWithHandlingValues"",
|
||||
""type"": [
|
||||
""object"",
|
||||
""null""
|
||||
],
|
||||
""properties"": {
|
||||
""DefaultValueHandlingIgnoreProperty"": {
|
||||
""optional"": true,
|
||||
""type"": [
|
||||
""string"",
|
||||
""null""
|
||||
],
|
||||
""default"": ""Default!""
|
||||
},
|
||||
""DefaultValueHandlingIncludeProperty"": {
|
||||
""type"": [
|
||||
""string"",
|
||||
""null""
|
||||
],
|
||||
""default"": ""Default!""
|
||||
},
|
||||
""NullValueHandlingIgnoreProperty"": {
|
||||
""optional"": true,
|
||||
""type"": [
|
||||
""string"",
|
||||
""null""
|
||||
]
|
||||
},
|
||||
""NullValueHandlingIncludeProperty"": {
|
||||
""type"": [
|
||||
""string"",
|
||||
""null""
|
||||
]
|
||||
},
|
||||
""ReferenceLoopHandlingErrorProperty"": {
|
||||
""$ref"": ""Newtonsoft.Json.Tests.TestObjects.JsonPropertyWithHandlingValues""
|
||||
},
|
||||
""ReferenceLoopHandlingIgnoreProperty"": {
|
||||
""$ref"": ""Newtonsoft.Json.Tests.TestObjects.JsonPropertyWithHandlingValues""
|
||||
},
|
||||
""ReferenceLoopHandlingSerializeProperty"": {
|
||||
""$ref"": ""Newtonsoft.Json.Tests.TestObjects.JsonPropertyWithHandlingValues""
|
||||
}
|
||||
}
|
||||
}", json);
|
||||
}
|
||||
}
|
||||
|
||||
public class DMDSLBase
|
||||
|
||||
Reference in New Issue
Block a user