-Fixed tests
This commit is contained in:
@@ -80,13 +80,15 @@ namespace Newtonsoft.Json.Tests
|
|||||||
[Test]
|
[Test]
|
||||||
public void DefaultSettings_Example()
|
public void DefaultSettings_Example()
|
||||||
{
|
{
|
||||||
JsonConvert.DefaultSettings = () => new JsonSerializerSettings
|
try
|
||||||
|
{
|
||||||
|
JsonConvert.DefaultSettings = () => new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
Formatting = Formatting.Indented,
|
Formatting = Formatting.Indented,
|
||||||
ContractResolver = new CamelCasePropertyNamesContractResolver()
|
ContractResolver = new CamelCasePropertyNamesContractResolver()
|
||||||
};
|
};
|
||||||
|
|
||||||
Employee e = new Employee
|
Employee e = new Employee
|
||||||
{
|
{
|
||||||
FirstName = "Eric",
|
FirstName = "Eric",
|
||||||
LastName = "Example",
|
LastName = "Example",
|
||||||
@@ -95,22 +97,27 @@ namespace Newtonsoft.Json.Tests
|
|||||||
JobTitle = "Web Dude"
|
JobTitle = "Web Dude"
|
||||||
};
|
};
|
||||||
|
|
||||||
string json = JsonConvert.SerializeObject(e);
|
string json = JsonConvert.SerializeObject(e);
|
||||||
// {
|
// {
|
||||||
// "firstName": "Eric",
|
// "firstName": "Eric",
|
||||||
// "lastName": "Example",
|
// "lastName": "Example",
|
||||||
// "birthDate": "1980-04-20T00:00:00Z",
|
// "birthDate": "1980-04-20T00:00:00Z",
|
||||||
// "department": "IT",
|
// "department": "IT",
|
||||||
// "jobTitle": "Web Dude"
|
// "jobTitle": "Web Dude"
|
||||||
// }
|
// }
|
||||||
|
|
||||||
Assert.AreEqual(@"{
|
Assert.AreEqual(@"{
|
||||||
""firstName"": ""Eric"",
|
""firstName"": ""Eric"",
|
||||||
""lastName"": ""Example"",
|
""lastName"": ""Example"",
|
||||||
""birthDate"": ""1980-04-20T00:00:00Z"",
|
""birthDate"": ""1980-04-20T00:00:00Z"",
|
||||||
""department"": ""IT"",
|
""department"": ""IT"",
|
||||||
""jobTitle"": ""Web Dude""
|
""jobTitle"": ""Web Dude""
|
||||||
}", json);
|
}", json);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
JsonConvert.DefaultSettings = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
|||||||
@@ -258,88 +258,5 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
}", includeCompilerGeneratedJson);
|
}", includeCompilerGeneratedJson);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//public class NullAsStringValueProvider : IValueProvider
|
|
||||||
//{
|
|
||||||
// private readonly ReflectionValueProvider _internalProvider;
|
|
||||||
|
|
||||||
// public NullAsStringValueProvider(MemberInfo memberInfo)
|
|
||||||
// {
|
|
||||||
// _internalProvider = new ReflectionValueProvider(memberInfo);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// public void SetValue(object target, object value)
|
|
||||||
// {
|
|
||||||
// _internalProvider.SetValue(target, value);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// public object GetValue(object target)
|
|
||||||
// {
|
|
||||||
// object value = _internalProvider.GetValue(target);
|
|
||||||
|
|
||||||
// if (value == null)
|
|
||||||
// return string.Empty;
|
|
||||||
|
|
||||||
// return value;
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
//public class NullAsStringContractResolver : DefaultContractResolver
|
|
||||||
//{
|
|
||||||
// protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
|
|
||||||
// {
|
|
||||||
// JsonProperty property = base.CreateProperty(member, memberSerialization);
|
|
||||||
|
|
||||||
// //property.ValueProvider = new NullAsStringValueProvider(member);
|
|
||||||
// //property..Converter = new NullAsStringJsonConverter();
|
|
||||||
|
|
||||||
// return property;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// protected override JsonPrimitiveContract CreatePrimitiveContract(Type objectType)
|
|
||||||
// {
|
|
||||||
// return base.CreatePrimitiveContract(objectType);
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
//public class NullAsStringTestClass
|
|
||||||
//{
|
|
||||||
// public int? Integer { get; set; }
|
|
||||||
// public DateTime? DateTime { get; set; }
|
|
||||||
//}
|
|
||||||
|
|
||||||
//public class NullAsStringJsonConverter : JsonConverter
|
|
||||||
//{
|
|
||||||
// public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
|
||||||
// {
|
|
||||||
// if (value == null)
|
|
||||||
// writer.WriteValue(string.Empty);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
|
||||||
// {
|
|
||||||
// throw new NotImplementedException();
|
|
||||||
// }
|
|
||||||
|
|
||||||
// public override bool CanRead
|
|
||||||
// {
|
|
||||||
// get { return false; }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// public override bool CanConvert(Type objectType)
|
|
||||||
// {
|
|
||||||
// return ReflectionUtils.IsNullableType(objectType);
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
||||||
//[Test]
|
|
||||||
//public void sdfsdf()
|
|
||||||
//{
|
|
||||||
// string json = JsonConvert.SerializeObject(
|
|
||||||
// new NullAsStringTestClass(),
|
|
||||||
// new JsonSerializerSettings { ContractResolver = new NullAsStringContractResolver()});
|
|
||||||
|
|
||||||
// Console.WriteLine(json);
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user